Merge branch 'master' into lineoffset-refactor

Author: rocky

pytest/test_disasm.py

@@ -68,8 +68,8 @@ def run_check_disasm(test_tuple, function_to_test):
     got = "\n".join(got_lines[skip_lines:])
 
     if "XDIS_DONT_WRITE_DOT_GOT_FILES" not in os.environ:
+        got_filename = filename_expected + ".got"
         if got != expected:
-            got_filename = filename_expected + ".got"
             with open(got_filename, "w") as out:
                 out.write(got)
         assert got == expected, f"see {got_filename} for diffs"

pytest/test_opcode.py

@@ -1,15 +1,16 @@
 import dis
 
 import pytest
-from xdis import IS_PYPY, PYTHON_VERSION_TRIPLE, get_opcode
+from xdis import get_opcode
+from xdis.version_info import IS_PYPY, PYTHON_IMPLEMENTATION, PYTHON_VERSION_TRIPLE
 
 
 @pytest.mark.skipif(
     PYTHON_VERSION_TRIPLE >= (3, 14),
     reason="Python >= 3.14 is not complete.",
 )
 def test_opcode() -> None:
-    opc = get_opcode(PYTHON_VERSION_TRIPLE, IS_PYPY)
+    opc = get_opcode(PYTHON_VERSION_TRIPLE, PYTHON_IMPLEMENTATION)
     opmap = dict([(k.replace("+", "_"), v) for (k, v) in dis.opmap.items()])
     #        (2, 7),
     #        (3, 6),

xdis/cross_dis.py

@@ -273,9 +273,10 @@ def pretty_flags(flags, python_implementation=PYTHON_IMPLEMENTATION) -> str:
     for i in range(32):
         flag = 1 << i
         if flags & flag:
-            names.append(COMPILER_FLAG_NAMES.get(flag, hex(flag)))
-            if python_implementation == PythonImplementation.PyPy:
+            if python_implementation == PythonImplementation.PyPy and flag in PYPY_COMPILER_FLAG_NAMES:
                 names.append(PYPY_COMPILER_FLAG_NAMES.get(flag, hex(flag)))
+            else:
+                names.append(COMPILER_FLAG_NAMES.get(flag, hex(flag)))
             flags ^= flag
             if not flags:
                 break

xdis/disasm.py

@@ -50,7 +50,12 @@
 
 # FIXME we may also need to distinguish by magic_int2magic
 # (for 3.8.5 Graal for example.)
-def get_opcode(version_tuple: tuple, python_implementation, alternate_opmap=None, magic_int: int=-1):
+def get_opcode(
+    version_tuple: tuple,
+    python_implementation,
+    alternate_opmap=None,
+    magic_int: int = -1,
+):
     # Set up disassembler with the right opcodes
     lookup = ".".join((str(i) for i in version_tuple))
     if python_implementation == PythonImplementation.PyPy:
@@ -198,7 +203,7 @@ def disco(
             show_source=show_source,
             methods=methods,
             file_offsets=file_offsets,
-            is_unusual_bytecode=magic_int in GRAAL3_MAGICS
+            is_unusual_bytecode=magic_int in GRAAL3_MAGICS,
         )
 
 
@@ -262,9 +267,7 @@ def disco_loop(
 
             if version_tuple >= (3, 11):
                 if bytecode.exception_entries not in (None, []):
-                    exception_table = format_exception_table(
-                        bytecode, version_tuple
-                    )
+                    exception_table = format_exception_table(bytecode, version_tuple)
                     real_out.write(exception_table + "\n")
 
         for c in co.co_consts:
@@ -345,7 +348,16 @@ def disco_loop_asm_format(
     co = co.freeze()
     all_fns.add(co_name)
     if co.co_name != "<module>" or co.co_filename:
-        real_out.write("\n" + format_code_info(co, version_tuple, mapped_name) + "\n")
+        real_out.write(
+            "\n"
+            + format_code_info(
+                co,
+                version_tuple,
+                mapped_name,
+                python_implementation=opc.python_implementation,
+            )
+            + "\n"
+        )
 
     bytecode = Bytecode(co, opc, dup_lines=True)
     real_out.write(bytecode.dis(asm_format="asm") + "\n")

xdis/opcodes/opcode_311pypy.py

@@ -1,12 +1,14 @@
 # (C) Copyright 2025 by Rocky Bernstein
-"""
-PYPY 3.11 opcodes
+"""PYPY 3.11 opcodes
+
+PyPy's 3.11 opcodes are more like CPython's 3.10's opcode.py than CPython 3.11 opcodes.
+
+We add some classification of stack usage and information for
+formatting instructions.
 
-This is a like Python's 3.10's opcode.py  with some classification
-of stack usage and information for formatting instructions.
 """
 
-import xdis.opcodes.opcode_310 as opcode_310
+import xdis.opcodes.opcode_310 as opcode_311
 from xdis.opcodes.base import (
     def_op,
     finalize_opcodes,
@@ -24,14 +26,14 @@
 python_implementation = PythonImplementation("PyPy")
 
 loc = locals()
-init_opdata(loc, opcode_310, version_tuple, is_pypy=True)
+init_opdata(loc, opcode_311, version_tuple, is_pypy=True)
 
 
 # fmt: off
 # Changed opcodes
 # ----------------------
 
-# Removed from Python 3.10
+# Removed from Python 3.11
 # ----------------
 
 rm_op(loc,  "GEN_START",              129)