X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=ncpu_debug.c;h=ce1b3cc082c35d50fa71fee972d0c149e1104444;hp=63eef3f36de94fe2153086275e8a2c799dbe8ccd;hb=8fa5eb3371d902b8d58dba6e6bf62726d7ed8dbc;hpb=655f8df08034f20ced8292aa8fbbb4beb94c29e5

diff --git a/ncpu_debug.c b/ncpu_debug.c
index 63eef3f..ce1b3cc 100644
--- a/ncpu_debug.c
+++ b/ncpu_debug.c
@@ -9,6 +9,7 @@
 extern uint32 nes_registers[0x10];
 extern uint32 pc_base;
 extern uint8  nes_internal_ram[0x800];
+extern uint32 timestamp_a;
 uint32 PC_prev = 0xcccccc, OP_prev = 0xcccccc;
 int32  g_cnt = 0;
 
@@ -17,11 +18,13 @@ static int pending_add_cycles = 0, pending_rebase = 0, pending_irq = 0;
 uint8  dreads[4];
 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;
 
 static void leave(void)
 {
 	printf("\nA: %02x, X: %02x, Y: %02x, S: %02x\n", X.A, X.X, X.Y, X.S);
 	printf("PC = %04lx, OP=%02lX\n", PC_prev, OP_prev);
+	printf("rest = %08lx\n", nes_registers[4]);
 	exit(1);
 }
 
@@ -71,8 +74,8 @@ static void compare_state(void)
 		fail = 1;
 	}
 
-	if ((int32)nes_registers[7] != X.count) {
-		printf("cycles: %li vs %li\n", (int32)nes_registers[7], X.count);
+	if (((int32)nes_registers[7] >> 16) != X.count) {
+		printf("cycles: %li vs %li\n", (int32)nes_registers[7] >> 16, X.count);
 		fail = 1;
 	}
 
@@ -92,6 +95,16 @@ static void compare_state(void)
 			fail = 1;
 		}
 
+	if (mapirq_cyc_a != mapirq_cyc_c) {
+		printf("mapirq_cyc: %i vs %i\n", mapirq_cyc_a, mapirq_cyc_c);
+		fail = 1;
+	}
+
+	if (timestamp_a != timestamp) {
+		printf("timestamp: %lu vs %lu\n", timestamp_a, timestamp);
+		fail = 1;
+	}
+
 	if (fail) leave();
 }
 
@@ -159,10 +172,13 @@ void X6502_Run_d(int32 c)
 			pending_irq = 0;
 		}
 
-		nes_registers[7]=1;
+		nes_registers[7]=1<<16;
 		X.count=1;
 
 		dread_count_c = dread_count_a = dwrite_count_c = dwrite_count_a = 0;
+		mapirq_cyc_a = mapirq_cyc_c = 0;
+		timestamp_a = timestamp;
+
 		X6502_Run_c();
 
 		X6502_Run_a();
@@ -196,6 +212,7 @@ void X6502_Power_d(void)
 	printf("-- power\n");
 	if (nes_internal_ram == RAM) printf("nes_internal_ram == RAM!!\n");
 	dread_count_c = dread_count_a = dwrite_count_c = dwrite_count_a = 0;
+	mapirq_cyc_c = mapirq_cyc_a = 0;
 
 	X6502_Power_c();
 	X6502_Power_a();