Clear waiting with disabled interrupt

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

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/cpu/fake6502.c b/src/cpu/fake6502.c
@@ -174,15 +174,17 @@ void nmi6502() {
     push8(status);
     status |= FLAG_INTERRUPT;
     pc = (uint16_t)read6502(0xFFFA) | ((uint16_t)read6502(0xFFFB) << 8);
-	waiting = 0;
+    waiting = 0;
 }
 
 void irq6502() {
-    push16(pc);
-    push8(status & ~FLAG_BREAK);
-    status |= FLAG_INTERRUPT;
-    pc = (uint16_t)read6502(0xFFFE) | ((uint16_t)read6502(0xFFFF) << 8);
-	waiting = 0;
+    if (!(status & FLAG_INTERRUPT)) {
+        push16(pc);
+        push8(status & ~FLAG_BREAK);
+        status |= FLAG_INTERRUPT;
+        pc = (uint16_t)read6502(0xFFFE) | ((uint16_t)read6502(0xFFFF) << 8);
+    }
+    waiting = 0;
 }
 
 uint8_t callexternal = 0;

diff --git a/src/main.c b/src/main.c
@@ -1289,10 +1289,8 @@ emulator_loop(void *param)
 		}
 
 		if (video_get_irq_out() || via2_irq()) {
-			if (!(status & 4)) {
-//				printf("IRQ!\n");
-				irq6502();
-			}
+//			printf("IRQ!\n");
+			irq6502();
 		}
 
 		if (pc == 0xffff) {