Merge pull request #9605 from JosJuice/jitarm64-pc-stp-2

JitArm64: Use STP for pc/npc, part 2
dolphin-emu · Mar 24, 2021 · e2b5026 · e2b5026
2 parents 85aee64 + 3bd9206
commit e2b5026
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
@@ -153,8 +153,9 @@ void JitArm64::GenerateAsm()
   SetJumpTarget(bail);
   do_timing = GetCodePtr();
   // Write the current PC out to PPCSTATE
-  STR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc));
-  STR(IndexType::Unsigned, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(npc));
+  static_assert(PPCSTATE_OFF(pc) <= 252);
+  static_assert(PPCSTATE_OFF(pc) + 4 == PPCSTATE_OFF(npc));
+  STP(IndexType::Signed, DISPATCHER_PC, DISPATCHER_PC, PPC_REG, PPCSTATE_OFF(pc));
 
   // Check the state pointer to see if we are exiting
   // Gets checked on at the end of every slice