Skip to content

gh-105481: add pseudo-instructions to the cases DSL #105506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 11 commits into from
Jun 11, 2023
Merged

gh-105481: add pseudo-instructions to the cases DSL #105506

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b68004f
gh-105481: add pseudo-instructions to the cases DSL
iritkatriel Jun 8, 2023
de0a2ff
typo
iritkatriel Jun 8, 2023
11b6b38
comment
iritkatriel Jun 8, 2023
64fe811
regen
iritkatriel Jun 8, 2023
0929fac
add pseudos also to the metadata table
iritkatriel Jun 8, 2023
ae2255d
assert that opcodes are all < 512
iritkatriel Jun 10, 2023
096df7a
pushed, popped --> popped, pushed
iritkatriel Jun 10, 2023
28ca801
trailing comma
iritkatriel Jun 10, 2023
c91a179
fix type union
iritkatriel Jun 10, 2023
506eda5
add a few comments
iritkatriel Jun 10, 2023
7fe09fb
add assertions about metadata of pseudos
iritkatriel Jun 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add a few comments
  • Loading branch information
@iritkatriel
iritkatriel committed Jun 10, 2023
commit 506eda52efaed3577b6ba2d007abde99ca192044
6 changes: 6 additions & 0 deletions Tools/cases_generator/generate_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,7 @@ def analyze_macro(self, macro: parser.Macro) -> MacroInstruction:
def analyze_pseudo(self, pseudo: parser.Pseudo) -> PseudoInstruction:
targets = [self.instrs[target] for target in pseudo.targets]
assert targets
# Make sure the targets have the same fmt
fmts = list(set([t.instr_fmt for t in targets]))
assert(len(fmts) == 1)
return PseudoInstruction(pseudo.name, fmts[0], targets)
Expand Down Expand Up @@ -960,8 +961,13 @@ def effect_str(effects: list[StackEffect]) -> str:
case parser.Pseudo():
instr = self.pseudos[thing.name]
popped = pushed = None
# Calculate stack effect, and check that it's the the same
# for all targets.
for target in self.pseudos[thing.name].targets:
Comment thread
gvanrossum marked this conversation as resolved.
target_instr = self.instrs.get(target)
# Currently target is always an instr. This could change
# in the future, e.g., if we have a pseudo targetting a
# macro instruction.
assert target_instr
Comment thread
iritkatriel marked this conversation as resolved.
target_popped = effect_str(target_instr.input_effects)
target_pushed = effect_str(target_instr.output_effects)
Comment thread
iritkatriel marked this conversation as resolved.
Expand Down