Bang on RustPython

Author: rocky

xdis/magics.py

@@ -38,13 +38,14 @@
 from importlib.util import MAGIC_NUMBER as MAGIC
 from typing import Dict, Set
 
-from xdis.version_info import IS_GRAAL, IS_PYPY, version_tuple_to_str
+from xdis.version_info import IS_GRAAL, IS_PYPY, IS_RUST, version_tuple_to_str
 
 PYPY3_MAGICS = (48, 64, 112, 160, 192, 240, 244, 256, 336, 384, 416)
 GRAAL3_MAGICS = (21150, 21280, 21290)
 RUSTPYTHON_MAGICS = (
-    12641, # RustPython 3.13
-    12897  # RustPython 3.12
+    12641, # RustPython 3.12
+    12897,  # RustPython 3.12
+    13413,  # RustPython 3.13
 )
 
 
@@ -625,8 +626,9 @@ def __by_version(magic_versions: Dict[bytes, str]) -> dict:
 add_magic_from_int(384, "3.10pypy")  # PyPy 3.10.12
 add_magic_from_int(416, "3.11.13pypy")  # PyPy 3.11.13
 
-add_magic_from_int(12897, "3.12.0rust")  # RustPython 3.12.0
-add_magic_from_int(12641, "3.13.0rust")  # RustPython 3.13.0
+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(13413, "3.13.0.rust")  # RustPython 3.13.0
 
 # Graal uses JVM bytecode, not Python bytecode
 add_magic_from_int(21150, "3.8.5Graal")
@@ -831,12 +833,14 @@ def sysinfo2magic(version_info: tuple=tuple(sys.version_info)) -> bytes:
         vers_str += "pypy"
     elif IS_GRAAL:
         vers_str += "Graal"
+    elif IS_RUST:
+        vers_str += "Rust"
     else:
         try:
             import platform
 
             platform_str = platform.python_implementation()
-            if platform_str in ("Jython", "Pyston", "GraalVM"):
+            if platform_str in ("GraalVM", "Jython", "Pyston", "RustPython"):
                 vers_str += platform_str
                 pass
         except ImportError:

xdis/opcodes/base.py

@@ -255,7 +255,7 @@ def local_op(loc, name, opcode: int, pop=0, push=1) -> None:
     loc["nullaryop"].add(opcode)
 
 
-def name_op(loc: int, op_name, opcode: int, pop=-2, push=-2) -> None:
+def name_op(loc: dict, op_name, opcode: int, pop=-2, push=-2) -> None:
     """
     Put opcode in the class of instructions that index into the "name" table.
     """
@@ -341,7 +341,7 @@ def rm_op(loc, name, op) -> None:
     del loc["opmap"][name]
 
 
-def store_op(loc: int, name, op, pop=0, push=1, is_type="def") -> None:
+def store_op(loc: dict, name: str, op, pop=0, push=1, is_type="def") -> None:
     if is_type == "name":
         name_op(loc, name, op, pop, push)
         loc["nullaryop"].remove(op)

xdis/opcodes/opcode_311.py

@@ -173,7 +173,7 @@
 loc["nullaryloadop"].add(137)
 
 store_op(loc, "STORE_DEREF",                  138,   1, 0, is_type="free")
-def_op(loc, "DELETE_DEREF",                   139,   0, 0)
+free_op(loc, "DELETE_DEREF",                  139,   0, 0)
 
 # These are added since 3.10...
 #          OP NAME                         OPCODE  POP PUSH
@@ -216,11 +216,11 @@
 # new jump
 jrel_op(loc, "JUMP_BACKWARD_NO_INTERRUPT",    134,   0, 0)
 # new create cells op
-jrel_op(loc, "MAKE_CELL",                     135,   0, 0)
+free_op(loc, "MAKE_CELL",                     135,   0, 0)
 # new exception handling
+jrel_op(loc, "PUSH_EXC_INFO",                  35,   0, 1)
 jrel_op(loc, "CHECK_EG_MATCH",                 37,   0, 0)
 jrel_op(loc, "PREP_RERAISE_STAR",              88,   1, 0)
-jrel_op(loc, "PUSH_EXC_INFO",                  35,   0, 1)
 # resume, acts like a nop
 def_op(loc, "RESUME",                         151,   0, 0)
 

xdis/opcodes/opcode_312.py

@@ -12,6 +12,7 @@
     finalize_opcodes,
     init_opdata,
     jrel_op,
+    local_op,
     name_op,
     rm_op,
     update_pj3,
@@ -75,7 +76,7 @@
 def_op(loc    , "CLEANUP_THROW"                    , 55 ,   2, 1)
 def_op(loc    , "LOAD_LOCALS"                      , 87 ,   0, 1)
 def_op(loc    , "RETURN_CONST"                     , 121,   0, 0)
-def_op(loc    , "LOAD_FAST_CHECK"                  , 127,   0, 1)
+local_op(loc  , "LOAD_FAST_CHECK"                  , 127,   0, 1)
 
 jrel_op(loc   , "POP_JUMP_IF_FALSE"                , 114,   1, 0)
 jrel_op(loc   , "POP_JUMP_IF_TRUE"                 , 115,   1, 0)