From 9f8cf8dad20d9c65fbf458ff610ec37361e6f3fc Mon Sep 17 00:00:00 2001
From: Jaklyy <102590697+Jaklyy@users.noreply.github.com>
Date: Sat, 9 Nov 2024 14:49:34 -0500
Subject: [PATCH] ldm base writeback fails with r15

---
 src/ARMInterpreter_LoadStore.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ARMInterpreter_LoadStore.cpp b/src/ARMInterpreter_LoadStore.cpp
index 9dc14ea4..77628d7d 100644
--- a/src/ARMInterpreter_LoadStore.cpp
+++ b/src/ARMInterpreter_LoadStore.cpp
@@ -568,7 +568,7 @@ void A_LDM(ARM* cpu)
     }
 
     // writeback to base
-    if (cpu->CurInstr & (1<<21))
+    if (cpu->CurInstr & (1<<21) && (baseid != 15))
     {
         // post writeback
         if (cpu->CurInstr & (1<<23))
@@ -624,7 +624,7 @@ void A_STM(ARM* cpu)
                 base -= 4;
         }
 
-        if (cpu->CurInstr & (1<<21))
+        if ((cpu->CurInstr & (1<<21)) && (baseid != 15))
             cpu->R[baseid] = base;
 
         preinc = !preinc;
@@ -681,7 +681,7 @@ void A_STM(ARM* cpu)
         return;
     }
 
-    if ((cpu->CurInstr & (1<<23)) && (cpu->CurInstr & (1<<21)))
+    if ((cpu->CurInstr & (1<<23)) && (cpu->CurInstr & (1<<21)) && (baseid != 15))
         cpu->R[baseid] = base;