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;
-int cpu_repeat;
-int cpu_lastval;
-static int pending_add_cycles = 0, pending_rebase = 0;
+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;
+
+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("cpu_lastval = %02x\n", cpu_lastval);
+ printf("PC = %04x, OP=%02X\n", PC_prev, OP_prev);
+ printf("rest = %08x\n", nes_registers[4]);
+ DumpEmptyCartMapping();
exit(1);
}
static void compare_state(void)
{
uint8 nes_flags;
- int fail = 0;
+ 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;
}
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;
+ }
+
+ if (dread_count_a != dread_count_c) {
+ printf("dread_count: %i vs %i\n", dread_count_a, dread_count_c);
+ fail = 1;
+ }
+
+ if (dwrite_count_a != dwrite_count_c) {
+ printf("dwrite_count: %i vs %i\n", dwrite_count_a, dwrite_count_c);
+ fail = 1;
+ }
+
+ for (i = dwrite_count_a - 1; !fail && i >= 0; i--)
+ if (dwrites_a[i] != dwrites_c[i]) {
+ printf("dwrites[%i]: %06x vs %06x\n", dwrite_count_a, dwrites_a[i], dwrites_c[i]);
+ 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: %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();
}
void TriggerIRQ_d(void)
{
printf("-- irq\n");
- TriggerIRQ_c();
- TriggerIRQ_a();
- compare_state();
+ pending_irq |= 0x100;
}
void TriggerNMI_d(void)
//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)
{
- nes_registers[7]=1;
+ if (pending_irq) {
+ if (pending_irq & 0x100) {
+ TriggerIRQ_c();
+ TriggerIRQ_a();
+ }
+ if (pending_irq & 0xff) {
+ X6502_IRQBegin_c(pending_irq & 0xff);
+ X6502_IRQBegin_a(pending_irq & 0xff);
+ }
+ pending_irq = 0;
+ }
+
+ nes_registers[7]=1<<16;
X.count=1;
- cpu_lastval = 0;
- cpu_repeat = 0;
+ 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();
- cpu_repeat = 1;
X6502_Run_a();
compare_state();
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);
- g_cnt -= pending_add_cycles*48;
+ timestamp += pending_add_cycles;
+ timestamp_a += pending_add_cycles;
pending_add_cycles = 0;
}
if (pending_rebase) {
{
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();
{
printf("-- IRQBegin(%02x)\n", w);
- X6502_IRQBegin_c(w);
- X6502_IRQBegin_a(w);
+ // X6502_IRQBegin_c(w);
+ // X6502_IRQBegin_a(w);
+ pending_irq |= w;
}
void X6502_IRQEnd_d(int w)