From 93ec97697538072176196bae4364060acb88f669 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Sat, 13 Oct 2018 14:34:12 +0100
Subject: [PATCH] Jit_SystemRegisters: Correct behaviour for mtspr SPR_HID0
 (Redux)

* BTR modifies its argument.
* Do not fallthrough.
---
 Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
index 1cb5ddbbfa..37631239fe 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
@@ -238,16 +238,16 @@ void Jit64::mtspr(UGeckoInstruction inst)
 
   case SPR_HID0:
   {
-    gpr.BindToRegister(d, true, false);
-    BTR(32, gpr.R(d), Imm8(31 - 20));  // ICFI
-    MOV(32, PPCSTATE(spr[iIndex]), gpr.R(d));
+    MOV(32, R(RSCRATCH), gpr.R(d));
+    BTR(32, R(RSCRATCH), Imm8(31 - 20));  // ICFI
+    MOV(32, PPCSTATE(spr[iIndex]), R(RSCRATCH));
     FixupBranch dont_reset_icache = J_CC(CC_NC);
     BitSet32 regs = CallerSavedRegistersInUse();
     ABI_PushRegistersAndAdjustStack(regs, 0);
     ABI_CallFunction(DoICacheReset);
     ABI_PopRegistersAndAdjustStack(regs, 0);
     SetJumpTarget(dont_reset_icache);
-    break;
+    return;
   }
 
   default: