diff options
| author | Tilka <tilkax@gmail.com> | 2019-08-20 21:28:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 21:28:52 +0100 |
| commit | bbae0424a1e9dddda9ac30d69661bf021c598634 (patch) | |
| tree | 1759799d7ba442f1742ab8a7c81f6cad3712d19c /Source/Core | |
| parent | 674a66aab2fa54c9b4c39a027d1701620fc0bafa (diff) | |
| parent | ee85ec95b49032afcd07d7225a7e636493477c76 (diff) | |
Merge pull request #8319 from Tilka/mcrfs
Jit64: fix mcrfs
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp index 6a5d7bb360..99c323398f 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -635,7 +635,7 @@ void Jit64::mcrfs(UGeckoInstruction inst) u32 mask = 0xF << shift; // Only clear exception bits (but not FEX/VX). - mask &= 0x9FF87000; + mask &= FPSCR_FX | FPSCR_ANY_X; MOV(32, R(RSCRATCH), PPCSTATE(fpscr)); if (cpu_info.bBMI1) @@ -649,7 +649,7 @@ void Jit64::mcrfs(UGeckoInstruction inst) SHR(32, R(RSCRATCH2), Imm8(shift)); AND(32, R(RSCRATCH2), Imm32(0xF)); } - AND(32, R(RSCRATCH), Imm32(mask)); + AND(32, R(RSCRATCH), Imm32(~mask)); MOV(32, PPCSTATE(fpscr), R(RSCRATCH)); LEA(64, RSCRATCH, MConst(PowerPC::ConditionRegister::s_crTable)); MOV(64, R(RSCRATCH), MComplex(RSCRATCH, RSCRATCH2, SCALE_8, 0)); |
