diff options
Diffstat (limited to 'src/emu/cpu/tms32010/tms32010.c')
-rw-r--r-- | src/emu/cpu/tms32010/tms32010.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c index 79659162f23..145dc5d5fb2 100644 --- a/src/emu/cpu/tms32010/tms32010.c +++ b/src/emu/cpu/tms32010/tms32010.c @@ -100,10 +100,9 @@ struct _tms32010_state INLINE tms32010_state *get_safe_token(running_device *device) { assert(device != NULL); - assert(device->token != NULL); - assert(device->type == CPU); + assert(device->type() == CPU); assert(cpu_get_type(device) == CPU_TMS32010); - return (tms32010_state *)device->token; + return (tms32010_state *)downcast<cpu_device *>(device)->token(); } /* opcode table entry */ @@ -801,9 +800,9 @@ static CPU_INIT( tms32010 ) state_save_register_device_item(device, 0, cpustate->addr_mask); cpustate->device = device; - cpustate->program = device->space(AS_PROGRAM); - cpustate->data = device->space(AS_DATA); - cpustate->io = device->space(AS_IO); + cpustate->program = device_memory(device)->space(AS_PROGRAM); + cpustate->data = device_memory(device)->space(AS_DATA); + cpustate->io = device_memory(device)->space(AS_IO); } @@ -944,7 +943,7 @@ static CPU_SET_INFO( tms32010 ) CPU_GET_INFO( tms32010 ) { - tms32010_state *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL; + tms32010_state *cpustate = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL; switch (state) { |