Merge pull request #10243 from JosJuice/jitarm64-push-size

JitArm64: Fix incorrect push size calculation
dolphin-emu · Nov 24, 2021 · 55e3318 · 55e3318
2 parents aa5cb35 + 83d2d55
commit 55e3318
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp
@@ -225,7 +225,8 @@ void JitArm64::EmitBackpatchRoutine(u32 flags, bool fastmem, bool do_farcode, AR
     if (memcheck)
     {
       const ARM64Reg temp_fpr = fprs_to_push[0] ? ARM64Reg::INVALID_REG : ARM64Reg::Q0;
-      const u64 early_push_size = Common::AlignUp(gprs_to_push_early.Count(), 2) * 8;
+      const u64 early_push_count = (gprs_to_push & gprs_to_push_early).Count();
+      const u64 early_push_size = Common::AlignUp(early_push_count, 2) * 8;
 
       WriteConditionalExceptionExit(EXCEPTION_DSI, temp_gpr, temp_fpr, early_push_size);
     }