DSPDisassembler: Fix LSR/ASR formatting #9980
Merged
+3
−2
Conversation
This file contains 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
Originally, 1479 (for example) would disassemble as `lsr $ACC0, #-7`. At some point (likely the conversion to fmt), this regressed to `lsr $ACC0, #4294967289`. Now, it disassembles as `lsr $ACC0, dolphin-emu#7`.
Pokechu22
commented
Jul 31, 2021
| buf += fmt::format("#{}", (val & 0x20) != 0 ? (val | 0xFFFFFFC0) : val); | ||
| // Left and right shifts function essentially as a single shift by a 7-bit signed value, | ||
| // but are split into two intructions for clarity. | ||
| buf += fmt::format("#{}", (val & 0x20) != 0 ? (64 - val) : val); |
There was a problem hiding this comment.
Note that the check with val & 0x20 is a bit suspicious too; based on the interpreter code, the actual field is 6 bits, with the 7th bit (not included in the mask) acting as a sign bit. Since the accumulators are 48 bits, there could be a shift by over 32 bits which would incorrectly trigger the current code (though I'm not sure this actually happens). Since this code is already a special case for LSL/LSR/ASL/ASR, the 7th bit could be checked here, but it would be somewhat jank.
|
FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:
automated-fifoci-reporter |
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.
Originally, 1479 (for example) would disassemble as
lsr $ACC0, #-7. At some point (likely the conversion to fmt), this regressed tolsr $ACC0, #4294967289. Now, it disassembles aslsr $ACC0, #7.Changes to DSP_UC_347112BA.txt (Wii Menu)
Changes to DSP_UC_56D36052.txt (Super Mario Sunshine)