8000 gh-98831: Use opcode metadata for stack_effect() by gvanrossum · Pull Request #101704 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-98831: Use opcode metadata for stack_effect() #101704

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
merged 8 commits into from
Feb 9, 2023
Merged

gh-98831: Use opcode metadata for stack_effect() #101704

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f59751d
Write output and metadata in a single run
gvanrossum Feb 8, 2023
383c1fc
Declare or define opcode metadata based on NEED_OPCODE_TABLES
gvanrossum Feb 8, 2023
c5db6bc
Use generated metadata for stack_effect()
gvanrossum Feb 8, 2023
683d8f7
compile.o depends on opcode_metadata.h
gvanrossum Feb 8, 2023
a271ebc
Return -1 for unknown opcode
gvanrossum Feb 8, 2023
977e639
Support jump<0 in stack_effect()
gvanrossum Feb 8, 2023
bd19d79
stack_effect() for specialized opcode is an error
gvanrossum Feb 8, 2023
658ea17
Use MAX_REAL_OPCODE as upper opcode limit
gvanrossum Feb 8, 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
Support jump<0 in stack_effect()
  • Loading branch information
@gvanrossum
gvanrossum committed Feb 8, 2023
commit 977e639d46304a3ed420a71a266009979a836245
29 changes: 26 additions & 3 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,12 +1075,35 @@ static int
stack_effect(int opcode, int oparg, int jump)
{
if (0 <= opcode && opcode < 256) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have these:

#define MAX_REAL_OPCODE 254
 
#define IS_WITHIN_OPCODE_RANGE(opcode) \
        (((opcode) >= 0 && (opcode) <= MAX_REAL_OPCODE) || \
         IS_PSEUDO_OPCODE(opcode))

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I'll use opcode <= MAX_REAL_OPCODE. I feel we don't need IS_PSEUDO_OPCODE() because the switch will take care of that.

int popped = _PyOpcode_num_popped(opcode, oparg, jump);
int pushed = _PyOpcode_num_pushed(opcode, oparg, jump);
int popped, pushed;
if (jump > 0) {
popped = _PyOpcode_num_popped(opcode, oparg, true);
pushed = _PyOpcode_num_pushed(opcode, oparg, true);
}
else {
popped = _PyOpcode_num_popped(opcode, oparg, false);
pushed = _PyOpcode_num_pushed(opcode, oparg, false);
}
if (popped < 0 || pushed < 0) {
return PY_INVALID_STACK_EFFECT;
}
return pushed - popped;
if (jump >= 0) {
return pushed - popped;
}
if (jump < 0) {
// Compute max(pushed - popped, alt_pushed - alt_popped)
int alt_popped = _PyOpcode_num_popped(opcode, oparg, true);
int alt_pushed = _PyOpcode_num_pushed(opcode, oparg, true);
if (alt_popped < 0 || alt_pushed < 0) {
return PY_INVALID_STACK_EFFECT;
}
int diff = pushed - popped;
int alt_diff = alt_pushed - alt_popped;
if (alt_diff > diff) {
return alt_diff;
}
return diff;
}
}

// Pseudo ops
Expand Down
0