Split out and redo opcode organization

This was already too large. Revise so we can grow even more.

Author: rocky

pytest/test_stack_effect.py

@@ -5,7 +5,11 @@
 from xdis import get_opcode
 from xdis.cross_dis import op_has_argument, xstack_effect
 from xdis.op_imports import get_opcode_module
-from xdis.version_info import PYTHON_IMPLEMENTATION, PYTHON_VERSION_TRIPLE
+from xdis.version_info import (
+    PYTHON_IMPLEMENTATION,
+    PYTHON_VERSION_TRIPLE,
+    version_tuple_to_str,
+)
 
 
 def get_srcdir() -> str:
@@ -78,7 +82,7 @@ def test_stack_effect_fixed() -> None:
             check_effect = opcode_stack_effect[opcode]
             assert check_effect == effect, (
                 "in version %s %d (%s) not okay; effect xstack_effect is %d; C source has %d"
-                % (opc.version, opcode, opname, effect, check_effect)
+                % (version_tuple_to_str(opc.version_tuple), opcode, opname, effect, check_effect)
             )
             # print("version %s: %d (%s) is good: effect %d" % (version, opcode, opname, effect))
             pass

xdis/bytecode.py

@@ -38,7 +38,10 @@
 from xdis.cross_types import UnicodeForPython3
 from xdis.instruction import Instruction
 from xdis.op_imports import get_opcode_module
-from xdis.opcodes.opcode_36 import format_CALL_FUNCTION, format_CALL_FUNCTION_EX
+from xdis.opcodes.opcode_3x.opcode_36 import (
+    format_CALL_FUNCTION,
+    format_CALL_FUNCTION_EX,
+)
 from xdis.util import code2num, num2code
 from xdis.version_info import PYTHON_IMPLEMENTATION, PythonImplementation
 
