Clear D Flag on IRQ/NMI

commanderx16 · Oct 15, 2022 · f7567cf · f7567cf
1 parent d01df96
commit f7567cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/cpu/fake6502.c b/src/cpu/fake6502.c
@@ -171,16 +171,18 @@ static void putvalue(uint16_t saveval) {
 
 void nmi6502() {
     push16(pc);
-    push8(status);
-    status |= FLAG_INTERRUPT;
+    push8(status & ~FLAG_BREAK);
+    setinterrupt();
+    cleardecimal();
     pc = (uint16_t)read6502(0xFFFA) | ((uint16_t)read6502(0xFFFB) << 8);
 	waiting = 0;
 }
 
 void irq6502() {
     push16(pc);
     push8(status & ~FLAG_BREAK);
-    status |= FLAG_INTERRUPT;
+    setinterrupt();
+    cleardecimal();
     pc = (uint16_t)read6502(0xFFFE) | ((uint16_t)read6502(0xFFFF) << 8);
 	waiting = 0;
 }

diff --git a/src/cpu/support.h b/src/cpu/support.h
@@ -71,7 +71,9 @@ void reset6502() {
     x = 0;
     y = 0;
     sp = 0xFD;
-    status |= FLAG_CONSTANT;
+    status |= FLAG_CONSTANT | FLAG_BREAK;
+    setinterrupt();
+    cleardecimal();
 	waiting = 0;
 }