Actually implement ldm {pc}^ (oops!)

Cydrak · Aug 2, 2013 · 353c407 · 353c407
1 parent 5240c87
commit 353c407
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/nds/cpu/arm.cpp b/nds/cpu/arm.cpp
@@ -227,5 +227,9 @@ void ARMCore::armBlock(uint5 opcode, uint4 irn, uint16 rlist) {
     addr += 4;
   }
   if(user) swapBank(mode);
-  if(ld && (rlist & 1<<15)) branch(r[15] & 1, r[15]);
+
+  if(ld && (rlist & 1<<15)) {
+    if(opcode & 4) writeCpsr(spsr(), 0xf);
+    branch(r[15] & 1, r[15]);
+  }
 }