Skip to content

gh-105481: simplify definition of pseudo ops in Lib/opcode.py #107561

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 3 commits into from
Aug 2, 2023
Merged

gh-105481: simplify definition of pseudo ops in Lib/opcode.py #107561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe9d7fe
gh-105481: simplify definition of pseudo ops in Lib/opcode.py
iritkatriel Aug 1, 2023
fdba0fb
remove MIN_PSEUDO_OPCODE and MAX_PSEUDO_OPCODE too
iritkatriel Aug 2, 2023
cabf2b8
don't need pseudo_op anymore
iritkatriel Aug 2, 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
5 changes: 5 additions & 0 deletions Doc/whatsnew/3.13.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ opcode
This field was added in 3.12, it was never documented and is not intended for
external usage. (Contributed by Irit Katriel in :gh:`105481`.)

* Removed ``opcode.is_pseudo``, ``opcode.MIN_PSEUDO_OPCODE`` and
``opcode.MAX_PSEUDO_OPCODE``, which were added in 3.12, were never
documented or exposed through ``dis``, and were not intended to be
used externally.

pathlib
-------

Expand Down
2 changes: 0 additions & 2 deletions Include/opcode.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 15 additions & 29 deletions Lib/opcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,11 @@

cmp_op = ('<', '<=', '==', '!=', '>', '>=')

def is_pseudo(op):
return op >= MIN_PSEUDO_OPCODE and op <= MAX_PSEUDO_OPCODE

opmap = {}

# pseudo opcodes (used in the compiler) mapped to the values
# they can become in the actual code.
_pseudo_ops = {}

def def_op(name, op):
opmap[name] = op

def pseudo_op(name, op, real_ops):
def_op(name, op)
_pseudo_ops[name] = real_ops


# Instruction opcodes for compiled code
# Blank lines correspond to available opcodes

Expand Down Expand Up @@ -212,29 +200,27 @@ def pseudo_op(name, op, real_ops):
# 255 is reserved


MIN_PSEUDO_OPCODE = 256

pseudo_op('SETUP_FINALLY', 256, ['NOP'])
pseudo_op('SETUP_CLEANUP', 257, ['NOP'])
pseudo_op('SETUP_WITH', 258, ['NOP'])
pseudo_op('POP_BLOCK', 259, ['NOP'])
# Pseudo ops are above 255:

pseudo_op('JUMP', 260, ['JUMP_FORWARD', 'JUMP_BACKWARD'])
pseudo_op('JUMP_NO_INTERRUPT', 261, ['JUMP_FORWARD', 'JUMP_BACKWARD_NO_INTERRUPT'])
def_op('SETUP_FINALLY', 256)
def_op('SETUP_CLEANUP', 257)
def_op('SETUP_WITH', 258)
def_op('POP_BLOCK', 259)

pseudo_op('LOAD_METHOD', 262, ['LOAD_ATTR'])
pseudo_op('LOAD_SUPER_METHOD', 263, ['LOAD_SUPER_ATTR'])
pseudo_op('LOAD_ZERO_SUPER_METHOD', 264, ['LOAD_SUPER_ATTR'])
pseudo_op('LOAD_ZERO_SUPER_ATTR', 265, ['LOAD_SUPER_ATTR'])
def_op('JUMP', 260)
def_op('JUMP_NO_INTERRUPT', 261)

pseudo_op('STORE_FAST_MAYBE_NULL', 266, ['STORE_FAST'])
pseudo_op('LOAD_CLOSURE', 267, ['LOAD_FAST'])
def_op('LOAD_METHOD', 262)
def_op('LOAD_SUPER_METHOD', 263)
def_op('LOAD_ZERO_SUPER_METHOD', 264)
def_op('LOAD_ZERO_SUPER_ATTR', 265)

MAX_PSEUDO_OPCODE = MIN_PSEUDO_OPCODE + len(_pseudo_ops) - 1
def_op('STORE_FAST_MAYBE_NULL', 266)
def_op('LOAD_CLOSURE', 267)

del def_op, pseudo_op
del def_op

opname = ['<%r>' % (op,) for op in range(MAX_PSEUDO_OPCODE + 1)]
opname = ['<%r>' % (op,) for op in range(max(opmap.values()) + 1)]
for op, i in opmap.items():
opname[i] = op

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2023-08-01-21-43-58.gh-issue-105481.cl2ajS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Remove ``opcode.is_pseudo``, ``opcode.MIN_PSEUDO_OPCODE`` and ``opcode.MAX_PSEUDO_OPCODE``,
which were added in 3.12, were never documented and were not intended to be used externally.
10 changes: 1 addition & 9 deletions Tools/build/generate_opcode_h.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,7 @@ def main(opcode_py,
opcode = get_python_module_dict(opcode_py)
opmap = opcode['opmap']
opname = opcode['opname']
is_pseudo = opcode['is_pseudo']

MIN_PSEUDO_OPCODE = opcode["MIN_PSEUDO_OPCODE"]
MAX_PSEUDO_OPCODE = opcode["MAX_PSEUDO_OPCODE"]
MIN_INSTRUMENTED_OPCODE = opcode["MIN_INSTRUMENTED_OPCODE"]

NUM_OPCODES = len(opname)
Expand All @@ -101,16 +98,11 @@ def main(opcode_py,
for name in opname:
if name in opmap:
op = opmap[name]
if op == MIN_PSEUDO_OPCODE:
fobj.write(DEFINE.format("MIN_PSEUDO_OPCODE", MIN_PSEUDO_OPCODE))
if op == MIN_INSTRUMENTED_OPCODE:
fobj.write(DEFINE.format("MIN_INSTRUMENTED_OPCODE", MIN_INSTRUMENTED_OPCODE))

fobj.write(DEFINE.format(name, op))

if op == MAX_PSEUDO_OPCODE:
fobj.write(DEFINE.format("MAX_PSEUDO_OPCODE", MAX_PSEUDO_OPCODE))


for name, op in specialized_opmap.items():
fobj.write(DEFINE.format(name, op))
Expand All @@ -126,7 +118,7 @@ def main(opcode_py,

deoptcodes = {}
for basic, op in opmap.items():
if not is_pseudo(op):
if op < 256:
deoptcodes[basic] = basic
for basic, family in _opcode_metadata["_specializations"].items():
for specialized in family:
Expand Down