From 80b88dbd05a66ad50108778d5f36e17f5b1cd661 Mon Sep 17 00:00:00 2001
From: RSDuck <RSDuck@users.noreply.github.com>
Date: Sat, 9 May 2020 14:34:52 +0200
Subject: allow allocating caller saved registers currently system-v only

---
 src/ARMJIT_x64/ARMJIT_Branch.cpp | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'src/ARMJIT_x64/ARMJIT_Branch.cpp')

diff --git a/src/ARMJIT_x64/ARMJIT_Branch.cpp b/src/ARMJIT_x64/ARMJIT_Branch.cpp
index cac590a..27c24c7 100644
--- a/src/ARMJIT_x64/ARMJIT_Branch.cpp
+++ b/src/ARMJIT_x64/ARMJIT_Branch.cpp
@@ -138,18 +138,7 @@ void Compiler::Comp_JumpTo(Gen::X64Reg addr, bool restoreCPSR)
     bool cpsrDirty = CPSRDirty;
     SaveCPSR();
 
-    if (restoreCPSR)
-    {
-        if (Thumb || CurInstr.Cond() >= 0xE)
-            RegCache.Flush();
-        else
-        {
-            // the ugly way...
-            // we only save them, to load and save them again
-            for (int reg : hiRegsLoaded)
-                SaveReg(reg, RegCache.Mapping[reg]);
-        }
-    }
+    PushRegs(restoreCPSR);
 
     MOV(64, R(ABI_PARAM1), R(RCPU));
     MOV(32, R(ABI_PARAM2), R(addr));
@@ -162,11 +151,7 @@ void Compiler::Comp_JumpTo(Gen::X64Reg addr, bool restoreCPSR)
     else
         CALL((void*)&ARMv4::JumpTo);
 
-    if (!Thumb && restoreCPSR && CurInstr.Cond() < 0xE)
-    {
-        for (int reg : hiRegsLoaded)
-            LoadReg(reg, RegCache.Mapping[reg]);
-    }
+    PopRegs(restoreCPSR);
 
     LoadCPSR();
     // in case this instruction is skipped
-- 
cgit v1.2.3