Merge pull request #9791 from JosJuice/jitarm64-carbon

JitArm64: Fix clobbering LR in FakeLKExit
dolphin-emu · Jun 6, 2021 · fd4efd3 · fd4efd3
2 parents 684d09b + 4ef4ac4
commit fd4efd3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp
@@ -398,6 +398,7 @@ void JitArm64::FakeLKExit(u32 exit_address_after_return)
 
   // We may need to fake the BLR stack on inlined CALL instructions.
   // Else we can't return to this location any more.
+  gpr.Lock(ARM64Reg::W30);
   ARM64Reg after_reg = gpr.GetReg();
   ARM64Reg code_reg = gpr.GetReg();
   MOVI2R(after_reg, exit_address_after_return);
@@ -406,6 +407,7 @@ void JitArm64::FakeLKExit(u32 exit_address_after_return)
   gpr.Unlock(after_reg, code_reg);
 
   FixupBranch skip_exit = BL();
+  gpr.Unlock(ARM64Reg::W30);
 
   // Write the regular exit node after the return.
   JitBlock* b = js.curBlock;