JitArm64: Don't hardcode exception constants #9866
Merged
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
Unlike most constants we emit in JitArm64, these constants are *not* inherent to the CPU we're emulating, and can have whatever values we want. Let's handle them more robustly, in case we decide to change their values in the future.
|
FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:
automated-fifoci-reporter |
leoetlino
reviewed
Jul 6, 2021
leoetlino
approved these changes
Jul 6, 2021
| @@ -218,7 +218,7 @@ void JitArm64::twx(UGeckoInstruction inst) | |||
| fpr.Flush(FlushMode::MaintainState); | |||
|
|
|||
| LDR(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF(Exceptions)); | |||
| ORR(WA, WA, 24, 0); // Same as WA | EXCEPTION_PROGRAM | |||
| ORRI2R(WA, WA, EXCEPTION_PROGRAM); | |||
There was a problem hiding this comment.
Worth noting that there was a bug in the previous code, which actually OR'd with EXCEPTION_PERFORMANCE_MONITOR (0x100), not EXCEPTION_PROGRAM (0x80).
JosJuice
commented
Jul 7, 2021
| @@ -774,7 +774,7 @@ void JitArm64::DoJit(u32 em_address, JitBlock* b, u32 nextPC) | |||
| ARM64Reg WA = gpr.GetReg(); | |||
| ARM64Reg XA = EncodeRegTo64(WA); | |||
| LDR(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF(Exceptions)); | |||
| FixupBranch NoExtException = TBZ(WA, 3); // EXCEPTION_EXTERNAL_INT | |||
| FixupBranch NoExtException = TBZ(WA, IntLog2(EXCEPTION_EXTERNAL_INT)); | |||
There was a problem hiding this comment.
This change specifically seems to have broken Pokémon XD (and presumably other games as well). Will investigate.
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.
Split out from PR #9865, since I don't think that PR is going to be merged any time soon.
Unlike most constants we emit in JitArm64, these constants are not inherent to the CPU we're emulating, and can have whatever values we want, so let's handle them in a more robust way. I was rather confused when I found out that a previous iteration of PR #9865 broke JitArm64, because I hadn't thought that making some simple changes to the values of an enum would do it!