Handle more graal unmarshaling...

Graal 3.10 added, Code for graal-specific unmarshal routines have been added.

Author: rocky

xdis/codetype/__init__.py

@@ -226,24 +226,24 @@ def portableCodeType(version_triple=PYTHON_VERSION_TRIPLE):
 # Note: default values of `None` indicate a required parameter.
 # default values of -1, (None,) or "" indicate an unsupplied parameter.
 def to_portable(
-    co_argcount,
+    co_argcount: int,
     co_posonlyargcount: Optional[int] = -1,  # 3.8 .. 3.10
     co_kwonlyargcount: Optional[int] = -1,  # 3.0+
-    co_nlocals=None,
+    co_nlocals: int=0,
     co_stacksize: Optional[int] = -1,  # 1.5+
-    co_flags=None,
-    co_code=None,  # 3.0+ this type changes from <str> to <bytes>
-    co_consts=None,
-    co_names=None,
-    co_varnames=None,
-    co_filename=None,
-    co_name=None,
-    co_qualname=None,
+    co_flags: int=0,
+    co_code: Union[str, bytes]="",  # 3.0+ this type changes from <str> to <bytes>
+    co_consts: tuple[str, ...]=tuple(),
+    co_names: tuple[str, ...]=tuple(),
+    co_varnames: tuple[str, ...]=tuple(),
+    co_filename: str="??",
+    co_name: str="??",
+    co_qualname: str="??",
     co_firstlineno: int=-1,
     co_lnotab: str="",  # 1.5+; 3.0+ this type changes from <str> to <bytes>
     # In 3.11 it is different
-    co_freevars: tuple[None]=(None,),  # 2.0+
-    co_cellvars: tuple[None]=(None,),  # 2.0+
+    co_freevars: tuple[str, ...]=tuple(),  # 2.0+
+    co_cellvars: tuple[str, ...]=tuple(),  # 2.0+
     co_exceptiontable=None,  # 3.11+
     version_triple=PYTHON_VERSION_TRIPLE,
     collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {},

xdis/codetype/base.py

@@ -15,6 +15,7 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import inspect
+from typing import Union
 
 
 def iscode(obj):
@@ -39,10 +40,17 @@ def code_has_star_star_arg(code):
 
 class CodeBase:
     # These mimic some of the attributes in a Python code type
-    co_code: bytes
-    co_name: str
+    co_argcount: int
+    co_code: Union[bytes, str]
+    co_consts: tuple
     co_filename: str
     co_firstlineno: int
+    co_kwposonlyargcount: int
+    co_name: str
+    co_nlocals: int
+    co_posonlyargcount: int
+    co_stacksize: int
+    co_varnames: tuple
 
     # Mimic Python 3 code access functions
     def __len__(self) -> int:

xdis/disasm.py

@@ -243,6 +243,8 @@ def disco_loop(
                     real_out.write("\n# Instruction disassembly not supported here.\n")
                 else:
                     real_out.write(f"\n# Instruction disassembly for {co.co_name} not supported here.\n")
+                real_out.write(f"instruction bytecode:\n{co.co_code.hex(':')}\n")
+
             else:
                 bytecode = Bytecode(co, opc, dup_lines=dup_lines)
                 real_out.write(
@@ -397,9 +399,6 @@ def disassemble_file(
 
     is_graal = magic_int in GRAAL3_MAGICS
 
-    if is_graal and save_file_offsets:
-        outstream.write("\n# Option showing file hex offsets (-x) ignored; not supported in Graal bytecode.\n")
-
     if asm_format == "header":
         show_module_header(
             version_tuple,

xdis/load.py

@@ -236,7 +236,7 @@ def load_module_from_file_object(
 
         try:
             # FIXME: use the internal routine below
-            tuple_version = magic_int2tuple(magic_int)
+            version_triple = magic_int2tuple(magic_int)
         except KeyError:
             if len(magic) >= 2:
                 raise ImportError(
@@ -346,7 +346,7 @@ def load_module_from_file_object(
         fp.close()
 
     return (
-        tuple_version,
+        version_triple,
         timestamp,
         magic_int,
         co,

xdis/magics.py

@@ -42,7 +42,7 @@
 from xdis.version_info import IS_GRAAL, IS_PYPY, IS_RUST, version_tuple_to_str
 
 GRAAL3_MAGICS = (21150, 21280, 21290)
-UNSUPPORTED_GRAAL3_MAGICS = (21150, 21280)
+UNSUPPORTED_GRAAL3_MAGICS = (21150,)
 JYTHON_MAGICS = (1011, 65526)
 
 # See below for mapping to version numbers.