X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=ncpu_debug.c;h=090bcb5fa2b49b7c4c70f039631d05cdf0fdb493;hp=cc78ae6da9825f3cead4e78c9b99973787dfccb1;hb=e5f8a1a92df07167d0b17dfa41cc3e9e8fa73339;hpb=0b65fdb3548fd54670265adfb80706e63da6b641

diff --git a/ncpu_debug.c b/ncpu_debug.c
index cc78ae6..090bcb5 100644
--- a/ncpu_debug.c
+++ b/ncpu_debug.c
@@ -11,6 +11,7 @@ extern uint32 pc_base;
 extern uint8  nes_internal_ram[0x800];
 extern uint32 timestamp_a;
 extern uint32 framecount;
+extern X6502 X_;
 static uint32 framecount_d;
 uint32 PC_prev = 0xcccccc, OP_prev = 0xcccccc;
 int32  g_cnt = 0;
@@ -22,11 +23,14 @@ uint32 dwrites_c[2], dwrites_a[2];
 int dread_count_c, dread_count_a, dwrite_count_c, dwrite_count_a;
 int mapirq_cyc_c, mapirq_cyc_a;
 
+extern void DumpEmptyCartMapping(void);
+
 static void leave(void)
 {
 	printf("\nA: %02x, X: %02x, Y: %02x, S: %02x\n", X.A, X.X, X.Y, X.S);
 	printf("PC = %04x, OP=%02X\n", PC_prev, OP_prev);
 	printf("rest = %08x\n", nes_registers[4]);
+	DumpEmptyCartMapping();
 	exit(1);
 }
 
@@ -107,6 +111,12 @@ static void compare_state(void)
 		fail = 1;
 	}
 
+/*
+	if (X_.DB != X.DB) {
+		printf("DB: %02x vs %02x\n", X_.DB, X.DB);
+		fail = 1;
+	}
+*/
 	if (fail) leave();
 }
 
@@ -143,10 +153,6 @@ void TriggerNMI_d(void)
 	compare_state();
 }
 
-void TriggerNMINSF_d(void)
-{
-}
-
 void X6502_Run_d(int32 c)
 {
 	int32 cycles = c << 4; /* *16 */
@@ -170,14 +176,14 @@ void X6502_Run_d(int32 c)
 				TriggerIRQ_a();
 			}
 			if (pending_irq & 0xff) {
-				TriggerIRQ_c();
-				TriggerIRQ_a();
 				X6502_IRQBegin_c(pending_irq & 0xff);
 				X6502_IRQBegin_a(pending_irq & 0xff);
 			}
 			pending_irq = 0;
 		}
 
+		//printf("%04x: %02x\n", nes_registers[3] - pc_base, *(unsigned char *)nes_registers[3]);
+
 		nes_registers[7]=1<<16;
 		X.count=1;
 
@@ -227,6 +233,38 @@ void X6502_Power_d(void)
 	X6502_Power_c();
 	X6502_Power_a();
 	compare_state();
+
+#if 0
+	{
+		unsigned char *p = (void *) nes_registers[3];
+		int i, u, nop = 0xea;
+
+		for (i = 0; i < 256; i++)
+		{
+			if (i == 0 || i == 0x20 || i == 0x40 || i == 0x60 || i == 0x4c || i == 0x6c) continue; /* BRK, JSR, RET, etc. */
+			if ((i & 0x1f) == 0x10) continue; /* Bxx */
+			switch (i)
+			{
+				case 0x02: /* JAM */
+				case 0x12:
+				case 0x22:
+				case 0x32:
+				case 0x42:
+				case 0x52:
+				case 0x62:
+				case 0x72:
+				case 0x92:
+				case 0xB2:
+				case 0xD2:
+				case 0xF2: continue;
+			}
+
+			*p++ = i;
+			for (u = 0; u < 3; u++)
+				*p++ = nop;
+		}
+	}
+#endif
 }
 
 void X6502_AddCycles_d(int x)