From 65e6d498ee4423c99671c9beeb90e5de010a98e6 Mon Sep 17 00:00:00 2001 From: tudnai Date: Wed, 16 Nov 2022 18:23:13 -0800 Subject: [PATCH] Renamed *_dbg() to *_dis() --- src/cpu/6502_debugger.c | 4 +- src/dev/mem/mmio.c | 94 ++++++++++++++++++------------------- src/dev/mem/mmio.h | 100 ++++++++++++++++++++-------------------- 3 files changed, 99 insertions(+), 99 deletions(-) diff --git a/src/cpu/6502_debugger.c b/src/cpu/6502_debugger.c index 1bcc9e1..0fa5278 100644 --- a/src/cpu/6502_debugger.c +++ b/src/cpu/6502_debugger.c @@ -82,13 +82,13 @@ INLINE int m6502_Disass_1_Instr(void) { _disNewInstruction(); - switch ( _fetch_dbg() ) { + switch ( _fetch_dis() ) { #include "6502_std.h" // Standard 6502 instructions //#include "6502_und.h" // Undocumented 6502 instructions #include "6502_C.h" // Extended 65C02 instructions default: - dbgPrintf("%04X: Unimplemented Instruction 0x%02X\n", m6502.PC -1, _memread_dbg( m6502.PC -1 )); + dbgPrintf("%04X: Unimplemented Instruction 0x%02X\n", m6502.PC -1, _memread_dis( m6502.PC -1 )); return 2; } // switch fetch diff --git a/src/dev/mem/mmio.c b/src/dev/mem/mmio.c index 42f8dd7..8bd494b 100644 --- a/src/dev/mem/mmio.c +++ b/src/dev/mem/mmio.c @@ -1017,7 +1017,7 @@ INLINE uint8_t _memread( uint16_t addr ) { // return memread8(addr); } -INLINE uint8_t _memread_dbg( uint16_t addr ) { +INLINE uint8_t _memread_dis( uint16_t addr ) { if (addr >= 0xC000) { // return memread8_paged(addr); return memread8_high(addr); @@ -1096,7 +1096,7 @@ INLINE uint8_t _fetch() { return memread8_low( m6502.PC++ ); } -INLINE uint8_t _fetch_dbg() { +INLINE uint8_t _fetch_dis() { _disHexB( &disassembly.pOpcode, memread8_low(m6502.PC) ); return memread8_low( m6502.PC++ ); } @@ -1123,7 +1123,7 @@ INLINE uint16_t _fetch16() { return word; } -INLINE uint16_t _fetch16_dbg() { +INLINE uint16_t _fetch16_dis() { uint16_t word = memread16( m6502.PC ); // disPrintf(disassembly.comment, "fetch16:%04X", word); m6502.PC += 2; @@ -1149,15 +1149,15 @@ INLINE uint16_t _fetch16_dbg() { INLINE uint16_t _addr_abs() { return _fetch16(); } -INLINE uint16_t _addr_abs_dbg() { +INLINE uint16_t _addr_abs_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "$%04X", memread16(m6502.PC)); - return _fetch16_dbg(); + return _fetch16_dis(); } INLINE uint8_t _src_abs() { return _memread( _addr_abs() ); } -INLINE uint8_t _src_abs_dbg() { - return _memread_dbg( _addr_abs_dbg() ); +INLINE uint8_t _src_abs_dis() { + return _memread_dis( _addr_abs_dis() ); } //INLINE uint8_t * dest_abs() { // return WRLOMEM + addr_abs(); @@ -1167,25 +1167,25 @@ INLINE uint8_t _src_abs_dbg() { INLINE int8_t _rel_addr() { return _fetch(); } -INLINE int8_t _rel_addr_dbg() { +INLINE int8_t _rel_addr_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "$%04X", m6502.PC + 1 + (int8_t)memread8(m6502.PC)); - return _fetch_dbg(); + return _fetch_dis(); } INLINE uint16_t _abs_addr() { return _fetch16(); } -INLINE uint16_t _abs_addr_dbg() { +INLINE uint16_t _abs_addr_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "$%04X", memread16(m6502.PC)); - return _fetch16_dbg(); + return _fetch16_dis(); } INLINE uint16_t _ind_addr() { return memread16( _fetch16() ); } -INLINE uint16_t _ind_addr_dbg() { +INLINE uint16_t _ind_addr_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "($%04X)", memread16(m6502.PC)); _disPrintf(disassembly.comment, sizeof(disassembly.comment), "ind_addr:%04X", memread16(memread16(m6502.PC))); - return memread16( _fetch16_dbg() ); + return memread16( _fetch16_dis() ); } /** @@ -1195,15 +1195,15 @@ INLINE uint16_t _ind_addr_dbg() { INLINE uint16_t _addr_abs_X() { return _fetch16() + m6502.X; } -INLINE uint16_t _addr_abs_X_dbg() { +INLINE uint16_t _addr_abs_X_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "$%04X,X", memread16(m6502.PC)); - return _fetch16_dbg() + m6502.X; + return _fetch16_dis() + m6502.X; } INLINE uint8_t _src_abs_X() { return _memread( _addr_abs_X() ); } -INLINE uint8_t _src_abs_X_dbg() { - return _memread_dbg( _addr_abs_X_dbg() ); +INLINE uint8_t _src_abs_X_dis() { + return _memread_dis( _addr_abs_X_dis() ); } //INLINE uint8_t * dest_abs_X() { // return WRLOMEM + addr_abs_X(); @@ -1217,15 +1217,15 @@ INLINE uint8_t _src_abs_X_dbg() { INLINE uint16_t _addr_abs_Y() { return _fetch16() + m6502.Y; } -INLINE uint16_t _addr_abs_Y_dbg() { +INLINE uint16_t _addr_abs_Y_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "$%04X,Y", memread16(m6502.PC)); - return _fetch16_dbg() + m6502.Y; + return _fetch16_dis() + m6502.Y; } INLINE uint8_t _src_abs_Y() { return _memread(_addr_abs_Y()); } -INLINE uint8_t _src_abs_Y_dbg() { - return _memread_dbg(_addr_abs_Y_dbg()); +INLINE uint8_t _src_abs_Y_dis() { + return _memread_dis(_addr_abs_Y_dis()); } //INLINE uint8_t * dest_abs_Y() { // return WRLOMEM + addr_abs_Y(); @@ -1234,9 +1234,9 @@ INLINE uint8_t _src_abs_Y_dbg() { INLINE uint8_t _imm() { return _fetch(); } -INLINE uint8_t _imm_dbg() { +INLINE uint8_t _imm_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "#$%02X", memread8(m6502.PC)); - return _fetch_dbg(); + return _fetch_dis(); } @@ -1247,15 +1247,15 @@ INLINE uint8_t _imm_dbg() { INLINE uint8_t _addr_zp() { return _fetch(); } -INLINE uint8_t _addr_zp_dbg() { +INLINE uint8_t _addr_zp_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "$%02X", memread8(m6502.PC)); - return _fetch_dbg(); + return _fetch_dis(); } INLINE uint8_t _src_zp() { return memread8_low(_addr_zp()); } -INLINE uint8_t _src_zp_dbg() { - return memread8_low(_addr_zp_dbg()); +INLINE uint8_t _src_zp_dis() { + return memread8_low(_addr_zp_dis()); } //INLINE uint8_t * dest_zp() { // return WRLOMEM + addr_zp(); @@ -1279,17 +1279,17 @@ INLINE uint8_t _src_zp_dbg() { INLINE uint16_t _addr_ind() { return memread16( _fetch() ); } -INLINE uint16_t _addr_ind_dbg() { +INLINE uint16_t _addr_ind_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "($%02X,X)", memread8(m6502.PC) ); _disPrintf(disassembly.comment, sizeof(disassembly.comment), "ind_addr:%04X", memread16( memread8(m6502.PC)) ); - return memread16( _fetch_dbg() ); + return memread16( _fetch_dis() ); } INLINE uint8_t _src_ind() { return _memread( _addr_ind() ); } -INLINE uint8_t _src_ind_dbg() { - return _memread_dbg( _addr_ind_dbg() ); +INLINE uint8_t _src_ind_dis() { + return _memread_dis( _addr_ind_dis() ); } /** @@ -1300,17 +1300,17 @@ INLINE uint8_t _src_ind_dbg() { INLINE uint16_t _addr_ind_X() { return memread16( _fetch() + m6502.X ); } -INLINE uint16_t _addr_ind_X_dbg() { +INLINE uint16_t _addr_ind_X_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "($%02X,X)", memread8(m6502.PC) ); _disPrintf(disassembly.comment, sizeof(disassembly.comment), "ind_addr:%04X", memread16( memread8(m6502.PC) + m6502.X) ); - return memread16( _fetch_dbg() + m6502.X ); + return memread16( _fetch_dis() + m6502.X ); } INLINE uint8_t _src_X_ind() { return _memread( _addr_ind_X() ); } -INLINE uint8_t _src_X_ind_dbg() { - return _memread_dbg( _addr_ind_X_dbg() ); +INLINE uint8_t _src_X_ind_dis() { + return _memread_dis( _addr_ind_X_dis() ); } //INLINE uint8_t * dest_X_ind() { // return WRLOMEM + addr_ind_X(); @@ -1324,17 +1324,17 @@ INLINE uint8_t _src_X_ind_dbg() { INLINE uint16_t _addr_ind_Y() { return memread16( _fetch() ) + m6502.Y; } -INLINE uint16_t _addr_ind_Y_dbg() { +INLINE uint16_t _addr_ind_Y_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "($%02X),Y", memread8(m6502.PC) ); _disPrintf(disassembly.comment, sizeof(disassembly.comment), "ind_addr:%04X", memread16( memread8(m6502.PC) ) + m6502.Y ); - return memread16( _fetch_dbg() ) + m6502.Y; + return memread16( _fetch_dis() ) + m6502.Y; } INLINE uint8_t _src_ind_Y() { return _memread( _addr_ind_Y() ); } -INLINE uint8_t _src_ind_Y_dbg() { - return _memread_dbg( _addr_ind_Y_dbg() ); +INLINE uint8_t _src_ind_Y_dis() { + return _memread_dis( _addr_ind_Y_dis() ); } //INLINE uint8_t * dest_ind_Y() { // return WRLOMEM + addr_ind_Y(); @@ -1349,16 +1349,16 @@ INLINE uint8_t _src_ind_Y_dbg() { INLINE uint8_t _addr_zp_X() { return _fetch() + m6502.X; } -INLINE uint8_t _addr_zp_X_dbg() { +INLINE uint8_t _addr_zp_X_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "$%02X,X", memread8(m6502.PC)); - return _fetch_dbg() + m6502.X; + return _fetch_dis() + m6502.X; } INLINE uint8_t _src_zp_X() { return memread8_low(_addr_zp_X()); } -INLINE uint8_t _src_zp_X_dbg() { - return memread8_low(_addr_zp_X_dbg()); +INLINE uint8_t _src_zp_X_dis() { + return memread8_low(_addr_zp_X_dis()); } //INLINE uint8_t * dest_zp_X() { // return WRLOMEM + addr_zp_X(); @@ -1372,16 +1372,16 @@ INLINE uint8_t _src_zp_X_dbg() { INLINE uint8_t _addr_zp_Y() { return _fetch() + m6502.Y; } -INLINE uint8_t _addr_zp_Y_dbg() { +INLINE uint8_t _addr_zp_Y_dis() { _disPrintf(disassembly.oper, sizeof(disassembly.oper), "$%02X,Y", memread8(m6502.PC)); - return _fetch_dbg() + m6502.Y; + return _fetch_dis() + m6502.Y; } INLINE uint8_t _src_zp_Y() { return memread8_low(_addr_zp_Y()); } -INLINE uint8_t _src_zp_Y_dbg() { - return memread8_low(_addr_zp_Y_dbg()); +INLINE uint8_t _src_zp_Y_dis() { + return memread8_low(_addr_zp_Y_dis()); } //INLINE uint8_t * dest_zp_Y() { // return WRLOMEM + addr_zp_Y(); diff --git a/src/dev/mem/mmio.h b/src/dev/mem/mmio.h index 32c5dd6..76b79af 100644 --- a/src/dev/mem/mmio.h +++ b/src/dev/mem/mmio.h @@ -411,59 +411,59 @@ INLINE uint8_t memread8( uint16_t addr ); INLINE uint16_t memread16_low( uint16_t addr ); INLINE uint16_t memread16( uint16_t addr ); INLINE uint8_t _memread( uint16_t addr ); -INLINE uint8_t _memread_dbg( uint16_t addr ); +INLINE uint8_t _memread_dis( uint16_t addr ); INLINE void _memwrite8_low( uint16_t addr, uint8_t data ); INLINE void _memwrite8_bank( uint16_t addr, uint8_t data ); INLINE void _memwrite8_high( uint16_t addr, uint8_t data ); INLINE void _memwrite( uint16_t addr, uint8_t data ); INLINE uint8_t _fetch(void); -INLINE uint8_t _fetch_dbg(void); +INLINE uint8_t _fetch_dis(void); INLINE uint16_t _fetch16(void); -INLINE uint16_t _fetch16_dbg(void); +INLINE uint16_t _fetch16_dis(void); INLINE uint16_t _addr_abs(void); -INLINE uint16_t _addr_abs_dbg(void); +INLINE uint16_t _addr_abs_dis(void); INLINE uint8_t _src_abs(void); -INLINE uint8_t _src_abs_dbg(void); +INLINE uint8_t _src_abs_dis(void); INLINE int8_t _rel_addr(void); -INLINE int8_t _rel_addr_dbg(void); +INLINE int8_t _rel_addr_dis(void); INLINE uint16_t _abs_addr(void); -INLINE uint16_t _abs_addr_dbg(void); +INLINE uint16_t _abs_addr_dis(void); INLINE uint16_t _ind_addr(void); -INLINE uint16_t _ind_addr_dbg(void); +INLINE uint16_t _ind_addr_dis(void); INLINE uint16_t _addr_abs_X(void); -INLINE uint16_t _addr_abs_X_dbg(void); +INLINE uint16_t _addr_abs_X_dis(void); INLINE uint8_t _src_abs_X(void); -INLINE uint8_t _src_abs_X_dbg(void); +INLINE uint8_t _src_abs_X_dis(void); INLINE uint16_t _addr_abs_Y(void); -INLINE uint16_t _addr_abs_Y_dbg(void); +INLINE uint16_t _addr_abs_Y_dis(void); INLINE uint8_t _src_abs_Y(void); -INLINE uint8_t _src_abs_Y_dbg(void); +INLINE uint8_t _src_abs_Y_dis(void); INLINE uint8_t _imm(void); -INLINE uint8_t _imm_dbg(void); +INLINE uint8_t _imm_dis(void); INLINE uint8_t _addr_zp(void); -INLINE uint8_t _addr_zp_dbg(void); +INLINE uint8_t _addr_zp_dis(void); INLINE uint8_t _src_zp(void); -INLINE uint8_t _src_zp_dbg(void); +INLINE uint8_t _src_zp_dis(void); INLINE uint16_t _addr_ind(void); -INLINE uint16_t _addr_ind_dbg(void); +INLINE uint16_t _addr_ind_dis(void); INLINE uint8_t _src_ind(void); -INLINE uint8_t _src_ind_dbg(void); +INLINE uint8_t _src_ind_dis(void); INLINE uint16_t _addr_ind_X(void); -INLINE uint16_t _addr_ind_X_dbg(void); +INLINE uint16_t _addr_ind_X_dis(void); INLINE uint8_t _src_X_ind(void); -INLINE uint8_t _src_X_ind_dbg(void); +INLINE uint8_t _src_X_ind_dis(void); INLINE uint16_t _addr_ind_Y(void); -INLINE uint16_t _addr_ind_Y_dbg(void); +INLINE uint16_t _addr_ind_Y_dis(void); INLINE uint8_t _src_ind_Y(void); -INLINE uint8_t _src_ind_Y_dbg(void); +INLINE uint8_t _src_ind_Y_dis(void); INLINE uint8_t _addr_zp_X(void); -INLINE uint8_t _addr_zp_X_dbg(void); +INLINE uint8_t _addr_zp_X_dis(void); INLINE uint8_t _src_zp_X(void); -INLINE uint8_t _src_zp_X_dbg(void); +INLINE uint8_t _src_zp_X_dis(void); INLINE uint8_t _addr_zp_Y(void); -INLINE uint8_t _addr_zp_Y_dbg(void); +INLINE uint8_t _addr_zp_Y_dis(void); INLINE uint8_t _src_zp_Y(void); -INLINE uint8_t _src_zp_Y_dbg(void); +INLINE uint8_t _src_zp_Y_dis(void); #ifndef DEBUGGER @@ -500,35 +500,35 @@ INLINE uint8_t _src_zp_Y_dbg(void); #else // DEBUGGER -#define fetch() _fetch_dbg() -#define fetch16() _fetch16_dbg() -#define memread(addr) _memread_dbg(addr); +#define fetch() _fetch_dis() +#define fetch16() _fetch16_dis() +#define memread(addr) _memread_dis(addr); #define memwrite8_low(addr,data) // do not write anything into the memory while disassembling #define memwrite8_bank(addr,data) // do not write anything into the memory while disassembling #define memwrite8_high(addr,data) // do not write anything into the memory while disassembling #define memwrite(addr,data) // do not write anything into the memory while disassembling -#define addr_abs() _addr_abs_dbg() -#define src_abs() _src_abs_dbg() -#define rel_addr() _rel_addr_dbg() -#define abs_addr() _abs_addr_dbg() -#define ind_addr() _ind_addr_dbg() -#define addr_abs_X() _addr_abs_X_dbg() -#define src_abs_X() _src_abs_X_dbg() -#define addr_abs_Y() _addr_abs_Y_dbg() -#define src_abs_Y() _src_abs_Y_dbg() -#define imm() _imm_dbg() -#define addr_zp() _addr_zp_dbg() -#define src_zp() _src_zp_dbg() -#define addr_ind() _addr_ind_dbg() -#define src_ind() _src_ind_dbg() -#define addr_ind_X() _addr_ind_X_dbg() -#define src_X_ind() _src_X_ind_dbg() -#define addr_ind_Y() _addr_ind_Y_dbg() -#define src_ind_Y() _src_ind_Y_dbg() -#define addr_zp_X() _addr_zp_X_dbg() -#define src_zp_X() _src_zp_X_dbg() -#define addr_zp_Y() _addr_zp_Y_dbg() -#define src_zp_Y() _src_zp_Y_dbg() +#define addr_abs() _addr_abs_dis() +#define src_abs() _src_abs_dis() +#define rel_addr() _rel_addr_dis() +#define abs_addr() _abs_addr_dis() +#define ind_addr() _ind_addr_dis() +#define addr_abs_X() _addr_abs_X_dis() +#define src_abs_X() _src_abs_X_dis() +#define addr_abs_Y() _addr_abs_Y_dis() +#define src_abs_Y() _src_abs_Y_dis() +#define imm() _imm_dis() +#define addr_zp() _addr_zp_dis() +#define src_zp() _src_zp_dis() +#define addr_ind() _addr_ind_dis() +#define src_ind() _src_ind_dis() +#define addr_ind_X() _addr_ind_X_dis() +#define src_X_ind() _src_X_ind_dis() +#define addr_ind_Y() _addr_ind_Y_dis() +#define src_ind_Y() _src_ind_Y_dis() +#define addr_zp_X() _addr_zp_X_dis() +#define src_zp_X() _src_zp_X_dis() +#define addr_zp_Y() _addr_zp_Y_dis() +#define src_zp_Y() _src_zp_Y_dis() #endif // DEBUGGER