summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/m6502/m6502.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/cpu/m6502/m6502.c')
-rw-r--r--src/emu/cpu/m6502/m6502.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index a2711726824..8317e785f2e 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -230,7 +230,7 @@ static int m6502_execute(int cycles)
UINT8 op;
PPC = PCD;
- CALL_DEBUGGER(PCD);
+ debugger_instruction_hook(Machine, PCD);
/* if an irq is pending, take it now */
if( m6502.pending_irq )
@@ -449,7 +449,7 @@ static int m65c02_execute(int cycles)
UINT8 op;
PPC = PCD;
- CALL_DEBUGGER(PCD);
+ debugger_instruction_hook(Machine, PCD);
op = RDOP();
(*m6502.insn[op])();
@@ -620,7 +620,7 @@ static int deco16_execute(int cycles)
UINT8 op;
PPC = PCD;
- CALL_DEBUGGER(PCD);
+ debugger_instruction_hook(Machine, PCD);
op = RDOP();
(*m6502.insn[op])();
@@ -747,9 +747,7 @@ void m6502_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_PTR_EXIT: info->exit = m6502_exit; break;
case CPUINFO_PTR_EXECUTE: info->execute = m6502_execute; break;
case CPUINFO_PTR_BURN: info->burn = NULL; break;
-#ifdef ENABLE_DEBUGGER
case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m6502_dasm; break;
-#endif
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &m6502_ICount; break;
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: info->f = (genf *) m6502.rdmem_id; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) m6502.wrmem_id; break;
@@ -831,9 +829,7 @@ void m6510_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_PTR_SET_INFO: info->setinfo = m6510_set_info; break;
case CPUINFO_PTR_INIT: info->init = m6510_init; break;
case CPUINFO_PTR_RESET: info->reset = m6510_reset; break;
-#ifdef ENABLE_DEBUGGER
case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m6510_dasm; break;
-#endif
case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map8 = address_map_m6510_mem; break;
case CPUINFO_PTR_M6510_PORTREAD: info->f = (genf *) m6502.port_read; break;
case CPUINFO_PTR_M6510_PORTWRITE: info->f = (genf *) m6502.port_write; break;
@@ -929,9 +925,7 @@ void m65c02_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_PTR_INIT: info->init = m65c02_init; break;
case CPUINFO_PTR_RESET: info->reset = m65c02_reset; break;
case CPUINFO_PTR_EXECUTE: info->execute = m65c02_execute; break;
-#ifdef ENABLE_DEBUGGER
case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m65c02_dasm; break;
-#endif
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M65C02"); break;
@@ -953,9 +947,7 @@ void m65sc02_get_info(UINT32 state, cpuinfo *info)
{
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_PTR_INIT: info->init = m65sc02_init; break;
-#ifdef ENABLE_DEBUGGER
case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m65sc02_dasm; break;
-#endif
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M65SC02"); break;
@@ -1001,9 +993,7 @@ void deco16_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_PTR_INIT: info->init = deco16_init; break;
case CPUINFO_PTR_RESET: info->reset = deco16_reset; break;
case CPUINFO_PTR_EXECUTE: info->execute = deco16_execute; break;
-#ifdef ENABLE_DEBUGGER
case CPUINFO_PTR_DISASSEMBLE: info->disassemble = deco16_dasm; break;
-#endif
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "DECO CPU16"); break;