diff options
Diffstat (limited to 'src/emu/cpu/tms32025/tms32025.c')
-rw-r--r-- | src/emu/cpu/tms32025/tms32025.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c index 72b32bbdd72..9cb562b55d7 100644 --- a/src/emu/cpu/tms32025/tms32025.c +++ b/src/emu/cpu/tms32025/tms32025.c @@ -2093,7 +2093,7 @@ static CPU_EXECUTE( tms32025 ) /**************************************************************************** * Get all registers in given buffer ****************************************************************************/ -static void tms32025_get_context (void *dst) +static CPU_GET_CONTEXT( tms32025 ) { if (dst) { @@ -2107,7 +2107,7 @@ static void tms32025_get_context (void *dst) /**************************************************************************** * Set all registers to given values ****************************************************************************/ -static void tms32025_set_context (void *src) +static CPU_SET_CONTEXT( tms32025 ) { if (src) { @@ -2136,7 +2136,7 @@ static void set_irq_line(int irqline, int state) /**************************************************************************** * Opcode fetcher ****************************************************************************/ -static int tms32025_readop(UINT32 offset, int size, UINT64 *value) +static CPU_READOP( tms32025 ) { void *ptr; @@ -2159,7 +2159,7 @@ static int tms32025_readop(UINT32 offset, int size, UINT64 *value) /**************************************************************************** * Memory reader ****************************************************************************/ -static int tms32025_read(int space, UINT32 offset, int size, UINT64 *value) +static CPU_READ( tms32025 ) { void *ptr = NULL; UINT64 temp = 0; @@ -2191,15 +2191,15 @@ static int tms32025_read(int space, UINT32 offset, int size, UINT64 *value) *value = ((UINT16 *)ptr)[(offset & 0xff) / 2]; break; case 4: - tms32025_read(space, offset + 0, 2, &temp); + CPU_READ_NAME(tms32025)(space, offset + 0, 2, &temp); *value = temp << 16; - tms32025_read(space, offset + 2, 2, &temp); + CPU_READ_NAME(tms32025)(space, offset + 2, 2, &temp); *value |= temp & 0xffff; break; case 8: - tms32025_read(space, offset + 0, 4, &temp); + CPU_READ_NAME(tms32025)(space, offset + 0, 4, &temp); *value = temp << 32; - tms32025_read(space, offset + 4, 4, &temp); + CPU_READ_NAME(tms32025)(space, offset + 4, 4, &temp); *value |= temp & 0xffffffff; break; } @@ -2210,7 +2210,7 @@ static int tms32025_read(int space, UINT32 offset, int size, UINT64 *value) /**************************************************************************** * Memory writer ****************************************************************************/ -static int tms32025_write(int space, UINT32 offset, int size, UINT64 value) +static CPU_WRITE( tms32025 ) { void *ptr = NULL; @@ -2241,12 +2241,12 @@ static int tms32025_write(int space, UINT32 offset, int size, UINT64 value) ((UINT16 *)ptr)[(offset & 0xff) / 2] = value; break; case 4: - tms32025_write(space, offset + 0, 2, value >> 16); - tms32025_write(space, offset + 2, 2, value); + CPU_WRITE_NAME(tms32025)(space, offset + 0, 2, value >> 16); + CPU_WRITE_NAME(tms32025)(space, offset + 2, 2, value); break; case 8: - tms32025_write(space, offset + 0, 4, value >> 32); - tms32025_write(space, offset + 4, 4, value); + CPU_WRITE_NAME(tms32025)(space, offset + 0, 4, value >> 32); + CPU_WRITE_NAME(tms32025)(space, offset + 4, 4, value); break; } return 1; @@ -2257,7 +2257,7 @@ static int tms32025_write(int space, UINT32 offset, int size, UINT64 value) * Generic set_info **************************************************************************/ -static void tms32025_set_info(UINT32 state, cpuinfo *info) +static CPU_SET_INFO( tms32025 ) { switch (state) { @@ -2311,7 +2311,7 @@ static void tms32025_set_info(UINT32 state, cpuinfo *info) * Generic get_info **************************************************************************/ -void tms32025_get_info(UINT32 state, cpuinfo *info) +CPU_GET_INFO( tms32025 ) { switch (state) { @@ -2381,18 +2381,18 @@ void tms32025_get_info(UINT32 state, cpuinfo *info) case CPUINFO_INT_REGISTER + TMS32025_GREG: info->i = M_RDRAM(5); break; /* --- the following bits of info are returned as pointers to data or functions --- */ - case CPUINFO_PTR_SET_INFO: info->setinfo = tms32025_set_info; break; - case CPUINFO_PTR_GET_CONTEXT: info->getcontext = tms32025_get_context; break; - case CPUINFO_PTR_SET_CONTEXT: info->setcontext = tms32025_set_context; break; + case CPUINFO_PTR_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(tms32025); break; + case CPUINFO_PTR_GET_CONTEXT: info->getcontext = CPU_GET_CONTEXT_NAME(tms32025); break; + case CPUINFO_PTR_SET_CONTEXT: info->setcontext = CPU_SET_CONTEXT_NAME(tms32025); break; case CPUINFO_PTR_INIT: info->init = CPU_INIT_NAME(tms32025); break; case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(tms32025); break; case CPUINFO_PTR_EXIT: info->exit = CPU_EXIT_NAME(tms32025); break; case CPUINFO_PTR_EXECUTE: info->execute = CPU_EXECUTE_NAME(tms32025); break; case CPUINFO_PTR_BURN: info->burn = NULL; break; - case CPUINFO_PTR_DISASSEMBLE: info->disassemble = tms32025_dasm; break; - case CPUINFO_PTR_READ: info->read = tms32025_read; break; - case CPUINFO_PTR_WRITE: info->write = tms32025_write; break; - case CPUINFO_PTR_READOP: info->readop = tms32025_readop; break; + case CPUINFO_PTR_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tms32025); break; + case CPUINFO_PTR_READ: info->read = CPU_READ_NAME(tms32025); break; + case CPUINFO_PTR_WRITE: info->write = CPU_WRITE_NAME(tms32025); break; + case CPUINFO_PTR_READOP: info->readop = CPU_READOP_NAME(tms32025); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &tms32025_icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ @@ -2465,9 +2465,9 @@ void tms32025_get_info(UINT32 state, cpuinfo *info) * CPU-specific set_info **************************************************************************/ -void tms32026_get_info(UINT32 _state, cpuinfo *info) +CPU_GET_INFO( tms32026 ) { - switch (_state) + switch (state) { /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_PTR_RESET: info->reset = CPU_RESET_NAME(tms32026); break; @@ -2475,7 +2475,7 @@ void tms32026_get_info(UINT32 _state, cpuinfo *info) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS32026"); break; - default: tms32025_get_info(_state, info); break; + default: CPU_GET_INFO_CALL(tms32025); break; } } #endif |