@@ -872,9 +875,9 @@ def list2bytecode(
 
 
 if __name__ == "__main__":
-    import xdis.opcodes.opcode_27 as opcode_27
-    import xdis.opcodes.opcode_34 as opcode_34
-    import xdis.opcodes.opcode_36 as opcode_36
+    import xdis.opcodes.opcode_2x.opcode_27 as opcode_27
+    import xdis.opcodes.opcode_3x.opcode_34 as opcode_34
+    import xdis.opcodes.opcode_3x.opcode_36 as opcode_36
     from xdis.version_info import PYTHON3
 
     my_constants = (None, 2)

xdis/bytecode_graal.py

@@ -4,7 +4,7 @@
 from xdis.cross_dis import get_code_object
 from xdis.instruction import Instruction
 from xdis.lineoffsets_graal import find_linestarts_graal
-from xdis.opcodes.base_graal import (
+from xdis.opcodes.opcode_graal.base_graal import (
     BINARY_OPS,
     UNARY_OPS,
     collection_to_str,

xdis/op_imports.py

@@ -51,22 +51,24 @@
     opcode_37,
     opcode_37pypy,
     opcode_38,
-    opcode_38graal,
     opcode_38pypy,
     opcode_39,
     opcode_39pypy,
     opcode_310,
-    opcode_310graal,
     opcode_310pypy,
     opcode_311,
-    opcode_311graal,
     opcode_311pypy,
     opcode_312,
-    opcode_312graal,
     opcode_313,
     opcode_313rust,
     opcode_314,
 )
+from xdis.opcodes.opcode_graal import (
+    opcode_38graal,
+    opcode_310graal,
+    opcode_311graal,
+    opcode_312graal,
+)
 from xdis.version_info import PythonImplementation, version_tuple_to_str
 
 # FIXME

xdis/opcodes/__init__.py

@@ -1,4 +1,4 @@
-# (C) Copyright 2023 by Rocky Bernstein
+# (C) Copyright 2023, 2025 by Rocky Bernstein
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -18,3 +18,114 @@
 of stack usage and information for formatting instructions.
 This covers information from the Python stdlib opcodes.py.
 """
+
+from xdis.opcodes.opcode_1x import (
+    opcode_10,
+    opcode_11,
+    opcode_12,
+    opcode_13,
+    opcode_14,
+    opcode_15,
+    opcode_16,
+)
+from xdis.opcodes.opcode_2x import (
+    opcode_20,
+    opcode_21,
+    opcode_22,
+    opcode_23,
+    opcode_24,
+    opcode_25,
+    opcode_26,
+    opcode_27,
+)
+from xdis.opcodes.opcode_3x import (
+    opcode_30,
+    opcode_31,
+    opcode_32,
+    opcode_33,
+    opcode_34,
+    opcode_35,
+    opcode_36,
+    opcode_37,
+    opcode_38,
+    opcode_39,
+    opcode_310,
+    opcode_311,
+    opcode_312,
+    opcode_313,
+    opcode_314,
+)
+from xdis.opcodes.opcode_pypy import (
+    opcode_26pypy,
+    opcode_27pypy,
+    opcode_32pypy,
+    opcode_33pypy,
+    opcode_35pypy,
+    opcode_36pypy,
+    opcode_37pypy,
+    opcode_38pypy,
+    opcode_39pypy,
+    opcode_310pypy,
+    opcode_311pypy,
+)
+from xdis.opcodes.opcode_rust import opcode_313rust  # opcode_312rust,
+
+# from xdis.opcodes.opcode_graal import (
+#     opcode_310graal,
+#     opcode_311graal,
+#     opcode_312graal,
+#     opcode_38graal,
+#     )
+
+
+
+__all__ = [
+    "opcode_10",
+    "opcode_11",
+    "opcode_12",
+    "opcode_13",
+    "opcode_14",
+    "opcode_15",
+    "opcode_16",
+    "opcode_20",
+    "opcode_21",
+    "opcode_22",
+    "opcode_23",
+    "opcode_24",
+    "opcode_25",
+    "opcode_26",
+    "opcode_26pypy",
+    "opcode_27",
+    "opcode_27pypy",
+    "opcode_30",
+    "opcode_31",
+    "opcode_310",
+    "opcode_311",
+    "opcode_312",
+    "opcode_313",
+    "opcode_314",
+    "opcode_32",
+    "opcode_33",
+    "opcode_34",
+    "opcode_35",
+    "opcode_36",
+    "opcode_37",
+    "opcode_38",
+    "opcode_39",
+    "opcode_310pypy",
+    "opcode_311pypy",
+    "opcode_32pypy",
+    "opcode_33pypy",
+    "opcode_35pypy",
+    "opcode_36pypy",
+    "opcode_37pypy",
+    "opcode_38pypy",
+    "opcode_39pypy",
+    # "opcode_310graal",
+    # "opcode_311graal",
+    # "opcode_312graal",
+    "opcode_38graal",
+    # "opcode_312rust",
+    "opcode_313rust",
+
+]

xdis/opcodes/base.py

@@ -142,7 +142,8 @@ def init_opdata(loc, from_mod, version_tuple=None, is_pypy: bool=False) -> None:
             if version_tuple >= (3,14):
                 fields2copy.extend(fields2copy_314)
         for field in fields2copy:
-            loc[field] = getattr(from_mod, field).copy()
+            if hasattr(from_mod, field):
+                loc[field] = getattr(from_mod, field).copy()
         pass
     else:
         # FIXME: DRY with above

xdis/opcodes/opcode_1x/__init__.py

@@ -20,7 +20,7 @@
 of stack usage and information for formatting instructions.
 """
 
-import xdis.opcodes.opcode_11 as opcode_11
+import xdis.opcodes.opcode_1x.opcode_11 as opcode_11
 
 # This is used from outside this module
 from xdis.cross_dis import findlabels  # noqa
@@ -32,7 +32,7 @@
     rm_op,
     update_pj2,
 )
-from xdis.opcodes.opcode_11 import opcode_arg_fmt11, opcode_extended_fmt11
+from xdis.opcodes.opcode_1x.opcode_11 import opcode_arg_fmt11, opcode_extended_fmt11
 
 version_tuple = (1, 0)
 python_implementation = cpython_implementation

xdis/opcodes/opcode_10.py xdis/opcodes/opcode_1x/opcode_10.pyxdis/opcodes/opcode_10.py renamed to xdis/opcodes/opcode_1x/opcode_10.py

@@ -20,7 +20,7 @@
 opcodes in Python's dis.py library.
 """
 
-import xdis.opcodes.opcode_12 as opcode_12
+import xdis.opcodes.opcode_1x.opcode_12 as opcode_12
 
 # This is used from outside this module
 from xdis.cross_dis import findlabels
@@ -30,7 +30,7 @@
     init_opdata,
     update_pj2,
 )
-from xdis.opcodes.opcode_12 import opcode_arg_fmt12, opcode_extended_fmt12
+from xdis.opcodes.opcode_1x.opcode_12 import opcode_arg_fmt12, opcode_extended_fmt12
 
 version_tuple = (1, 1)  # 1.2 is the same
 python_implementation = cpython_implementation

xdis/opcodes/opcode_11.py xdis/opcodes/opcode_1x/opcode_11.pyxdis/opcodes/opcode_11.py renamed to xdis/opcodes/opcode_1x/opcode_11.py

@@ -1,4 +1,4 @@
-# (C) Copyright 2019-2023 by Rocky Bernstein
+# (C) Copyright 2019-2023, 2025 by Rocky Bernstein
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -20,10 +20,8 @@
 opcodes in Python's dis.py library.
 """
 
-import xdis.opcodes.opcode_13 as opcode_13
-
-# This is used from outside this module
-from xdis.cross_dis import findlabels  # noqa
+import xdis.cross_dis
+import xdis.opcodes.opcode_1x.opcode_13 as opcode_13
 from xdis.opcodes.base import (  # Although these aren't used here, they are exported; noqa
     cpython_implementation,
     finalize_opcodes,
@@ -33,10 +31,11 @@
     store_op,
     update_pj2,
 )
-from xdis.opcodes.opcode_13 import opcode_arg_fmt13, opcode_extended_fmt13
+from xdis.opcodes.opcode_1x.opcode_13 import opcode_arg_fmt13, opcode_extended_fmt13
 
 version_tuple = (1, 2)
 python_implementation = cpython_implementation
+findlabels = xdis.cross_dis.findlabels
 
 loc = locals()
 init_opdata(loc, opcode_13, version_tuple)