From a60de42f3a7fba8e22d5b2a602a035c68ea4223c Mon Sep 17 00:00:00 2001
From: bmaupin
Date: Thu, 3 Oct 2019 13:24:32 -0400
Subject: Get dynarec working again for PSP

---
 psp/mips_stub.S | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'psp/mips_stub.S')

diff --git a/psp/mips_stub.S b/psp/mips_stub.S
index aaef70b..dd91ea8 100644
--- a/psp/mips_stub.S
+++ b/psp/mips_stub.S
@@ -3343,8 +3343,13 @@ ror_zero_shift:
 
 execute_arm_translate:
   addu $17, $4, $0                # load cycle counter register
-  lui $16, %hi(reg)               # load base register
-  addiu $16, %lo(reg)
+
+  lui $4, %hi(arm_reg)            # load arm_reg address into $4
+  addiu $4, %lo(arm_reg)
+
+  jal move_reg                    # update reg to point to arm_reg
+  addu $16, $4, $0                # copy address of arm_reg into $16
+
   extract_flags                   # load flag variables
 
   and $1, $1, 0x20                # see if Thumb bit is set in flags
@@ -3405,9 +3410,10 @@ iac_loop:
 memory_map_read:
   .space 0x8000
 
-reg:
+# This must be between memory_map_read and memory_map_write because it's used
+# to calculate their addresses elsewhere in this file.
+arm_reg:
   .space 0x100
 
 memory_map_write:
   .space 0x8000
-
-- 
cgit v1.2.3