Merge pull request #321 from tonybaloney/dis_sequence

Make the instruction dumps easier to read

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release notes
 
-## 1.0.0 (master)
+## 1.0.0 (beta6)
 
 * Updated to .NET 6 preview 6
 * Fixed a bug where `ord()` builtin would return the wrong type (#315)

Tests/test_dis.py

@@ -53,7 +53,7 @@ def test_f():
         with contextlib.redirect_stdout(f):
             dis(test_f, True)
         self.assertIn("ldarg.1", f.getvalue())
-        self.assertIn("Instruction(", f.getvalue())
+        self.assertIn("; 0 LOAD_CONST - 1 (1)", f.getvalue())
         dis(test_f, True)
 
     def test_fat_static(self):
@@ -111,7 +111,7 @@ def test_f():
         with contextlib.redirect_stdout(f):
             dis_native(test_f, True)
         self.assertIn("PUSH RBP", f.getvalue())
-        self.assertIn("Instruction(", f.getvalue())
+        self.assertIn("; 0 LOAD_CONST - 1 (1)", f.getvalue())
         dis_native(test_f, True)
 
 

setup.py

@@ -19,7 +19,7 @@
 
 setup(
     name='pyjion',
-    version='1.0.0b5',
+    version='1.0.0b6',
     description='A JIT compiler wrapper for CPython',
     author='Anthony Shaw',
     author_email='[email protected]',

src/pyjion/__init__.py

@@ -3,7 +3,7 @@
 import os
 import platform
 
-__version__ = '1.0.0b5'
+__version__ = '1.0.0b6'
 
 
 def _no_dotnet(path):

src/pyjion/dis.py

@@ -590,7 +590,8 @@ def print_il(il, offsets=None, bytecodes=None):
                 for py_offset, il_offset, native_offset in offsets:
                     if il_offset == pc:
                         try:
-                            print('; ', bytecodes[py_offset])
+                            instruction = bytecodes[py_offset]
+                            print(f'; {instruction.offset} {instruction.opname} - {instruction.arg} ({instruction.argval})', )
                         except KeyError:
                             warn("Invalid offset {0}".format(offsets))
             first = next(i)
@@ -736,7 +737,8 @@ def dis_native(f, include_offsets=False):
             for py_offset, il_offset, native_offset in jit_offsets:
                 if (position + native_offset) == offset:
                     try:
-                        print('; ', python_instructions[py_offset])
+                        instruction = python_instructions[py_offset]
+                        print(f'; {instruction.offset} {instruction.opname} - {instruction.arg} ({instruction.argval})', )
                     except KeyError:
                         warn("Invalid offset {0}".format(offsets))