Merge pull request #7493 from dolphin-emu/revert-7491-SPR_HID0

Revert "Jit_SystemRegisters: Correct behaviour for mtspr SPR_HID0"
dolphin-emu · Oct 13, 2018 · ff17e2f · ff17e2f
2 parents 2bdee9b + 2508f6c
commit ff17e2f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
@@ -238,9 +238,9 @@ void Jit64::mtspr(UGeckoInstruction inst)
 
   case SPR_HID0:
   {
-    MOV(32, R(RSCRATCH), gpr.R(d));
-    BTR(32, R(RSCRATCH), Imm8(31 - 20));  // ICFI
-    MOV(32, PPCSTATE(spr[iIndex]), R(RSCRATCH));
+    gpr.BindToRegister(d, true, false);
+    BTR(32, gpr.R(d), Imm8(31 - 20));  // ICFI
+    MOV(32, PPCSTATE(spr[iIndex]), gpr.R(d));
     FixupBranch dont_reset_icache = J_CC(CC_NC);
     BitSet32 regs = CallerSavedRegistersInUse();
     ABI_PushRegistersAndAdjustStack(regs, 0);