Merge pull request #3278 from Sonicadvance1/fix_oversights

FEXCore: Fixes passing arguments to ABI helpers
FEX-Emu · Nov 29, 2023 · d0f54bc · d0f54bc
2 parents 470615b + 70191f2
commit d0f54bc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.h b/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.h
@@ -132,21 +132,21 @@ class Arm64Emitter : public FEXCore::ARMEmitter::Emitter {
 
   void SpillForABICall(bool SupportsPreserveAllABI, FEXCore::ARMEmitter::Register TmpReg, bool FPRs = true) {
     if (SupportsPreserveAllABI) {
-      SpillForPreserveAllABICall(TMP1, true);
+      SpillForPreserveAllABICall(TmpReg, FPRs);
     }
     else {
-      SpillStaticRegs(TMP1);
-      PushDynamicRegsAndLR(TMP1);
+      SpillStaticRegs(TmpReg, FPRs);
+      PushDynamicRegsAndLR(TmpReg);
     }
   }
 
   void FillForABICall(bool SupportsPreserveAllABI, bool FPRs = true) {
     if (SupportsPreserveAllABI) {
-      FillForPreserveAllABICall(true);
+      FillForPreserveAllABICall(FPRs);
     }
     else {
       PopDynamicRegsAndLR();
-      FillStaticRegs();
+      FillStaticRegs(FPRs);
     }
   }