X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ncpu_debug.c;h=7da9b73428c15e9b934d4f069d700258fa9a627d;hb=c0bf6f9f02a2b6afb961a7e9195e2168d7e9cecf;hp=864cae3961da930ccccbb893943a778c1e51ac52;hpb=af32b6c2f0ed2f1a4582c3e8d7ac704b9c61fa4c;p=fceu.git

diff --git a/ncpu_debug.c b/ncpu_debug.c
index 864cae3..7da9b73 100644
--- a/ncpu_debug.c
+++ b/ncpu_debug.c
@@ -8,48 +8,55 @@
 // asm core state
 extern uint32 nes_registers[0x10];
 extern uint32 pc_base;
-uint32 PC_prev = 0;
+extern uint8  nes_internal_ram[0x800];
+uint32 PC_prev = 0xcccccc, OP_prev = 0xcccccc;
+int32  g_cnt = 0;
 
+int cpu_repeat;
+int cpu_lastval;
+static int pending_add_cycles = 0, pending_rebase = 0;
 
 static void leave(void)
 {
-	printf("A: %02x, X: %02x, Y: %02x, S: %02x\n", X.A, X.X, X.Y, X.S);
-	printf("PC = %04lx, OP=%02X\n", PC_prev, (PC_prev < 0x2000) ? RAM[PC_prev&0x7ff] : ARead[PC_prev](PC_prev));
+	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("cpu_lastval = %02x\n", cpu_lastval);
 	exit(1);
 }
 
 static void compare_state(void)
 {
 	uint8 nes_flags;
+	int fail = 0;
 
 	if ((nes_registers[0] >> 24) != X.A) {
 		printf("A: %02lx vs %02x\n", nes_registers[0] >> 24, X.A);
-		leave();
+		fail = 1;
 	}
 
 	if ((nes_registers[1] & 0xff) != X.X) {
 		printf("X: %02lx vs %02x\n", nes_registers[1] & 0xff, X.X);
-		leave();
+		fail = 1;
 	}
 
 	if ((nes_registers[2] & 0xff) != X.Y) {
 		printf("Y: %02lx vs %02x\n", nes_registers[2] & 0xff, X.Y);
-		leave();
+		fail = 1;
 	}
 
 	if (nes_registers[3] - pc_base != X.PC) {
 		printf("PC: %04lx vs %04x\n", nes_registers[3] - pc_base, X.PC);
-		leave();
+		fail = 1;
 	}
 
 	if ((nes_registers[4] >> 24) != X.S) {
 		printf("S: %02lx vs %02x\n", nes_registers[4] >> 24, X.S);
-		leave();
+		fail = 1;
 	}
 
 	if (((nes_registers[4]>>8)&0xff) != X.IRQlow) {
 		printf("IRQlow: %02lx vs %02x\n", ((nes_registers[4]>>8)&0xff), X.IRQlow);
-		leave();
+		fail = 1;
 	}
 
 	// NVUB DIZC
@@ -58,17 +65,37 @@ static void compare_state(void)
 	if (!(nes_registers[5]&0x000000ff)) nes_flags |= 0x02; // Z
 	// nes_flags |= 0x20; // U, not set in C core (set only when pushing)
 
-	if (nes_flags != X.P) {
-		printf("flags: %02x vs %02x\n", nes_flags, X.P);
-		leave();
+	if (nes_flags != (X.P&~0x20)) {
+		printf("flags: %02x vs %02x\n", nes_flags, (X.P&~0x20));
+		fail = 1;
 	}
 
 	if ((int32)nes_registers[7] != X.count) {
 		printf("cycles: %li vs %li\n", (int32)nes_registers[7], X.count);
-		leave();
+		fail = 1;
 	}
+
+	if (fail) leave();
 }
 
+#if 1
+static void compare_ram(void)
+{
+	int i, fail = 0;
+	for (i = 0; i < 0x800/4; i++)
+	{
+		if (((int *)nes_internal_ram)[i] != ((int32 *)RAM)[i]) {
+			int u;
+			fail = 1;
+			for (u = i*4; u < i*4+4; u++)
+				if (nes_internal_ram[u] != RAM[u])
+					printf("RAM[%03x]: %02x vs %02x\n", u, nes_internal_ram[u], RAM[u]);
+		}
+	}
+
+	if (fail) leave();
+}
+#endif
 
 void TriggerIRQ_d(void)
 {
@@ -92,21 +119,42 @@ void TriggerNMINSF_d(void)
 
 void X6502_Run_d(int32 c)
 {
-	int32 cycles = c << 4; /* *16 */ \
-	if (PAL) cycles -= c;  /* *15 */ \
+	int32 cycles = c << 4; /* *16 */
+	if (PAL) cycles -= c;  /* *15 */
+
+	//printf("-- %06i: run(%i)\n", (int)g_cnt, (int)c);
+	g_cnt += cycles;
 
-	printf("-- run(%i)\n", (int)c);
+	if (c > 200)
+		compare_ram();
 
-	while (cycles > 0)
+	while (g_cnt > 0)
 	{
-		PC_prev = X.PC;
 		nes_registers[7]=1;
 		X.count=1;
+
+		cpu_lastval = 0;
+		cpu_repeat = 0;
 		X6502_Run_c();
+
+		cpu_repeat = 1;
 		X6502_Run_a();
+
 		compare_state();
-		cycles -= 1 - X.count;
+		g_cnt -= 1 - X.count;
+		if (pending_add_cycles) {
+			//X6502_AddCycles_c(pending_add_cycles);
+			//X6502_AddCycles_a(pending_add_cycles);
+			g_cnt -= pending_add_cycles*48;
+			pending_add_cycles = 0;
+		}
+		if (pending_rebase) {
+			X6502_Rebase_a();
+			pending_rebase = 0;
+		}
 	}
+
+	//printf("-- run_end\n");
 }
 
 void X6502_Reset_d(void)
@@ -121,6 +169,7 @@ void X6502_Reset_d(void)
 void X6502_Power_d(void)
 {
 	printf("-- power\n");
+	if (nes_internal_ram == RAM) printf("nes_internal_ram == RAM!!\n");
 
 	X6502_Power_c();
 	X6502_Power_a();
@@ -129,10 +178,13 @@ void X6502_Power_d(void)
 
 void X6502_AddCycles_d(int x)
 {
-	printf("-- AddCycles(%i)\n", x);
+	printf("-- AddCycles(%i|%i)\n", x, x*48);
 
-	X6502_AddCycles_c(x);
-	X6502_AddCycles_a(x);
+	pending_add_cycles = x; // *48;
+//	printf("can't use this in debug\n");
+//	exit(1);
+	//X6502_AddCycles_c(x);
+	//X6502_AddCycles_a(x);
 	//compare_state();
 }
 
@@ -153,4 +205,9 @@ void X6502_IRQEnd_d(int w)
 }
 
 
+void X6502_Rebase_d(void)
+{
+	pending_rebase = 1;
+}
+