summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/m6502
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/cpu/m6502')
-rw-r--r--src/emu/cpu/m6502/6502dasm.c14
-rw-r--r--src/emu/cpu/m6502/m4510.c22
-rw-r--r--src/emu/cpu/m6502/m4510.h4
-rw-r--r--src/emu/cpu/m6502/m6502.c74
-rw-r--r--src/emu/cpu/m6502/m6502.h28
-rw-r--r--src/emu/cpu/m6502/m6509.c16
-rw-r--r--src/emu/cpu/m6502/m6509.h2
-rw-r--r--src/emu/cpu/m6502/m65ce02.c16
-rw-r--r--src/emu/cpu/m6502/m65ce02.h4
9 files changed, 90 insertions, 90 deletions
diff --git a/src/emu/cpu/m6502/6502dasm.c b/src/emu/cpu/m6502/6502dasm.c
index d324894d641..3c000ac91dc 100644
--- a/src/emu/cpu/m6502/6502dasm.c
+++ b/src/emu/cpu/m6502/6502dasm.c
@@ -742,48 +742,48 @@ static unsigned internal_m6502_dasm(const struct op6502_info *opinfo, char *buff
return (pc - PC) | flags;
}
-unsigned m6502_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
+CPU_DISASSEMBLE( m6502 )
{
return internal_m6502_dasm(op6502, buffer, pc, oprom, opram);
}
#if (HAS_M65SC02)
-unsigned m65sc02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
+CPU_DISASSEMBLE( m65sc02 )
{
return internal_m6502_dasm(op65sc02, buffer, pc, oprom, opram);
}
#endif
#if (HAS_M65C02||HAS_M65SC02||HAS_DECO16)
-unsigned m65c02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
+CPU_DISASSEMBLE( m65c02 )
{
return internal_m6502_dasm(op65c02, buffer, pc, oprom, opram);
}
#endif
#if (HAS_M65CE02)
-unsigned m65ce02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
+CPU_DISASSEMBLE( m65ce02 )
{
return internal_m6502_dasm(op65ce02, buffer, pc, oprom, opram);
}
#endif
#if (HAS_M6510)
-unsigned m6510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
+CPU_DISASSEMBLE( m6510 )
{
return internal_m6502_dasm(op6502, buffer, pc, oprom, opram);
}
#endif
#if (HAS_DECO16)
-unsigned deco16_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
+CPU_DISASSEMBLE( deco16 )
{
return internal_m6502_dasm(opdeco16, buffer, pc, oprom, opram);
}
#endif
#if (HAS_M4510)
-unsigned m4510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
+CPU_DISASSEMBLE( m4510 )
{
return internal_m6502_dasm(op4510, buffer, pc, oprom, opram);
}
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index 83563f25b78..ab733fd5092 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -237,11 +237,11 @@ static CPU_EXIT( m4510 )
/* nothing to do yet */
}
-static void m4510_get_context (void *dst)
+static CPU_GET_CONTEXT( m4510 )
{
}
-static void m4510_set_context (void *src)
+static CPU_SET_CONTEXT( m4510 )
{
m4510_Regs *m4510;
if( src )
@@ -397,12 +397,12 @@ static ADDRESS_MAP_START(m4510_mem, ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE(0x0000, 0x0001) AM_READWRITE(m4510_read_0000, m4510_write_0000)
ADDRESS_MAP_END
-static int m4510_translate(int space, int intention, offs_t *addr)
+static CPU_TRANSLATE( m4510 )
{
m4510_Regs *m4510 = token;
if (space == ADDRESS_SPACE_PROGRAM)
- *addr = M4510_MEM(*addr);
+ *address = M4510_MEM(*address);
return TRUE;
}
@@ -410,7 +410,7 @@ static int m4510_translate(int space, int intention, offs_t *addr)
* Generic set_info
**************************************************************************/
-static void m4510_set_info(UINT32 state, cpuinfo *info)
+static CPU_SET_INFO( m4510 )
{
m4510_Regs *m4510 = token;
@@ -457,7 +457,7 @@ static void m4510_set_info(UINT32 state, cpuinfo *info)
* Generic get_info
**************************************************************************/
-void m4510_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m4510 )
{
m4510_Regs *m4510 = token;
@@ -517,18 +517,18 @@ void m4510_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_M6510_PORT: info->i = m4510_get_port(m4510); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
- case CPUINFO_PTR_SET_INFO: info->setinfo = m4510_set_info; break;
- case CPUINFO_PTR_GET_CONTEXT: info->getcontext = m4510_get_context; break;
- case CPUINFO_PTR_SET_CONTEXT: info->setcontext = m4510_set_context; break;
+ case CPUINFO_PTR_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m4510); break;
+ case CPUINFO_PTR_GET_CONTEXT: info->getcontext = CPU_GET_CONTEXT_NAME(m4510); break;
+ case CPUINFO_PTR_SET_CONTEXT: info->setcontext = CPU_SET_CONTEXT_NAME(m4510); break;
case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(m4510); break;
case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(m4510); break;
case CPUINFO_PTR_EXIT: info->exit = CPU_EXIT_NAME(m4510); break;
case CPUINFO_PTR_EXECUTE: info->execute = CPU_EXECUTE_NAME(m4510); break;
case CPUINFO_PTR_BURN: info->burn = NULL; break;
- case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m4510_dasm; break;
+ case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m4510); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &m4510->icount; break;
case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map8 = address_map_m4510_mem; break;
- case CPUINFO_PTR_TRANSLATE: info->translate = m4510_translate; break;
+ case CPUINFO_PTR_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m4510); break;
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: info->f = (genf *) m4510->rdmem_id; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) m4510->wrmem_id; break;
case CPUINFO_PTR_M6510_PORTREAD: info->f = (genf *) m4510->port_read; break;
diff --git a/src/emu/cpu/m6502/m4510.h b/src/emu/cpu/m6502/m4510.h
index 6400cbb0b26..59c9d61c96d 100644
--- a/src/emu/cpu/m6502/m4510.h
+++ b/src/emu/cpu/m6502/m4510.h
@@ -39,9 +39,9 @@ enum
#define M4510_IRQ_LINE M6502_IRQ_LINE
-void m4510_get_info(UINT32 state, cpuinfo *info);
+CPU_GET_INFO( m4510 );
-extern unsigned m4510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
+extern CPU_DISASSEMBLE( m4510 );
#endif /* __M4510_H__ */
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index 98402922995..4d6f0721c55 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -194,11 +194,11 @@ static CPU_EXIT( m6502 )
/* nothing to do yet */
}
-static void m6502_get_context (void *dst)
+static CPU_GET_CONTEXT( m6502 )
{
}
-static void m6502_set_context (void *src)
+static CPU_SET_CONTEXT( m6502 )
{
m6502_Regs *m6502;
@@ -690,7 +690,7 @@ static CPU_EXECUTE( deco16 )
* Generic set_info
**************************************************************************/
-static void m6502_set_info(UINT32 state, cpuinfo *info)
+static CPU_SET_INFO( m6502 )
{
m6502_Regs *m6502 = token;
@@ -724,7 +724,7 @@ static void m6502_set_info(UINT32 state, cpuinfo *info)
* Generic get_info
**************************************************************************/
-void m6502_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m6502 )
{
m6502_Regs *m6502 = token;
@@ -771,15 +771,15 @@ void m6502_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + M6502_SUBTYPE: info->i = m6502->subtype; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
- case CPUINFO_PTR_SET_INFO: info->setinfo = m6502_set_info; break;
- case CPUINFO_PTR_GET_CONTEXT: info->getcontext = m6502_get_context; break;
- case CPUINFO_PTR_SET_CONTEXT: info->setcontext = m6502_set_context; break;
+ case CPUINFO_PTR_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m6502); break;
+ case CPUINFO_PTR_GET_CONTEXT: info->getcontext = CPU_GET_CONTEXT_NAME(m6502); break;
+ case CPUINFO_PTR_SET_CONTEXT: info->setcontext = CPU_SET_CONTEXT_NAME(m6502); break;
case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(m6502); break;
case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(m6502); break;
case CPUINFO_PTR_EXIT: info->exit = CPU_EXIT_NAME(m6502); break;
case CPUINFO_PTR_EXECUTE: info->execute = CPU_EXECUTE_NAME(m6502); break;
case CPUINFO_PTR_BURN: info->burn = NULL; break;
- case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m6502_dasm; break;
+ case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6502); break;
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;
@@ -820,7 +820,7 @@ void m6502_get_info(UINT32 state, cpuinfo *info)
* CPU-specific set_info
**************************************************************************/
-void n2a03_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( n2a03 )
{
switch (state)
{
@@ -830,7 +830,7 @@ void n2a03_get_info(UINT32 state, cpuinfo *info)
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "N2A03"); break;
- default: m6502_get_info(state, info); break;
+ default: CPU_GET_INFO_CALL(m6502); break;
}
}
#endif
@@ -841,7 +841,7 @@ void n2a03_get_info(UINT32 state, cpuinfo *info)
* CPU-specific set_info
**************************************************************************/
-static void m6510_set_info(UINT32 state, cpuinfo *info)
+static CPU_SET_INFO( m6510 )
{
m6502_Regs *m6502 = token;
@@ -851,21 +851,21 @@ static void m6510_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_PTR_M6510_PORTREAD: m6502->port_read = (UINT8 (*)(UINT8)) info->f; break;
case CPUINFO_PTR_M6510_PORTWRITE: m6502->port_write = (void (*)(UINT8,UINT8)) info->f; break;
- default: m6502_set_info(state, info); break;
+ default: CPU_SET_INFO_CALL(m6502); break;
}
}
-void m6510_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m6510 )
{
m6502_Regs *m6502 = token;
switch (state)
{
/* --- the following bits of info are returned as pointers to data or functions --- */
- case CPUINFO_PTR_SET_INFO: info->setinfo = m6510_set_info; break;
+ case CPUINFO_PTR_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m6510); break;
case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(m6510); break;
case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(m6510); break;
- case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m6510_dasm; break;
+ case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6510); break;
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;
@@ -876,7 +876,7 @@ void m6510_get_info(UINT32 state, cpuinfo *info)
/* --- the following bits of info are set as 64-bit signed integers --- */
case CPUINFO_INT_M6510_PORT: info->i = m6510_get_port(m6502); break;
- default: m6502_get_info(state, info); break;
+ default: CPU_GET_INFO_CALL(m6502); break;
}
}
#endif
@@ -887,14 +887,14 @@ void m6510_get_info(UINT32 state, cpuinfo *info)
* CPU-specific set_info
**************************************************************************/
-void m6510t_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m6510t )
{
switch (state)
{
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M6510T"); break;
- default: m6510_get_info(state, info); break;
+ default: CPU_GET_INFO_CALL(m6510); break;
}
}
#endif
@@ -905,14 +905,14 @@ void m6510t_get_info(UINT32 state, cpuinfo *info)
* CPU-specific set_info
**************************************************************************/
-void m7501_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m7501 )
{
switch (state)
{
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M7501"); break;
- default: m6510_get_info(state, info); break;
+ default: CPU_GET_INFO_CALL(m6510); break;
}
}
#endif
@@ -923,14 +923,14 @@ void m7501_get_info(UINT32 state, cpuinfo *info)
* CPU-specific set_info
**************************************************************************/
-void m8502_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m8502 )
{
switch (state)
{
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M8502"); break;
- default: m6510_get_info(state, info); break;
+ default: CPU_GET_INFO_CALL(m6510); break;
}
}
#endif
@@ -941,7 +941,7 @@ void m8502_get_info(UINT32 state, cpuinfo *info)
* CPU-specific set_info
**************************************************************************/
-static void m65c02_set_info(UINT32 state, cpuinfo *info)
+static CPU_SET_INFO( m65c02 )
{
m6502_Regs *m6502 = token;
@@ -950,25 +950,25 @@ static void m65c02_set_info(UINT32 state, cpuinfo *info)
/* --- the following bits of info are set as 64-bit signed integers --- */
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: m65c02_set_irq_line(m6502, INPUT_LINE_NMI, info->i); break;
- default: m6502_set_info(state, info); break;
+ default: CPU_SET_INFO_CALL(m6502); break;
}
}
-void m65c02_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m65c02 )
{
switch (state)
{
/* --- the following bits of info are returned as pointers to data or functions --- */
- case CPUINFO_PTR_SET_INFO: info->setinfo = m65c02_set_info; break;
+ case CPUINFO_PTR_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m65c02); break;
case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(m65c02); break;
case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(m65c02); break;
case CPUINFO_PTR_EXECUTE: info->execute = CPU_EXECUTE_NAME(m65c02); break;
- case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m65c02_dasm; break;
+ case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m65c02); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M65C02"); break;
- default: m6502_get_info(state, info); break;
+ default: CPU_GET_INFO_CALL(m6502); break;
}
}
#endif
@@ -979,13 +979,13 @@ void m65c02_get_info(UINT32 state, cpuinfo *info)
* CPU-specific set_info
**************************************************************************/
-void m65sc02_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m65sc02 )
{
switch (state)
{
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(m65sc02); break;
- case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m65sc02_dasm; break;
+ case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m65sc02); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M65SC02"); break;
@@ -994,7 +994,7 @@ void m65sc02_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break;
case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Peter Trauner\nall rights reserved."); break;
- default: m65c02_get_info(state, info); break;
+ default: CPU_GET_INFO_CALL(m65c02); break;
}
}
#endif
@@ -1005,7 +1005,7 @@ void m65sc02_get_info(UINT32 state, cpuinfo *info)
* CPU-specific set_info
**************************************************************************/
-static void deco16_set_info(UINT32 state, cpuinfo *info)
+static CPU_SET_INFO( deco16 )
{
m6502_Regs *m6502 = token;
@@ -1016,11 +1016,11 @@ static void deco16_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_INPUT_STATE + M6502_SET_OVERFLOW: deco16_set_irq_line(m6502, M6502_SET_OVERFLOW, info->i); break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: deco16_set_irq_line(m6502, INPUT_LINE_NMI, info->i); break;
- default: m6502_set_info(state, info); break;
+ default: CPU_SET_INFO_CALL(m6502); break;
}
}
-void deco16_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( deco16 )
{
switch (state)
{
@@ -1029,11 +1029,11 @@ void deco16_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
- case CPUINFO_PTR_SET_INFO: info->setinfo = deco16_set_info; break;
+ case CPUINFO_PTR_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(deco16); break;
case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(deco16); break;
case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(deco16); break;
case CPUINFO_PTR_EXECUTE: info->execute = CPU_EXECUTE_NAME(deco16); break;
- case CPUINFO_PTR_DISASSEMBLE: info->disassemble = deco16_dasm; break;
+ case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(deco16); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "DECO CPU16"); break;
@@ -1042,7 +1042,7 @@ void deco16_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break;
case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Bryan McPhail\nall rights reserved."); break;
- default: m6502_get_info(state, info); break;
+ default: CPU_GET_INFO_CALL(m6502); break;
}
}
#endif
diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h
index 783203e70fd..d5250fd7f52 100644
--- a/src/emu/cpu/m6502/m6502.h
+++ b/src/emu/cpu/m6502/m6502.h
@@ -72,9 +72,9 @@ enum
CPUINFO_INT_M6510_PORT = CPUINFO_INT_CPU_SPECIFIC
};
-extern void m6502_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( m6502 );
-extern unsigned m6502_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
+extern CPU_DISASSEMBLE( m6502 );
/****************************************************************************
* The 6510
@@ -93,9 +93,9 @@ extern unsigned m6502_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UI
#define M6510_IRQ_LINE M6502_IRQ_LINE
-extern void m6510_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( m6510 );
-extern unsigned m6510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
+extern CPU_DISASSEMBLE( m6510 );
#endif
@@ -113,7 +113,7 @@ extern unsigned m6510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UI
#define M6510T_IRQ_LINE M6502_IRQ_LINE
-extern void m6510t_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( m6510t );
#endif
@@ -131,7 +131,7 @@ extern void m6510t_get_info(UINT32 state, cpuinfo *info);
#define M7501_IRQ_LINE M6502_IRQ_LINE
-extern void m7501_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( m7501 );
#endif
#if (HAS_M8502)
@@ -148,7 +148,7 @@ extern void m7501_get_info(UINT32 state, cpuinfo *info);
#define M8502_IRQ_LINE M6502_IRQ_LINE
-extern void m8502_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( m8502 );
#endif
@@ -169,7 +169,7 @@ extern void m8502_get_info(UINT32 state, cpuinfo *info);
#define N2A03_IRQ_LINE M6502_IRQ_LINE
-extern void n2a03_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( n2a03 );
#define N2A03_DEFAULTCLOCK (21477272.724 / 12)
@@ -198,9 +198,9 @@ extern void n2a03_irq(void);
#define M65C02_IRQ_LINE M6502_IRQ_LINE
-extern void m65c02_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( m65c02 );
-extern unsigned m65c02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
+extern CPU_DISASSEMBLE( m65c02 );
#endif
@@ -221,9 +221,9 @@ extern unsigned m65c02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const U
#define M65SC02_IRQ_LINE M6502_IRQ_LINE
-extern void m65sc02_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( m65sc02 );
-extern unsigned m65sc02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
+extern CPU_DISASSEMBLE( m65sc02 );
#endif
/****************************************************************************
@@ -243,9 +243,9 @@ extern unsigned m65sc02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const
#define DECO16_IRQ_LINE M6502_IRQ_LINE
-extern void deco16_get_info(UINT32 state, cpuinfo *info);
+extern CPU_GET_INFO( deco16 );
#endif
-extern unsigned deco16_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
+extern CPU_DISASSEMBLE( deco16 );
#endif /* __M6502_H__ */
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index 4881d70cecd..52780a0448c 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -175,11 +175,11 @@ static CPU_EXIT( m6509 )
/* nothing to do yet */
}
-static void m6509_get_context (void *dst)
+static CPU_GET_CONTEXT( m6509 )
{
}
-static void m6509_set_context (void *src)
+static CPU_SET_CONTEXT( m6509 )
{
m6509_Regs *m6502;
@@ -311,7 +311,7 @@ static void m6509_set_irq_line(m6509_Regs *m6509, int irqline, int state)
* Generic set_info
**************************************************************************/
-static void m6509_set_info(UINT32 state, cpuinfo *info)
+static CPU_SET_INFO( m6509 )
{
m6509_Regs *m6509 = token;
m6509_Regs *m6502 = m6509;
@@ -348,7 +348,7 @@ static void m6509_set_info(UINT32 state, cpuinfo *info)
* Generic get_info
**************************************************************************/
-void m6509_get_info(UINT32 state, cpuinfo *info)
+CPU_GET_INFO( m6509 )
{
m6509_Regs *m6502 = token;
m6509_Regs *m6509 = m6502;
@@ -397,15 +397,15 @@ void m6509_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + M6509_ZP: info->i = m6509->zp.w.l; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
- case CPUINFO_PTR_SET_INFO: info->setinfo = m6509_set_info; break;
- case CPUINFO_PTR_GET_CONTEXT: info->getcontext = m6509_get_context; break;
- case CPUINFO_PTR_SET_CONTEXT: info->setcontext = m6509_set_context; break;
+ case CPUINFO_PTR_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m6509); break;
+ case CPUINFO_PTR_GET_CONTEXT: info->getcontext = CPU_GET_CONTEXT_NAME(m6509); break;
+ case CPUINFO_PTR_SET_CONTEXT: info->setcontext = CPU_SET_CONTEXT_NAME(m6509); break;
case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(m6509); break;
case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(m6509); break;
case CPUINFO_PTR_EXIT: info->exit = CPU_EXIT_NAME(m6509); break;
case CPUINFO_PTR_EXECUTE: info->execute = CPU_EXECUTE_NAME(m6509); break;
case CPUINFO_PTR_BURN: info->burn = NULL; break;
- case CPUINFO_PTR_DISASSEMBLE: info->disassemble = m6502_dasm; break;
+ case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6502); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &m6502->icount; break;
case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map8 = address_map_m6509_mem; break;
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: info->f = (genf *) m6509->rdmem_id; break;
diff --git a/src/emu/cpu/m6502/m6509.h b/src/emu/cpu/m6502/m6509.h
index 12d689c8b6e..490c295c955 100644
--- a/src/emu/cpu/m6502/m6509.h
+++ b/src/emu/cpu/m6502/m6509.h
@@ -39,6 +39,6 @@ enum
positiv edge sets overflow flag */
#define M6509_SET_OVERFLOW 3
-void m6509_get_info(UINT32 state, cpuinfo *info);
+CPU_GET_INFO( m6509 );
#endif /* __M6509_H__ */
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;
diff --git a/src/emu/cpu/m6502/m65ce02.h b/src/emu/cpu/m6502/m65ce02.h
index 145a1c6aeb3..8f7519d0ddf 100644
--- a/src/emu/cpu/m6502/m65ce02.h
+++ b/src/emu/cpu/m6502/m65ce02.h
@@ -35,8 +35,8 @@ enum
#define M65CE02_IRQ_LINE M6502_IRQ_LINE
-void m65ce02_get_info(UINT32 state, cpuinfo *info);
+CPU_GET_INFO( m65ce02 );
-extern unsigned m65ce02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
+extern CPU_DISASSEMBLE( m65ce02 );
#endif /* __M65CE02_H__ */