Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-109256: allocate opcode IDs for internal opcodes in their own range #109269

Merged
merged 5 commits into from
Sep 12, 2023
Merged

gh-109256: allocate opcode IDs for internal opcodes in their own range #109269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5e1a05
gh-09256: allocate opcode IDs for internal opcodes in their own range
iritkatriel Sep 11, 2023
194b759
Add news
iritkatriel Sep 11, 2023
d524f6b
regen-all
iritkatriel Sep 11, 2023
f3c8f8f
update test_dis
iritkatriel Sep 11, 2023
4fb3698
Merge remote-tracking branch 'upstream/main' into internal_ops
iritkatriel Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'upstream/main' into internal_ops
  • Loading branch information
@iritkatriel
iritkatriel committed Sep 12, 2023
commit 4fb369872cf1c1aa86e0fb6433b3e78cc64100df
5 changes: 3 additions & 2 deletions Lib/importlib/_bootstrap_external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.13a1 3558 (Reorder the stack items for CALL)
# Python 3.13a1 3559 (Generate opcode IDs from bytecodes.c)
# Python 3.13a1 3560 (Add RESUME_CHECK instruction)
# Python 3.13a1 3561 (Assign opcode IDs for interal ops in separate range)
# Python 3.13a1 3561 (Add cache entry to branch instructions)
# Python 3.13a1 3562 (Assign opcode IDs for internal ops in separate range)

# Python 3.14 will start with 3600

Expand All @@ -473,7 +474,7 @@ def _write_atomic(path, data, mode=0o666):
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.

MAGIC_NUMBER = (3561).to_bytes(2, 'little') + b'\r\n'
MAGIC_NUMBER = (3562).to_bytes(2, 'little') + b'\r\n'

_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c

Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.