From 81bd66a11186efb420eb8d6fd5766f0ef26d5919 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 23 Apr 2007 20:15:30 +0000 Subject: [PATCH] improved debug git-svn-id: file:///home/notaz/opt/svn/fceu@108 be3aeb3a-fb24-0410-a615-afba39da0efa --- Makefile.gp2x | 3 ++- fce.c | 17 ----------------- input.c | 11 ----------- ncpu.S | 25 ++++++++++++++++++------- ncpu_debug.c | 30 +++++++++++++++++++++++------- x6502.c | 33 +++++++++++++++++++++------------ 6 files changed, 64 insertions(+), 55 deletions(-) diff --git a/Makefile.gp2x b/Makefile.gp2x index db00145..94693c2 100644 --- a/Makefile.gp2x +++ b/Makefile.gp2x @@ -16,7 +16,7 @@ LDRIVER += -O3 # -pg endif asm_6502=1 -#debug_asm_6502=1 +debug_asm_6502=1 all: fceu @@ -42,6 +42,7 @@ OBJDRIVER += x6502.o endif x6502.o: x6502.c x6502.h ops.h fce.h sound.h + ncpu.o: ncpu.S ncpu.h $(CC) $(TFLAGS) -c $< -o $@ diff --git a/fce.c b/fce.c index 1d5b493..79aa4be 100644 --- a/fce.c +++ b/fce.c @@ -53,11 +53,6 @@ #define Pal (PALRAM) -#ifdef DEBUG_ASM_6502 -extern int cpu_repeat; -extern int cpu_lastval; -#endif - static void (*RefreshLine)(uint8 *P, uint32 vofs) = NULL; static void PRefreshLine(void); @@ -316,15 +311,9 @@ static DECLFR(ARAMH) static DECLFR(A2002) { uint8 ret; -#ifdef DEBUG_ASM_6502 - if (cpu_repeat) return cpu_lastval; -#endif ret = PPU_status; vtoggle=0; PPU_status&=0x7F; -#ifdef DEBUG_ASM_6502 -// cpu_lastval=ret|(PPUGenLatch&0x1F); -#endif return ret|(PPUGenLatch&0x1F); } @@ -337,9 +326,6 @@ static DECLFR(A2007) { uint8 ret; uint32 tmp=RefreshAddr&0x3FFF; -#ifdef DEBUG_ASM_6502 - if (cpu_repeat) return cpu_lastval; -#endif PPUGenLatch=ret=VRAMBuffer; if(PPU_hook) PPU_hook(tmp); @@ -355,9 +341,6 @@ static DECLFR(A2007) if (INC32) RefreshAddr+=32; else RefreshAddr++; if(PPU_hook) PPU_hook(RefreshAddr&0x3fff); -#ifdef DEBUG_ASM_6502 -// cpu_lastval=ret; -#endif return ret; } diff --git a/input.c b/input.c index dc48c71..40c0ff8 100644 --- a/input.c +++ b/input.c @@ -30,11 +30,6 @@ #include "input.h" #include "movie.h" -#ifdef DEBUG_ASM_6502 -extern int cpu_repeat; -extern int cpu_lastval; -#endif - extern INPUTC *FCEU_InitZapper(int w); extern INPUTC *FCEU_InitPowerpad(int w); extern INPUTC *FCEU_InitArkanoid(int w); @@ -102,9 +97,6 @@ static DECLFR(JPRead) { uint8 ret=0; -#ifdef DEBUG_ASM_6502 - if (cpu_repeat) return cpu_lastval; -#endif if(JPorts[A&1]->Read) ret|=JPorts[A&1]->Read(A&1); @@ -113,9 +105,6 @@ static DECLFR(JPRead) ret=FCExp->Read(A&1,ret); ret|=X.DB&0xC0; -#ifdef DEBUG_ASM_6502 -// cpu_lastval=ret; -#endif return(ret); } diff --git a/ncpu.S b/ncpu.S index 410baa8..ea9cb61 100644 --- a/ncpu.S +++ b/ncpu.S @@ -2807,6 +2807,7 @@ reset_cpu: @@@ read_rom_byte: +#ifndef DEBUG_ASM_6502 ldr r0, =CartBR ldr r2, =ARead mov r1, #0xff00 @@ -2819,6 +2820,7 @@ read_rom_byte: ldr r2, [r2, r1, lsl #2] ldrb r0, [r2, REG_ADDR] bx lr +#endif read_ppu_reg: @@ -2838,13 +2840,12 @@ read_save_ram: mov lr, pc ldr pc, [r2, r0, lsl #2] #else - ldr r1, =cpu_lastval - ldr r0, [r1] - tst r0, #0x20000 - orreq r0, r0, #0x20000 - streq r0, [r1] - movne r0, r0, lsr #8 - and r0, r0, #0xff + ldr r2, =dread_count_a + ldr r0, =dreads + ldr r1, [r2] + ldrb r0, [r0, r1] + add r1, r1, #1 + str r1, [r2] #endif ldr REG_OP_TABLE, =cpu_exec_table @ got trashed because was in r12 @@ -2881,6 +2882,16 @@ write_rom_byte: ldr REG_PC, [REG_OP_TABLE, #(OTOFFS_NES_REGS + 0x0c)] @ might get rebased ldr REG_P_REST, [REG_OP_TABLE, #(OTOFFS_NES_REGS + 0x10)] @ might set irq ldr REG_CYCLE, [REG_OP_TABLE, #(OTOFFS_NES_REGS + 0x1c)] @ might get used +#else + ldr r1, =dwrite_count_a + ldr r2, =dwrites_a + ldr r1, [r1] + and r0, r0, #0xff + orr r0, r0, REG_ADDR, lsl #8 + str r0, [r2, r1, lsl #2] + ldr r2, =dwrite_count_a + add r1, r1, #1 + str r1, [r2] #endif bx lr diff --git a/ncpu_debug.c b/ncpu_debug.c index 7da9b73..8546bc2 100644 --- a/ncpu_debug.c +++ b/ncpu_debug.c @@ -12,22 +12,23 @@ 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; +uint8 dreads[4]; +uint32 dwrites_c[2], dwrites_a[2]; +int dread_count_c, dread_count_a, dwrite_count_c, dwrite_count_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("cpu_lastval = %02x\n", cpu_lastval); 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); @@ -75,6 +76,22 @@ static void compare_state(void) 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]: %06lx vs %06lx\n", dwrite_count_a, dwrites_a[i], dwrites_c[i]); + fail = 1; + } + if (fail) leave(); } @@ -133,11 +150,9 @@ void X6502_Run_d(int32 c) nes_registers[7]=1; X.count=1; - cpu_lastval = 0; - cpu_repeat = 0; + dread_count_c = dread_count_a = dwrite_count_c = dwrite_count_a = 0; X6502_Run_c(); - cpu_repeat = 1; X6502_Run_a(); compare_state(); @@ -170,6 +185,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; X6502_Power_c(); X6502_Power_a(); diff --git a/x6502.c b/x6502.c index 81eb56e..b428056 100644 --- a/x6502.c +++ b/x6502.c @@ -27,8 +27,15 @@ #include "cart.h" #ifdef DEBUG_ASM_6502 +#include +#include extern uint32 PC_prev, OP_prev; -extern int cpu_lastval; +extern uint8 dreads[4]; +extern uint32 dwrites_c[2]; +extern int dread_count_c, dwrite_count_c; +#define DummyRdMem(...) +#else +#define DummyRdMem RdMem #endif X6502 X; @@ -66,12 +73,11 @@ static INLINE uint8 RdMem(unsigned int A) #endif _DB=ARead[A](A); #ifdef DEBUG_ASM_6502 - // TODO: read counter, not 0x10000.. - if (cpu_lastval) - cpu_lastval|=_DB<<8; - else - cpu_lastval=_DB|0x10000; - printf("read [%04x] %02x, cpu_lastval=%02x\n", A, _DB, cpu_lastval); + //printf("a == %x, pc == %x\n", A, _PC); + if (A >= 0x2000 && A != _PC && A != _PC - 1 && A != _PC + 1) { + dreads[dread_count_c++] = _DB; + if (dread_count_c > 4) { printf("dread_count out of range\n"); exit(1); } + } #endif return _DB; } @@ -83,6 +89,10 @@ static INLINE void WrMem(unsigned int A, uint8 V) return; } BWrite[A](A,V); +#ifdef DEBUG_ASM_6502 + dwrites_c[dwrite_count_c++] = (A<<8)|V; + if (dwrite_count_c > 2) { printf("dwrite_count_c out of range\n"); exit(1); } +#endif } static INLINE uint8 RdRAM(unsigned int A) @@ -255,7 +265,7 @@ static uint8 ZNTable[256] = { if((target^tmp)&0x100) \ { \ target&=0xFFFF; \ - RdMem(target^0x100); \ + DummyRdMem(target^0x100); \ ADDCYC(1); \ } \ } @@ -268,7 +278,7 @@ static uint8 ZNTable[256] = { target=rt; \ target+=i; \ target&=0xFFFF; \ - RdMem((target&0x00FF)|(rt&0xFF00)); \ + DummyRdMem((target&0x00FF)|(rt&0xFF00)); \ } /* Zero Page */ @@ -306,7 +316,7 @@ static uint8 ZNTable[256] = { if((target^rt)&0x100) \ { \ target&=0xFFFF; \ - RdMem(target^0x100); \ + DummyRdMem(target^0x100); \ ADDCYC(1); \ } \ } @@ -321,7 +331,7 @@ static uint8 ZNTable[256] = { rt|=RdRAM(tmp)<<8; \ target=rt; \ target+=_Y; \ - RdMem((target&0x00FF)|(rt&0xFF00)); \ + DummyRdMem((target&0x00FF)|(rt&0xFF00)); \ } /* Now come the macros to wrap up all of the above stuff addressing mode functions @@ -528,7 +538,6 @@ void X6502_Run_c(void/*int32 cycles*/) #ifdef DEBUG_ASM_6502 PC_prev = _PC; OP_prev = b1; - cpu_lastval = 0; #endif //printf("$%04x:$%02x\n",_PC,b1); //_PC++; -- 2.39.5