Go over graal COLLECTION_KIND

Author: rocky

xdis/bytecode.py

@@ -536,7 +536,6 @@ def get_instructions_bytes(
             yield instruction
         offset = next_offset(instruction.opcode, opc, instruction.offset)
 
-
 class Bytecode:
     """Bytecode operations involving a Python code object.
 

xdis/bytecode_graal.py

@@ -6,8 +6,8 @@
 from xdis.lineoffsets_graal import find_linestarts_graal
 from xdis.opcodes.base_graal import (
     BINARY_OPS,
-    COLLECTION_KIND,
     UNARY_OPS,
+    collection_to_str,
     get_optype_graal,
 )
 
@@ -167,7 +167,7 @@ def get_instructions_bytes_graal(
 
             elif optype == "collection":
                 argval = arg
-                argrepr = COLLECTION_KIND.get(arg, "??")
+                argrepr = collection_to_str(arg)
                 break
             elif opcode == opc.opmap["UNPACK_EX"]:
                 argrepr = "%d, %d" % (arg, Byte.toUnsignedInt(following_args[0]))

xdis/opcodes/base_graal.py

@@ -128,22 +128,43 @@ def findlabels(bytecode, opc):
     33: "INPLACE_MATMUL",
 }
 
+COLLECTION_KIND_SHIFT = 5
+COLLECTION_KIND_MASK = (1 << COLLECTION_KIND_SHIFT) - 1
 COLLECTION_KIND = {
-    32: "list",
-    67: "tuple",  # Probably need to use a mask
-    99: "tuple",  # probably need to use a mask
-    3: "set",
-    4: "dict",
-    5: "kw",
-    6: "object",
+    0b001: "list",
+    0b010: "tuple",  # Probably need to use a mask
+    0b011: "set",
+    0b100: "dict",
+    0b101: "PKeyword",
+    0b110: "Object",
+    # #
+    # 99: "tuple",  # probably need to use a mask
+    # 160: "object",
+    # 192: "object",
 }
 
+COLLECTION_KIND_ELEMENT = {
+    0: "",
+    1: "int",
+    2: "long",
+    3: "boolean",
+    4: "double",
+    5: "object"
+}
+
+
 UNARY_OPS = {
     0: "NOT",
     31: "IS",
     30: "IN",
 }
 
+def collection_to_str(collection_value: int) -> str:
+    kind = collection_value >> COLLECTION_KIND_SHIFT
+    kind_str = COLLECTION_KIND.get(kind, "??")
+    element_type = collection_value & COLLECTION_KIND_MASK
+    element_str = COLLECTION_KIND_ELEMENT.get(element_type, "??")
+    return f"{kind_str}[{element_str}]"
 
 def binary_op_graal(
     loc: dict,