stay on HALT until an interrupt happens

skyfloogle · Dec 14, 2024 · d9276d0 · d9276d0
1 parent 3989be8
commit d9276d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/source/3ds/drc_core.c b/source/3ds/drc_core.c
@@ -1380,7 +1380,7 @@ static int drc_translateBlock(void) {
                 reg2_modified = true;
                 break;
             case V810_OP_HALT: // halt
-                HALT(inst_cache[i].PC + 2);
+                HALT(inst_cache[i].PC);
                 break;
             case V810_OP_BSTR:
                 MOV_I(2, 31, 0);

diff --git a/source/common/v810_cpu.c b/source/common/v810_cpu.c
@@ -532,6 +532,11 @@ bool v810_int(WORD iNum, WORD PC) {
     if((v810_state->S_REG[PSW] & PSW_ID)) return false; // Interupt disabled
     if(iNum < ((v810_state->S_REG[PSW] & PSW_IA)>>16)) return false; // Interupt to low on the chain
 
+    // if an interrupt happened, skip a HALT instruction if we're on one
+    if ((mem_rhword(PC) >> 10) == V810_OP_HALT) {
+        PC += 2;
+    }
+
     //Ready to Generate the Interupts
     v810_state->S_REG[EIPC]  = PC;
     v810_state->S_REG[EIPSW] = v810_state->S_REG[PSW];