Remove support for legacy instructions

gvanrossum · gvanrossum · commit d84c30fec57e · 2023-02-07T20:26:07.000-08:00
diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
@@ -198,7 +198,7 @@ class Instruction:
     # Parts of the underlying instruction definition
     inst: parser.InstDef
     register: bool
-    kind: typing.Literal["inst", "op", "legacy"]  # Legacy means no (input -- output)
+    kind: typing.Literal["inst", "op"]
     name: str
     block: parser.Block
     block_text: list[str]  # Block.text, less curlies, less PREDICT() calls
@@ -838,8 +838,6 @@ def get_stack_effect_info(
         self, thing: parser.InstDef | parser.Super | parser.Macro
     ) -> tuple[AnyInstruction | None, str, str]:
         def effect_str(effects: list[StackEffect]) -> str:
-            if getattr(thing, "kind", None) == "legacy":
-                return str(-1)
             n_effect, sym_effect = list_effect_size(effects)
             if sym_effect:
                 return f"{sym_effect} + {n_effect}" if n_effect else sym_effect
@@ -966,15 +964,12 @@ def write_metadata(self) -> None:
     def write_metadata_for_inst(self, instr: Instruction) -> None:
         """Write metadata for a single instruction."""
         dir_op1 = dir_op2 = dir_op3 = "DIR_NONE"
-        if instr.kind == "legacy":
-            assert not instr.register
-        else:
-            if instr.register:
-                directions: list[str] = []
-                directions.extend("DIR_READ" for _ in instr.input_effects)
-                directions.extend("DIR_WRITE" for _ in instr.output_effects)
-                directions.extend("DIR_NONE" for _ in range(3))
-                dir_op1, dir_op2, dir_op3 = directions[:3]
+        if instr.register:
+            directions: list[str] = []
+            directions.extend("DIR_READ" for _ in instr.input_effects)
+            directions.extend("DIR_WRITE" for _ in instr.output_effects)
+            directions.extend("DIR_NONE" for _ in range(3))
+            dir_op1, dir_op2, dir_op3 = directions[:3]
         self.out.emit(
             f"    [{instr.name}] = {{ {dir_op1}, {dir_op2}, {dir_op3}, true, {INSTR_FMT_PREFIX}{instr.instr_fmt} }},"
         )
diff --git a/Tools/cases_generator/parser.py b/Tools/cases_generator/parser.py
@@ -100,7 +100,7 @@ class OpName(Node):
 @dataclass
 class InstHeader(Node):
     register: bool
-    kind: Literal["inst", "op", "legacy"]  # Legacy means no (inputs -- outputs)
+    kind: Literal["inst", "op"]
     name: str
     inputs: list[InputEffect]
     outputs: list[OutputEffect]
@@ -109,7 +109,7 @@ class InstHeader(Node):
 @dataclass
 class InstDef(Node):
     register: bool
-    kind: Literal["inst", "op", "legacy"]
+    kind: Literal["inst", "op"]
     name: str
     inputs: list[InputEffect]
     outputs: list[OutputEffect]
@@ -172,9 +172,6 @@ def inst_header(self) -> InstHeader | None:
                     if self.expect(lx.RPAREN):
                         if (tkn := self.peek()) and tkn.kind == lx.LBRACE:
                             return InstHeader(register, kind, name, inp, outp)
-                elif self.expect(lx.RPAREN) and kind == "inst":
-                    # No legacy stack effect if kind is "op".
-                    return InstHeader(register, "legacy", name, [], [])
         return None
 
     def io_effect(self) -> tuple[list[InputEffect], list[OutputEffect]]:
diff --git a/Tools/cases_generator/test_generator.py b/Tools/cases_generator/test_generator.py
@@ -62,20 +62,6 @@ def run_cases_test(input: str, expected: str):
     #     print("End")
     assert actual.rstrip() == expected.rstrip()
 
-def test_legacy():
-    input = """
-        inst(OP) {
-            spam();
-        }
-    """
-    output = """
-        TARGET(OP) {
-            spam();
-            DISPATCH();
-        }
-    """
-    run_cases_test(input, output)
-
 def test_inst_no_args():
     input = """
         inst(OP, (--)) {
