MAKE_FUNCTION is nargs_op with VARYING_INT pops

Author: rocky

xdis/opcodes/opcode_1x/opcode_1x.py

@@ -128,7 +128,8 @@
 
 def_op(loc,     "BREAK_LOOP",       80, 0, 0, fallthrough=False)
 
-def_op(loc,     "LOAD_LOCALS",      82, 0, 1)
+def_op(loc,     "LOAD_LOCALS",      82, 0, 1) # Pushes a reference to the locals of the current scope.
+                                              # This is not a name op.
 def_op(loc,     "RETURN_VALUE",     83, 1, 0, fallthrough=False)
 
 def_op(loc,     "EXEC_STMT",        85, 3, 0)

xdis/opcodes/opcode_2x/opcode_2x.py

@@ -136,7 +136,8 @@
 def_op(loc, "INPLACE_OR",             79,  2,  1)
 def_op(loc, "BREAK_LOOP",             80,  0,  0, fallthrough=False)
 
-def_op(loc, "LOAD_LOCALS",            82,  0,  1)
+def_op(loc, "LOAD_LOCALS",            82, 0, 1) # Pushes a reference to the locals of the current scope.
+                                                # This is not a name op.
 def_op(loc, "RETURN_VALUE",           83,  1,  0, fallthrough=False)
 def_op(loc, "IMPORT_STAR",            84,  1,  0)
 def_op(loc, "EXEC_STMT",              85,  3,  0)
@@ -208,11 +209,11 @@
                                                                      # number
 local_op(loc, "DELETE_FAST",          126,  0,  0) # Local variable number is in operand
 
-nargs_op(loc, "RAISE_VARARGS",        130, -1,  2, fallthrough=False)
+nargs_op(loc, "RAISE_VARARGS",        130, VARYING_STACK_INT,  2, fallthrough=False)
                                                 # Number of raise arguments (1, 2, or 3)
-call_op(loc, "CALL_FUNCTION",        131, -1,  2)  # TOS is #args + (#kwargs << 8)
+call_op(loc, "CALL_FUNCTION",        131, VARYING_STACK_INT,  2)  # TOS is #args + (#kwargs << 8)
 
-nargs_op(loc, "MAKE_FUNCTION",        132, -1,  2)  # TOS is number of args with
+nargs_op(loc, "MAKE_FUNCTION",        132, VARYING_STACK_INT,  2)  # TOS is number of args with
                                                     # default values
 varargs_op(loc, "BUILD_SLICE",        133,  2,  1)  # TOS is number of items
 

xdis/opcodes/opcode_3x/opcode_312.py

@@ -94,7 +94,8 @@
 binary_op(loc , "STORE_SLICE"                      , 27 ,   4, 0)
 
 def_op(loc    , "CLEANUP_THROW"                    , 55 ,   2, 1)
-def_op(loc    , "LOAD_LOCALS"                      , 87 ,   0, 1)
+def_op(loc    , "LOAD_LOCALS"                      , 87 ,   0, 1) # Pushes a reference to the locals of the current scope.
+                                                                  # This is not a name op.
 def_op(loc    , "RETURN_CONST"                     , 121,   0, 0)
 local_op(loc  , "LOAD_FAST_CHECK"                  , 127,   0, 1)
 

xdis/opcodes/opcode_3x/opcode_313.py

@@ -24,7 +24,7 @@
 from typing import Optional, Tuple
 
 import xdis.opcodes.opcode_3x.opcode_312 as opcode_312
