CPU: Clear waiting with disabled interrupt (#434)

commanderx16 · Oct 23, 2022 · d5d813e · d5d813e
1 parent 752ef55
commit d5d813e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/cpu/65c02.h b/src/cpu/65c02.h
@@ -131,7 +131,7 @@ static void stp() {
 // *******************************************************************************************
 
 static void wai() {
-	if (~status & FLAG_INTERRUPT) waiting = 1;
+	waiting = 1;
 }
 
 // *******************************************************************************************

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
@@ -1295,10 +1295,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) {