From 2ba1a992834e8b50712f6dfbe87da3b7beb1ba05 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Sat, 8 Nov 2008 09:20:43 +0000 Subject: Added macros for all CPU callbacks to ease future changes. Updated all CPU cores to use them. --- src/emu/cpu/m6502/m65ce02.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/emu/cpu/m6502/m65ce02.c') diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c index 3f54184faec..29d7d876334 100644 --- a/src/emu/cpu/m6502/m65ce02.c +++ b/src/emu/cpu/m6502/m65ce02.c @@ -124,13 +124,13 @@ static CPU_EXIT( m65ce02 ) /* nothing to do yet */ } -static void m65ce02_get_context (void *dst) +static CPU_GET_CONTEXT( m65ce02 ) { if( dst ) *(m65ce02_Regs*)dst = m65ce02; } -static void m65ce02_set_context (void *src) +static CPU_SET_CONTEXT( m65ce02 ) { if( src ) { @@ -239,7 +239,7 @@ static void m65ce02_set_irq_line(int irqline, int state) * Generic set_info **************************************************************************/ -static void m65ce02_set_info(UINT32 state, cpuinfo *info) +static CPU_SET_INFO( m65ce02 ) { switch( state ) { @@ -270,7 +270,7 @@ static void m65ce02_set_info(UINT32 state, cpuinfo *info) * Generic get_info **************************************************************************/ -void m65ce02_get_info(UINT32 state, cpuinfo *info) +CPU_GET_INFO( m65ce02 ) { switch( state ) { @@ -317,15 +317,15 @@ void m65ce02_get_info(UINT32 state, cpuinfo *info) case CPUINFO_INT_REGISTER+M65CE02_ZP: info->i = m65ce02.zp.w.l; break; /* --- the following bits of info are returned as pointers to data or functions --- */ - case CPUINFO_PTR_SET_INFO: info->setinfo = m65ce02_set_info; break; - case CPUINFO_PTR_GET_CONTEXT: info->getcontext = m65ce02_get_context; break; - case CPUINFO_PTR_SET_CONTEXT: info->setcontext = m65ce02_set_context; break; + case CPUINFO_PTR_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m65ce02); break; + case CPUINFO_PTR_GET_CONTEXT: info->getcontext = CPU_GET_CONTEXT_NAME(m65ce02); break; + case CPUINFO_PTR_SET_CONTEXT: info->setcontext = CPU_SET_CONTEXT_NAME(m65ce02); break; case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(m65ce02); break; case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(m65ce02); break; case CPUINFO_PTR_EXIT: info->exit = CPU_EXIT_NAME(m65ce02); break; case CPUINFO_PTR_EXECUTE: info->execute = CPU_EXECUTE_NAME(m65ce02); break; case CPUINFO_PTR_BURN: info->burn = NULL; break; - case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m65ce02_dasm; break; + case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m65ce02); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &m65ce02->icount; break; case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: info->f = (genf *) m65ce02.rdmem_id; break; case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) m65ce02.wrmem_id; break; -- cgit v1.2.3-70-g09d2