Add second Rust bytecode (for 3.12)

Author: rocky

xdis/codetype/code312rust.py

@@ -0,0 +1,82 @@
+# (C) Copyright 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
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+from dataclasses import dataclass
+from typing import Any, Dict, Tuple, Union
+
+from xdis.codetype.code311 import Code311
+
+
+@dataclass
+class SourceLocation:
+    # 1-based integer line number
+    line_number: int
+    # column offset in line: 1-based int (constructed from a zero-indexed stored value)
+    column_offset: int
+
+
+class Code312Rust(Code311):
+    """Class for a RustPython 3.12 code object used when a Python
+    interpreter is not RustPython 3.12 but working on RustPython 3.12 bytecode. It
+    also functions as an object that can be used to build or write a
+    Python3 code object, since we allow mutable structures.
+
+    When done mutating, call method to_native().
+
+    For convenience in generating code objects, fields like
+    `co_consts`, co_names which are (immutable) tuples in the end-result can be stored
+    instead as (mutable) lists. Likewise, the line number table `co_lnotab`
+    can be stored as a simple list of offset, line_number tuples.
+
+    """
+    def __init__(
+        self,
+        co_argcount: int,
+        co_posonlyargcount: int,
+        co_kwonlyargcount: int,
+        co_stacksize: int,
+        co_flags: int,
+        co_code: bytes,
+        co_consts: tuple,
+        co_names: tuple[str],
+        co_varnames: tuple[str],
+        co_filename: str,
+        co_name: str,
+        co_firstlineno: int,
+        co_freevars: tuple,
+        co_cellvars: tuple,
+        version_triple: Tuple[int, int, int],
+        locations: tuple,
+        collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {},
+    ) -> None:
+        self.co_argcount = co_argcount
+        self.co_posonlyargcount = co_posonlyargcount
+        self.co_kwonlyargcount = co_kwonlyargcount
+        self.co_lnotab={}  # FIXME: compute this from locations.
+        self.co_stacksize = co_stacksize
+        self.co_flags = co_flags
+        self.co_code = co_code
+        self.co_consts = co_consts
+        self.co_names = co_names
+        self.co_varnames = co_varnames
+        self.co_filename = co_filename
+        self.co_name = co_name
+        self.co_firstlineno = co_firstlineno    # None if 0 in serialized form
+        self.co_cellvars = co_cellvars
+        self.co_freevars= co_freevars
+        self.co_collection_order = collection_order
+        self.version_triple = version_triple
+        self.locations = locations

xdis/codetype/code313rust.py

