Merge pull request #8319 from Tilka/mcrfs

Jit64: fix mcrfs
dolphin-emu · Aug 20, 2019 · bbae042 · bbae042
2 parents 674a66a + ee85ec9
commit bbae042
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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));