GH-100982: Add COMPARE_AND_BRANCH instruction - #100983
Merged
markshannon merged 10 commits intoJan 16, 2023
Merged
Conversation
iritkatriel
reviewed
Jan 12, 2023
Comment thread
Lib/opcode.py
| jrel_op('JUMP_BACKWARD', 140) # Number of words to skip (backwards) | ||
|
|
||
| def_op('COMPARE_AND_BRANCH', 141) # Comparison and jump | ||
| hascompare.append(141) |
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
This opcode needs to be in hasjrel as well.
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
There was a problem hiding this comment.
The problem is that dis sees COMPARE_AND_BRANCH, then POP_JUMP_IF_. The POP_JUMP_IF_ is where we jump from.
So marking COMPARE_AND_BRANCH as a jump confuses dis, it thinks the operator is a jump offset. COMPARE_AND_BRANCH is effectively a superinstruction.
I could special case COMPARE_AND_BRANCH in dis, but I think it might be better to wait for proper support for longer instructions.
Sorry, something went wrong.
Comment thread
Lib/importlib/_bootstrap_external.py
iritkatriel
approved these changes
Jan 16, 2023
iritkatriel
reviewed
Jan 16, 2023
Comment thread
Python/specialize.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.