Replace opcode defines with enum in pycore_opcode_metadata

arhadthedev · Nov 14, 2023 · ce52bc9 · ce52bc9
1 parent 0ff6368
commit ce52bc9
Show file tree

Hide file tree

Showing 2 changed files with 106 additions and 96 deletions.
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
@@ -422,7 +422,15 @@ def write_metadata(self, metadata_filename: str, pymetadata_filename: str) -> No
             self.write_pseudo_instrs()
 
             self.out.emit("")
-            self.write_uop_items(lambda name, counter: f"#define {name} {counter}")
+            self.out.emit("enum _Py_OPCODES {")
+            next_uop_id = 0
+            def define_uop(name, uop_id):
+                nonlocal next_uop_id
+                value = "" if uop_id == next_uop_id else f" = {uop_id}"
+                next_uop_id = uop_id + 1
+                return f"    {name}{value},"
+            self.write_uop_items(define_uop)
+            self.out.emit("};")
 
             self.write_stack_effect_functions()