8000 GH-122390: Replace `_Py_GetbaseOpcode` with `_Py_GetBaseCodeUnit` by markshannon · Pull Request #122942 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-122390: Replace _Py_GetbaseOpcode with _Py_GetBaseCodeUnit #122942

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

Merged
merged 5 commits into from
Aug 13, 2024
Merged

GH-122390: Replace _Py_GetbaseOpcode with _Py_GetBaseCodeUnit #122942

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df033e4
Replace _Py_GetbaseOpcode with _Py_GetBaseCodeUnit, and simplify some…
markshannon Aug 12, 2024
604c79a
Fix up test_dis
markshannon Aug 12, 2024
0f507df
Modify magic number to ease merge conflict
markshannon Aug 13, 2024
2ac1cdb
Merge branch 'main' into get-base-instruction
markshannon Aug 13, 2024
3ef3cff
Generate MIN_SPECIALIZED_OPCODE and use it in asserts
markshannon Aug 13, 2024
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
Next Next commit
Modify magic number to ease merge conflict
  • Loading branch information
@markshannon
markshannon committed Aug 13, 2024
commit 0f507df568e2ede837b9667db9e0a90fa36a7813
5 changes: 3 additions & 2 deletions Include/internal/pycore_magic_number.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,8 @@ Known values:
Python 3.14a1 3601 (Fix miscompilation of private names in generic classes)
Python 3.14a1 3602 (Add LOAD_SPECIAL. Remove BEFORE_WITH and BEFORE_ASYNC_WITH)
Python 3.14a1 3603 (Remove BUILD_CONST_KEY_MAP)
Python 3.14a1 3604 (Move ENTER_EXECUTOR to opcode 255)
Python 3.14a1 3604 (Do not duplicate test at end of while statements)
Python 3.14a1 3605 (Move ENTER_EXECUTOR to opcode 255)

Python 3.15 will start with 3650

Expand All @@ -268,7 +269,7 @@ PC/launcher.c must also be updated.

*/

#define PYC_MAGIC_NUMBER 3604
#define PYC_MAGIC_NUMBER 3605
/* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
(little-endian) and then appending b'\r\n'. */
#define PYC_MAGIC_NUMBER_TOKEN \
Expand Down
0