skip now ignores jumps #54
Merged
Conversation
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
Collaborator
Author
|
Failing test does not seem related. |
StevenCostiou
requested changes
Nov 18, 2022
Sindarin/SindarinDebugger.class.st
Outdated
Comment on lines
568
to
570
| self node isMessage ifTrue: [ ^ self skipMessageNode ]. | ||
| self node isMethod ifTrue: [ ^ self step ]. | ||
| self node isBlock ifTrue: [ ^ self skipBlockNode ]. |
Sindarin/SindarinDebugger.class.st
Outdated
Comment on lines
565
to
567
| (instructionStream willJumpTo or: [ | ||
| instructionStream willJumpIfFalse or: [ | ||
| instructionStream willJumpIfTrue ] ]) ifTrue: [ ^ self skipJump ]. |
Member
There was a problem hiding this comment.
refactor in InstructionStream>>willJump
Sindarin/SindarinDebugger.class.st
Outdated
| each offset = self pc ]. | ||
|
|
||
| (self node isReturn or: [ | ||
| nextBytecode bytes first between: 88 and: 94 ]) ifTrue: [ |
Member
There was a problem hiding this comment.
= instructionSteram willReturn
…le + using InstructionStream>>#willReturn in SindarinDebugger>>#skip instead of hardcoding the list of return bytecodes
…t-encounters-a-jumpFalse-or-a-jumpTrue-bytecode
Collaborator
Author
|
It fails because of a fuel test and other tests ... so not related |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #51.
skip used to step over jump bytecodes. Notably, if a comparison before a
ifTrue:ifFalse:message was skipped, it used to skip the comparison and then step the jumpIfFalse bytecode. As this bytecode expected a boolean on the stack (the result of the comparison that has been skipped) and as the result on the stack is (probably) not a boolean, an exceptionMustBeBooleanwas raised and was not handled. As a result,skipUpToentered an infinite loop because we would never reach the aimed node.Now, skips stops on jump bytecodes (notably on
ifTrue:ifFalsemessages) and manages these bytecodes separately: it pops the argument if it has one (this is the case for jumpTrue: and jumpFalse: bytecodes) and it simply does not execute the jump bytecode. Then, it steps to the first next interesting bytecode (I reimplemented this function inDebugSessionto stop on jump bytecodes