From c70c5fee5a6094c5a1fbd6b25568e57b1d3a8216 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Sat, 3 Jul 2010 00:12:44 +0000 Subject: Created CPU-specific device types for all CPUs, using new macros DECLARE_LEGACY_CPU_DEVICE and DEFINE_LEGACY_CPU_DEVICE. Changed CPUs to be their own device types, rather than all of type CPU with a special internal subtype. Note that as part of this process I removed the CPU_ prefix from the ALL-CAPS device name, so CPU_Z80 is just plain old Z80 now. This required changing a couple of names like 8080 to I8080 so that there was an alphabetic first character. Added memory interfaces to the list of fast-access interfaces. To do this properly I had to add a separate method to devices which is called immediately after construction, when it is possible to perform dynamic_casts on fully-constructed objects. (This is just internal, no changes necessary to the devices themselves.) Some additional notes: * SH2 and SH4 had typedefs that conflicted with their CPU_-less names so I bulk renamed to structures to sh2_state and sh4_state; RB, feel free to choose alternate names if you don't like 'em * SCSP was caught doing something to the 3rd indexed CPU. Since several systems that use SCSP don't even have 3 CPUs, I had no idea what this was supposed to do, so I changed to it reference "audiocpu" assuming that stv was the assumed target. This is really gross and should be a configuration parameter, not a hard-coded assumption. --- src/emu/cpu/h83002/h8priv.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/emu/cpu/h83002/h8priv.h') diff --git a/src/emu/cpu/h83002/h8priv.h b/src/emu/cpu/h83002/h8priv.h index e7fd0ab5d0d..8208c653aa6 100644 --- a/src/emu/cpu/h83002/h8priv.h +++ b/src/emu/cpu/h83002/h8priv.h @@ -50,11 +50,10 @@ extern h83xx_state h8; INLINE h83xx_state *get_safe_token(running_device *device) { assert(device != NULL); - assert(device->type() == CPU); - assert(cpu_get_type(device) == CPU_H83002 || - cpu_get_type(device) == CPU_H83007 || - cpu_get_type(device) == CPU_H83044 || - cpu_get_type(device) == CPU_H83334); + assert(device->type() == H83002 || + device->type() == H83007 || + device->type() == H83044 || + device->type() == H83334); return (h83xx_state *)downcast(device)->token(); } -- cgit v1.2.3-70-g09d2