gh-105481: Generate the opcode lists in dis from data extracted from bytecodes.c#106758
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -4,10 +4,12 @@ | ||
| operate on bytecodes (e.g. peephole optimizers). | ||
| """ | ||
| # Note that __all__ is further extended below | ||
| __all__ = ["cmp_op", "opname", "opmap", "stack_effect", "hascompare", | ||
| "HAVE_ARGUMENT", "EXTENDED_ARG"] | ||
| import _opcode | ||
| from _opcode import stack_effect | ||
| import sys | ||
| @@ -17,55 +19,24 @@ | ||
| cmp_op = ('<', '<=', '==', '!=', '>', '>=') | ||
| ENABLE_SPECIALIZATION = True | ||
| 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 | ||
| @@ -137,74 +108,61 @@ def pseudo_op(name, op, real_ops): | ||
| HAVE_ARGUMENT = 90 # real opcodes from here have an argument: | ||
| def_op('STORE_NAME', 90) # Index in name list | ||
| def_op('DELETE_NAME', 91) # "" | ||
| def_op('UNPACK_SEQUENCE', 92) # Number of tuple items | ||
| def_op('FOR_ITER', 93) | ||
| def_op('UNPACK_EX', 94) | ||
| def_op('STORE_ATTR', 95) # Index in name list | ||
| def_op('DELETE_ATTR', 96) # "" | ||
| def_op('STORE_GLOBAL', 97) # "" | ||
| def_op('DELETE_GLOBAL', 98) # "" | ||
| def_op('SWAP', 99) | ||
| def_op('LOAD_CONST', 100) # Index in const list | ||
| def_op('LOAD_NAME', 101) # Index in name list | ||
| def_op('BUILD_TUPLE', 102) # Number of tuple items | ||
| def_op('BUILD_LIST', 103) # Number of list items | ||
| def_op('BUILD_SET', 104) # Number of set items | ||
| def_op('BUILD_MAP', 105) # Number of dict entries | ||
| def_op('LOAD_ATTR', 106) # Index in name list | ||
| def_op('COMPARE_OP', 107) # Comparison operator | ||
| def_op('IMPORT_NAME', 108) # Index in name list | ||
| def_op('IMPORT_FROM', 109) # Index in name list | ||
| def_op('JUMP_FORWARD', 110) # Number of words to skip | ||
| def_op('POP_JUMP_IF_FALSE', 114) | ||
| def_op('POP_JUMP_IF_TRUE', 115) | ||
| def_op('LOAD_GLOBAL', 116) # Index in name list | ||
| def_op('IS_OP', 117) | ||
| def_op('CONTAINS_OP', 118) | ||
| def_op('RERAISE', 119) | ||
| def_op('COPY', 120) | ||
| def_op('RETURN_CONST', 121) | ||
| def_op('BINARY_OP', 122) | ||
| def_op('SEND', 123) # Number of words to skip | ||
| def_op('LOAD_FAST', 124) # Local variable number, no null check | ||
| def_op('STORE_FAST', 125) # Local variable number | ||
| def_op('DELETE_FAST', 126) # Local variable number | ||
| def_op('LOAD_FAST_CHECK', 127) # Local variable number | ||
| def_op('POP_JUMP_IF_NOT_NONE', 128) | ||
| def_op('POP_JUMP_IF_NONE', 129) | ||
| def_op('RAISE_VARARGS', 130) # Number of raise arguments (1, 2, or 3) | ||
| def_op('GET_AWAITABLE', 131) | ||
| def_op('BUILD_SLICE', 133) # Number of items | ||
| def_op('JUMP_BACKWARD_NO_INTERRUPT', 134) # Number of words to skip (backwards) | ||
| def_op('MAKE_CELL', 135) | ||
| def_op('LOAD_DEREF', 137) | ||
| def_op('STORE_DEREF', 138) | ||
| def_op('DELETE_DEREF', 139) | ||
| def_op('JUMP_BACKWARD', 140) # Number of words to skip (backwards) | ||
| def_op('LOAD_SUPER_ATTR', 141) | ||
| def_op('CALL_FUNCTION_EX', 142) # Flags | ||
| def_op('LOAD_FAST_AND_CLEAR', 143) # Local variable number | ||
| def_op('EXTENDED_ARG', 144) | ||
| EXTENDED_ARG = opmap['EXTENDED_ARG'] | ||
| def_op('LIST_APPEND', 145) | ||
| def_op('SET_ADD', 146) | ||
| def_op('MAP_ADD', 147) | ||
| def_op('COPY_FREE_VARS', 149) | ||
| def_op('YIELD_VALUE', 150) | ||
| def_op('RESUME', 151) # This must be kept in sync with deepfreeze.py | ||
| @@ -224,12 +182,10 @@ def pseudo_op(name, op, real_ops): | ||
| def_op('STORE_FAST_STORE_FAST', 170) | ||
| def_op('CALL', 171) | ||
| def_op('KW_NAMES', 172) | ||
| def_op('CALL_INTRINSIC_1', 173) | ||
| def_op('CALL_INTRINSIC_2', 174) | ||
| def_op('LOAD_FROM_DICT_OR_GLOBALS', 175) | ||
| def_op('LOAD_FROM_DICT_OR_DEREF', 176) | ||
| def_op('SET_FUNCTION_ATTRIBUTE', 177) # Attribute | ||
| # Optimizer hook | ||
| @@ -258,16 +214,12 @@ def pseudo_op(name, op, real_ops): | ||
| def_op('INSTRUMENTED_LINE', 254) | ||
| # 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_op('JUMP', 260, ['JUMP_FORWARD', 'JUMP_BACKWARD']) | ||
| @@ -283,12 +235,29 @@ def pseudo_op(name, op, real_ops): | ||
| MAX_PSEUDO_OPCODE = MIN_PSEUDO_OPCODE + len(_pseudo_ops) - 1 | ||
| del def_op, pseudo_op | ||
| opname = ['<%r>' % (op,) for op in range(MAX_PSEUDO_OPCODE + 1)] | ||
| for op, i in opmap.items(): | ||
| opname[i] = op | ||
| # The build uses older versions of Python which do not have _opcode.has_* functions | ||
Member There was a problem hiding this comment. This is quite mysterious. IIRC Brandt (?) wrote some hack that reads opcode.py and then execs it? But I can't find it. MemberAuthor There was a problem hiding this comment. Yes, in Tools/build/generate_opcode_h.py. But when it execs opcode.py that tries to import _opcode and call its has_arg etc to construct the oplists (which are not used during the build). Ideally we should just get rid of generate_opcode_h.py if we can. MemberAuthor There was a problem hiding this comment. I think we don't need to import _opcode into opcode at all. We can just import it directly into dis (which is not used by any build scripts). I'll try that. | ||
| if sys.version_info[:2] >= (3, 13): | ||
| # These lists are documented as part of the dis module's API | ||
| hasarg = [op for op in opmap.values() if _opcode.has_arg(op)] | ||
| hasconst = [op for op in opmap.values() if _opcode.has_const(op)] | ||
| hasname = [op for op in opmap.values() if _opcode.has_name(op)] | ||
| hasjump = [op for op in opmap.values() if _opcode.has_jump(op)] | ||
| hasjrel = hasjump # for backward compatibility | ||
| hasjabs = [] | ||
iritkatriel marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading. Please reload this page. | ||
| hasfree = [op for op in opmap.values() if _opcode.has_free(op)] | ||
| haslocal = [op for op in opmap.values() if _opcode.has_local(op)] | ||
| hasexc = [op for op in opmap.values() if _opcode.has_exc(op)] | ||
| __all__.extend(["hasarg", "hasconst", "hasname", "hasjump", "hasjrel", | ||
| "hasjabs", "hasfree", "haslocal", "hasexc"]) | ||
iritkatriel marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading. Please reload this page. | ||
| hascompare = [opmap["COMPARE_OP"]] | ||
| _nb_ops = [ | ||
| ("NB_ADD", "+"), | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.