Improve Graal disasembly and graal 3.12 opcodes

Author: rocky

test/bytecode_graal312/02_async.graalpy312.pyc

@@ -193,6 +193,9 @@ def get_instructions_bytes_graal(
                 arg = 0
             break
 
+        if arg_count == 0:
+            arg = None
+
         inst_size = (arg_count + 1) + (extended_arg_count * 2)
         start_offset = offset if opc.oppop[opcode] == 0 else None
 

test/bytecode_graal312/02_build_map_unpack_with_call.graalpy312.pyc

@@ -1,4 +1,4 @@
-#  Copyright (c) 2018-2024 by Rocky Bernstein
+#  Copyright (c) 2018-2025 by Rocky Bernstein
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -434,7 +434,7 @@ def disassemble(
                     new_instruction[-2] = new_repr
                     new_instruction[-1] = start_offset
                     del instructions[-1]
-                    # See comment above abut the use of self.__class__
+                    # See comment above about the use of self.__class__
                     instructions.append(self.__class__(*new_instruction))
                     argval = self.argval
                     prefix = "" if argval is None else f"({argval}) | "

xdis/bytecode_graal.py

@@ -443,15 +443,17 @@
 #
 # Pushes: call result
 #
-call_op_graal(loc, "CALL_COMPREHENSION", 0x46, 0, 2, 1)
+call_op_graal(loc, "CALL_COMPREHENSION", 0x46, 0, 2)
 #
 # Calls a callable using an arguments array and keywords array.
 #
 # Pops: keyword args ({@code PKeyword[]}), then args ({@code Object[]}), then callable
 #
 # Pushes: call result
 #
-call_op_graal(loc, "CALL_FUNCTION_KW", 0x47, 0, 3, 1)
+call_op_graal(loc, "CALL_FUNCTION_KW", 0x47, 0, 3)
+arg_counts[0x47] = 0
+
 #
 # Calls a callable using an arguments array. No keywords are passed.
 #
@@ -650,7 +652,7 @@
 # necessary for keyword arguments merge. Note it works with dicts. Keyword arrays need to be
 # converted to dicts first.
 #
-def_op_graal(loc, "KWARGS_DICT_MERGE", 0x5F, 0, 2, 1)
+def_op_graal(loc, "KWARGS_DICT_MERGE", 0x5F, 0, 2, 0)
 #
 # Create a single {@link PKeyword} object. The name is determined by the immediate operand
 # which indexes the names array ({@code co_names})
@@ -815,4 +817,9 @@
 # FOR_ITER*
 # BINARY_SUBSCR*
 # and MORE!
+
+# Something is wrong here...
+collection_op_graal(loc, "COLLECTION_FROM_COLLECTION", 0xa0, 1, 1, 0)
+#
+
 update_sets(loc)

xdis/instruction.py

@@ -1095,7 +1095,12 @@ def t_code_old_or_graal(self, save_ref, bytes_for_s: bool = False):
     def t_graal_CodeUnit(self, save_ref, bytes_for_s: bool = False):
         """
         Graal Python code. This has fewer fields than Python
-        code. In particular, instructions are JVM bytecode.
+        code. Graal Python Bytecode is similar to Python Bytecode for
+        a given version, things are a little different, especially when it comes
+        to collections. Graal has intructions for homogeneous arrays.
+
+        Note that Graal's BytecodeCodeUnit has a dumpBytecode() method
+        to show assembly instructions.
         """
 
         graal_bytecode_version = self.graal_readByte()