On option -x also show hex for co_code start

Author: rocky

xdis/cross_dis.py

@@ -272,7 +272,7 @@ def pretty_flags(flags, is_pypy=False) -> str:
 
 
 def format_code_info(
-    co, version_tuple: tuple, name=None, is_pypy=False, is_graal=False, file_offset: Optional[int]=None
+    co, version_tuple: tuple, name=None, is_pypy=False, is_graal=False, file_offset: Optional[tuple]=None
 ) -> str:
     if not name:
         name = co.co_name
@@ -286,7 +286,7 @@ def format_code_info(
     lines.append("# Filename:          %s" % co.co_filename)
 
     if file_offset:
-        lines.append("# Offset in file:    0x%x" % file_offset)
+        lines.append("# Offset in file:    0x%x" % file_offset[0])
 
     if not is_graal:
         if version_tuple >= (1, 3):
@@ -350,6 +350,10 @@ def format_code_info(
                 lines.append("# %4d: %s" % i_n)
                 pass
             pass
+
+    if file_offset:
+        lines.append("# co_code offset in file: 0x%x" % file_offset[1])
+
     return "\n".join(lines)
 
 

xdis/unmarshal.py

@@ -512,6 +512,11 @@ def t_code(self, save_ref, bytes_for_s: bool = False):
         else:
             co_flags = 0
 
+        # In recording the address of co_code_offset_in file, skip
+        # the type code indicator, e.g. "bytes" in 3.x and the size
+        # of the string.
+        co_code_offset_in_file = self.fp.tell() + 5
+
         co_code = self.r_object(bytes_for_s=True)
 
         # FIXME: Check/verify that is true:
@@ -635,7 +640,7 @@ def t_code(self, save_ref, bytes_for_s: bool = False):
             version_triple=self.version_tuple,
         )
 
-        self.code_to_file_offsets[code] = code_offset_in_file
+        self.code_to_file_offsets[code] = (code_offset_in_file, co_code_offset_in_file)
 
         self.code_objects[str(code)] = code
         ret = code