fix LDM bugs

melonDS-emu · Oct 29, 2024 · 7a4255b · 7a4255b
1 parent dfd6338
commit 7a4255b
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/ARMInterpreter_LoadStore.cpp b/src/ARMInterpreter_LoadStore.cpp
@@ -430,23 +430,18 @@ void A_LDM(ARM* cpu)
         }
     }
 
+    u32 pc = 0;
     if (cpu->CurInstr & (1<<15))
     {
-        u32 pc;
         if (preinc) base += 4;
         if (first) cpu->DataRead32 (base, &pc);
         else       cpu->DataRead32S(base, &pc);
         if (!preinc) base += 4;
 
         if (cpu->Num == 1)
             pc &= ~0x1;
-
-        cpu->JumpTo(pc, cpu->CurInstr & (1<<22));
     }
 
-    if ((cpu->CurInstr & (1<<22)) && !(cpu->CurInstr & (1<<15)))
-        cpu->UpdateMode((cpu->CPSR&~0x1F)|0x10, cpu->CPSR, true);
-
     if (cpu->CurInstr & (1<<21))
     {
         // post writeback
@@ -466,6 +461,12 @@ void A_LDM(ARM* cpu)
             cpu->R[baseid] = wbbase;
     }
 
+    if ((cpu->CurInstr & (1<<22)) && !(cpu->CurInstr & (1<<15)))
+        cpu->UpdateMode((cpu->CPSR&~0x1F)|0x10, cpu->CPSR, true);
+
+    if (cpu->CurInstr & (1<<15))
+        cpu->JumpTo(pc, cpu->CurInstr & (1<<22));
+
     cpu->AddCycles_CDI();
 }