@@ -82,7 +82,6 @@ def __init__(
         self.co_linetable = co_linetable
         self.co_qualname = co_qualname
         self.co_cellvars = co_cellvars
-        self.co_linetable = co_linetable
         self.co_freevars= co_freevars
         self.co_exceptiontable = co_exceptiontable
         self.co_collection_order = collection_order

xdis/cross_dis.py

@@ -170,7 +170,7 @@ def findlinestarts(code, dup_lines: bool = False):
     Generate pairs (offset, lineno) as described in Python/compile.c.
     """
 
-    if hasattr(code, "co_lines"):
+    if hasattr(code, "co_lines") and hasattr(code, "co_linetable"):
         # Taken from 3.10 findlinestarts
         lastline = None
         for start, _, line in code.co_lines():
@@ -325,7 +325,7 @@ def format_code_info(
         lines.append("# Keyword-only arguments: %s" % co.co_kwonlyargcount)
 
     pos_argc = co.co_argcount
-    if version_tuple >= (1, 3):
+    if hasattr(co, "co_nlocals"):
         lines.append("# Number of locals:  %s" % co.co_nlocals)
     if version_tuple >= (1, 5):
         lines.append("# Stack size:        %s" % co.co_stacksize)

xdis/magics.py

@@ -47,11 +47,12 @@
 # See below for mapping to version numbers.
 PYPY3_MAGICS = (48, 64, 112, 160, 192, 240, 244, 256, 320, 336, 384, 416)
 
+# Rust Magics is a git commit number!
 RUSTPYTHON_MAGICS = (
     12641,  # RustPython 3.12
-    12897,  # RustPython 3.12
+    12897,  # RustPython 3.12.0 0.4.0
     13413,  # RustPython 3.13
-    24881,  # RustPython 3.13
+    24881,  # RustPython 3.13   0.4.0
 )
 
 # A list of interim Python version magic numbers used, but were not
@@ -695,9 +696,9 @@ def __by_version(magic_versions: Dict[bytes, str]) -> dict:
 add_magic_from_int(416, "3.11.13PyPy")  # PyPy 3.11.13 or pypy3.11-7.3.20
 
 add_magic_from_int(12641, "3.12.0a.rust")  # RustPython 3.12.0
-add_magic_from_int(12897, "3.13.0b.rust")  # RustPython 3.12.0
+add_magic_from_int(12897, "3.12.0.rust")   # RustPython 3.12.0 0.4.0
 add_magic_from_int(13413, "3.13.0a.rust")  # RustPython 3.13.0
-add_magic_from_int(24881, "3.13.0b.rust")  # RustPython 3.13.0
+add_magic_from_int(24881, "3.13.0b.rust")  # RustPython 3.13.0 0.4.0
 
 # Graal Python.  Graal uses its own JVM-ish CPython bytecode, not
 # true CPython or PyPy bytecode.

xdis/op_imports.py

@@ -19,6 +19,8 @@
 from typing import Tuple
 
 from xdis.magics import canonic_python_version
+from xdis.opcodes import opcode_12897rust  # 3.13.0 0.4.0
+from xdis.opcodes import opcode_24481rust  # 3.13.0 0.4.0
 from xdis.opcodes import (
     opcode_10,
     opcode_11,
@@ -60,7 +62,6 @@
     opcode_311pypy,
     opcode_312,
     opcode_313,
-    opcode_313rust,
     opcode_314,
 )
 from xdis.opcodes.opcode_graal import (
@@ -187,10 +188,11 @@
     3.11: opcode_311,
     "3.12.7Graal": opcode_312graal, # this right?
     "3.12.8Graal": opcode_312graal, # this right?
+    "3.12.0Rust": opcode_12897rust,
     "3.12.0rc2": opcode_312,
     "3.12.0": opcode_312,
     "3.13.0rc3": opcode_313,
-    "3.13.0Rust": opcode_313rust,
+    "3.13.0Rust": opcode_24481rust,
     "3.14b3": opcode_314,
     "3.14.0": opcode_314,
     "3.14": opcode_314,
@@ -211,7 +213,7 @@ def get_opcode_module(version_info: Tuple[int, ...], implementation: PythonImple
     if vers_str not in canonic_python_version:
         vers_str = version_tuple_to_str(version_info[:2])
 
-    if implementation != PythonImplementation.CPython:
+    if str(implementation) != str(PythonImplementation.CPython):
         vers_str += str(implementation)
 
     return op_imports[canonic_python_version[vers_str]]
@@ -330,4 +332,4 @@ def remap_opcodes(op_obj, alternate_opmap):
 
 if __name__ == "__main__":
     from version_info import PYTHON_IMPLEMENTATION, PYTHON_VERSION_TRIPLE
-    print(get_opcode_module(PYTHON_VERSION_TRIPLE, PYTHON_IMPLEMENTATION))
+    print(get_opcode_module(PYTHON_VERSION_TRIPLE[:2], PYTHON_IMPLEMENTATION))

xdis/opcodes/__init__.py

@@ -68,7 +68,7 @@
     opcode_310pypy,
     opcode_311pypy,
 )
-from xdis.opcodes.opcode_rust import opcode_313rust  # opcode_312rust,
+from xdis.opcodes.opcode_rust import opcode_12897rust, opcode_24481rust
 
 # from xdis.opcodes.opcode_graal import (
 #     opcode_310graal,
@@ -78,7 +78,6 @@
 #     )
 
 
-
 __all__ = [
     "opcode_10",
     "opcode_11",
@@ -123,9 +122,8 @@
     "opcode_39pypy",
     # "opcode_310graal",
     # "opcode_311graal",
-    # "opcode_312graal",
     "opcode_38graal",
     # "opcode_312rust",
-    "opcode_313rust",
-
+    "opcode_12897rust",
+    "opcode_24481rust",
 ]