-from xdis.opcodes.base import (  # noqa
+from xdis.opcodes.base import (
     VARYING_STACK_INT,
     call_op,
     cpython_implementation,
@@ -33,6 +33,7 @@
     free_op,
     init_opdata,
     local_op,
+    nargs_op,
     rm_op,
     update_pj3,
 )
@@ -217,8 +218,9 @@
 def_op(loc, "INTERPRETER_EXIT"                 , 22  , 1 , 0)
 def_op(loc, "LOAD_ASSERTION_ERROR"             , 23  , 0 , 1)
 def_op(loc, "LOAD_BUILD_CLASS"                 , 24  , 0 , 1)
-def_op(loc, "LOAD_LOCALS"                      , 25  , 0 , 1)
-def_op(loc, "MAKE_FUNCTION"                    , 26  , -2, 1)
+def_op(loc, "LOAD_LOCALS"                      , 25  , 0 , 1)  # Pushes a reference to the locals of the current scope.
+                                                               # This is not a name op.
+nargs_op(loc, "MAKE_FUNCTION"                  , 26  , VARYING_STACK_INT, 1)
 def_op(loc, "MATCH_KEYS"                       , 27  , 0 , 1)
 def_op(loc, "MATCH_MAPPING"                    , 28  , 0 , 1)
 def_op(loc, "MATCH_SEQUENCE"                   , 29  , 0 , 1)

xdis/opcodes/opcode_3x/opcode_314.py

@@ -21,6 +21,7 @@
 of stack usage.
 """
 
+import xdis.opcodes.opcode_3x.opcode_313 as opcode_313
 from xdis.opcodes.base import (
     VARYING_STACK_INT,
     binary_op,
@@ -35,11 +36,13 @@
     jrel_op,
     local_op,
     name_op,
+    nargs_op,
     store_op,
     unary_op,
     update_pj3,
     varargs_op,
 )
+from xdis.opcodes.format.extended import extended_format_binary_op
 
 version_tuple = (3, 14)
 python_implementation = cpython_implementation
@@ -78,8 +81,9 @@
 def_op(loc,     "GET_YIELD_FROM_ITER",                          19,     1,  1)
 def_op(loc,     "INTERPRETER_EXIT",                             20,     1,  0)
 def_op(loc,     "LOAD_BUILD_CLASS",                             21,     0,  1)
-def_op(loc,     "LOAD_LOCALS",                                  22,     0,  1)
-def_op(loc,     "MAKE_FUNCTION",                                23,     1,  1)
+def_op(loc,     "LOAD_LOCALS",                                  22,     0,  1) # Pushes a reference to the locals of the current scope.
+                                                                               # This is not a name op.
+nargs_op(loc,   "MAKE_FUNCTION",                                23,     VARYING_STACK_INT,  1)
 def_op(loc,     "MATCH_KEYS",                                   24,     2,  3)
 def_op(loc,     "MATCH_MAPPING",                                25,     1,  2)
 def_op(loc,     "MATCH_SEQUENCE",                               26,     1,  2)
@@ -312,8 +316,6 @@
 # fmt: on
 
 ### update formatting
-import xdis.opcodes.opcode_3x.opcode_313 as opcode_313
-from xdis.opcodes.format.extended import extended_format_binary_op
 
 _nb_ops = [
     ("NB_ADD", "+"),

xdis/opcodes/opcode_rust/opcode_312rust.py

@@ -243,7 +243,7 @@ def pseudo_op(name: str, op: int, real_ops: list):
 jrel_op(loc, "POP_JUMP_IF_NONE", 129)
 def_op(loc, "RAISE_VARARGS", 130)    # Number of raise arguments (1, 2, or 3)
 def_op(loc, "GET_AWAITABLE", 131)
-nargs_op(loc, "MAKE_FUNCTION", 132)    # Flags
+nargs_op(loc, "MAKE_FUNCTION", 132, VARYING_STACK_INT, 1)    # Flags
 def_op(loc, "BUILD_SLICE", 133)      # Number of items
 jrel_op(loc, "JUMP_BACKWARD_NO_INTERRUPT", 134) # Number of words to skip (backwards)
 free_op(loc, "MAKE_CELL",                     135,   0, 0)

xdis/opcodes/opcode_rust/opcode_313rust.py

@@ -203,7 +203,7 @@ def pseudo_op(name: str, op: int, real_ops: list):
 jrel_op(loc, "JUMP_IF_TRUE_OR_POP",  48) # Number of words to skip
 jrel_op(loc, "JUMP_IF_FALSE_OR_POP", 49) # "
 
-nargs_op(loc, "MAKE_FUNCTION", 50)    # Flags
+nargs_op(loc, "MAKE_FUNCTION", 50, VARYING_STACK_INT)    # Flags
 def_op(loc, "SET_FUNCTION_ATTR", 51)
 
 call_op(loc, "CALL_FUNCTION", 52)