X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=ncpu_debug.c;h=8feb8753444b2c2310c6111ae6486bfa2eb0e8d8;hp=aed7afb0aa7c18a9b4ed617e2ae046487d40e4ab;hb=386f5371eb984fb9c2860c83e740890a75cd45c1;hpb=370cff9a997d3bbdb65602b597a1a10e1e9a1542 diff --git a/ncpu_debug.c b/ncpu_debug.c index aed7afb..8feb875 100644 --- a/ncpu_debug.c +++ b/ncpu_debug.c @@ -9,6 +9,10 @@ extern uint32 nes_registers[0x10]; 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; @@ -19,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 = %04lx, OP=%02lX\n", PC_prev, OP_prev); - printf("rest = %08lx\n", nes_registers[4]); + printf("PC = %04x, OP=%02X\n", PC_prev, OP_prev); + printf("rest = %08x\n", nes_registers[4]); + DumpEmptyCartMapping(); exit(1); } @@ -33,32 +40,32 @@ static void compare_state(void) int i, fail = 0; if ((nes_registers[0] >> 24) != X.A) { - printf("A: %02lx vs %02x\n", nes_registers[0] >> 24, X.A); + printf("A: %02x vs %02x\n", nes_registers[0] >> 24, X.A); fail = 1; } if ((nes_registers[1] & 0xff) != X.X) { - printf("X: %02lx vs %02x\n", nes_registers[1] & 0xff, X.X); + printf("X: %02x vs %02x\n", nes_registers[1] & 0xff, X.X); fail = 1; } if ((nes_registers[2] & 0xff) != X.Y) { - printf("Y: %02lx vs %02x\n", nes_registers[2] & 0xff, X.Y); + printf("Y: %02x vs %02x\n", nes_registers[2] & 0xff, X.Y); fail = 1; } if (nes_registers[3] - pc_base != X.PC) { - printf("PC: %04lx vs %04x\n", nes_registers[3] - pc_base, X.PC); + printf("PC: %04x vs %04x\n", nes_registers[3] - pc_base, X.PC); fail = 1; } if ((nes_registers[4] >> 24) != X.S) { - printf("S: %02lx vs %02x\n", nes_registers[4] >> 24, X.S); + printf("S: %02x vs %02x\n", nes_registers[4] >> 24, X.S); fail = 1; } if (((nes_registers[4]>>8)&0xff) != X.IRQlow) { - printf("IRQlow: %02lx vs %02x\n", ((nes_registers[4]>>8)&0xff), X.IRQlow); + printf("IRQlow: %02x vs %02x\n", ((nes_registers[4]>>8)&0xff), X.IRQlow); fail = 1; } @@ -73,8 +80,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: %i vs %i\n", (int32)nes_registers[7] >> 16, X.count); fail = 1; } @@ -90,7 +97,7 @@ static void compare_state(void) for (i = dwrite_count_a - 1; !fail && i >= 0; i--) if (dwrites_a[i] != dwrites_c[i]) { - printf("dwrites[%i]: %06lx vs %06lx\n", dwrite_count_a, dwrites_a[i], dwrites_c[i]); + printf("dwrites[%i]: %06x vs %06x\n", dwrite_count_a, dwrites_a[i], dwrites_c[i]); fail = 1; } @@ -99,12 +106,23 @@ static void compare_state(void) fail = 1; } + if (timestamp_a != timestamp) { + printf("timestamp: %u vs %u\n", timestamp_a, timestamp); + fail = 1; + } + +/* + if (X_.DB != X.DB) { + printf("DB: %02x vs %02x\n", X_.DB, X.DB); + fail = 1; + } +*/ if (fail) leave(); } -#if 1 static void compare_ram(void) { +#if 1 int i, fail = 0; for (i = 0; i < 0x800/4; i++) { @@ -118,8 +136,8 @@ static void compare_ram(void) } if (fail) leave(); -} #endif +} void TriggerIRQ_d(void) { @@ -135,10 +153,6 @@ void TriggerNMI_d(void) compare_state(); } -void TriggerNMINSF_d(void) -{ -} - void X6502_Run_d(int32 c) { int32 cycles = c << 4; /* *16 */ @@ -147,8 +161,12 @@ void X6502_Run_d(int32 c) //printf("-- %06i: run(%i)\n", (int)g_cnt, (int)c); g_cnt += cycles; - if (c > 200) + if (framecount != framecount_d) { compare_ram(); + framecount_d = framecount; + } + + timestamp_a = timestamp; while (g_cnt > 0) { @@ -158,19 +176,21 @@ 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; } - nes_registers[7]=1; + //printf("%04x: %02x\n", nes_registers[3] - pc_base, *(unsigned char *)nes_registers[3]); + + 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(); @@ -179,6 +199,10 @@ void X6502_Run_d(int32 c) g_cnt -= 1 - X.count; if (pending_add_cycles) { g_cnt -= pending_add_cycles*48; + //X6502_AddCycles_c(pending_add_cycles); + //X6502_AddCycles_a(pending_add_cycles); + timestamp += pending_add_cycles; + timestamp_a += pending_add_cycles; pending_add_cycles = 0; } if (pending_rebase) { @@ -209,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)