diff options
Diffstat (limited to 'src/devices/cpu/m68000/m68kcpu.cpp')
-rw-r--r-- | src/devices/cpu/m68000/m68kcpu.cpp | 109 |
1 files changed, 52 insertions, 57 deletions
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index 5a7793e6af1..0de7af11c00 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -2271,14 +2271,14 @@ void m68000_base_device::m68ki_exception_interrupt(m68000_base_device *m68k, uin } -const device_type M68K = device_creator<m68000_base_device>; +DEFINE_DEVICE_TYPE(M68K, m68000_base_device, "m68k", "M68K") //------------------------------------------------- // h6280_device - constructor //------------------------------------------------- m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : cpu_device(mconfig, M68K, "M68K", tag, owner, clock, "m68k", __FILE__), + : cpu_device(mconfig, M68K, tag, owner, clock), m_program_config("program", ENDIANNESS_BIG, 16, 24), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, 16, 24) { @@ -2288,9 +2288,9 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char -m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) - : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, + const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map) + : cpu_device(mconfig, type, tag, owner, clock), m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map) { @@ -2298,9 +2298,9 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char } -m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, const char *shortname, const char *source) - : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, + const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits) + : cpu_device(mconfig, type, tag, owner, clock), m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits) { @@ -2495,37 +2495,32 @@ const address_space_config *m68000_base_device::memory_space_config(address_spac -const device_type M68000 = device_creator<m68000_device>; -const device_type M68301 = device_creator<m68301_device>; -const device_type M68008 = device_creator<m68008_device>; -const device_type M68008PLCC = device_creator<m68008plcc_device>; -const device_type M68010 = device_creator<m68010_device>; -const device_type M68EC020 = device_creator<m68ec020_device>; -const device_type M68020 = device_creator<m68020_device>; -const device_type M68020FPU = device_creator<m68020fpu_device>; -const device_type M68020PMMU = device_creator<m68020pmmu_device>; -const device_type M68020HMMU = device_creator<m68020hmmu_device>; -const device_type M68EC030 = device_creator<m68ec030_device>; -const device_type M68030 = device_creator<m68030_device>; -const device_type M68EC040 = device_creator<m68ec040_device>; -const device_type M68LC040 = device_creator<m68lc040_device>; -const device_type M68040 = device_creator<m68040_device>; -const device_type SCC68070 = device_creator<scc68070_device>; -const device_type FSCPU32 = device_creator<fscpu32_device>; -const device_type MCF5206E = device_creator<mcf5206e_device>; +DEFINE_DEVICE_TYPE(M68000, m68000_device, "m68000", "M68000") +DEFINE_DEVICE_TYPE(M68301, m68301_device, "m68301", "M68301") +DEFINE_DEVICE_TYPE(M68008, m68008_device, "m68008", "M68008") +DEFINE_DEVICE_TYPE(M68008PLCC, m68008plcc_device, "m68008plcc", "M68008PLCC") +DEFINE_DEVICE_TYPE(M68010, m68010_device, "m68010", "M68010") +DEFINE_DEVICE_TYPE(M68EC020, m68ec020_device, "m68ec020", "M68EC020") +DEFINE_DEVICE_TYPE(M68020, m68020_device, "m68020", "M68020") +DEFINE_DEVICE_TYPE(M68020FPU, m68020fpu_device, "m68020fpu", "M68020FPU") +DEFINE_DEVICE_TYPE(M68020PMMU, m68020pmmu_device, "m68020pmmu", "M68020PMMU") +DEFINE_DEVICE_TYPE(M68020HMMU, m68020hmmu_device, "m68020hmmu", "M68020HMMU") +DEFINE_DEVICE_TYPE(M68EC030, m68ec030_device, "m68ec030", "M68EC030") +DEFINE_DEVICE_TYPE(M68030, m68030_device, "m68030", "M68030") +DEFINE_DEVICE_TYPE(M68EC040, m68ec040_device, "m68ec040", "M68EC040") +DEFINE_DEVICE_TYPE(M68LC040, m68lc040_device, "m68lc040", "M68LC040") +DEFINE_DEVICE_TYPE(M68040, m68040_device, "m68040", "M68040") +DEFINE_DEVICE_TYPE(SCC68070, scc68070_device, "scc68070", "SCC68070") +DEFINE_DEVICE_TYPE(FSCPU32, fscpu32_device, "fscpu32", "Freescale CPU32 Core") +DEFINE_DEVICE_TYPE(MCF5206E, mcf5206e_device, "mcf5206e", "MCF5206E") m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, "m68000", __FILE__) + : m68000_device(mconfig, M68000, tag, owner, clock) { } -m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) - : m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, shortname, source) -{ -} - -m68000_device::m68000_device(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) - : m68000_base_device(mconfig, name, tag, owner, clock, type, 16,24, shortname, source) +m68000_device::m68000_device(const machine_config &mconfig, const device_type type, const char *tag, device_t *owner, uint32_t clock) + : m68000_base_device(mconfig, tag, owner, clock, type, 16,24) { } @@ -2534,9 +2529,9 @@ void m68000_device::device_start() init_cpu_m68000(); } -m68000_device::m68000_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) - : m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source) +m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, + const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map) + : m68000_base_device(mconfig, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map) { } @@ -2545,7 +2540,7 @@ m68000_device::m68000_device(const machine_config &mconfig, const char *name, co m68301_device::m68301_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68301", tag, owner, clock, M68301, 16,24, "m68301", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68301, 16,24) { } @@ -2563,7 +2558,7 @@ void m68301_device::device_start() /* m68008_device */ m68008_device::m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68008", tag, owner, clock, M68008, 8,20, "m68008", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68008, 8,20) { } @@ -2574,7 +2569,7 @@ void m68008_device::device_start() m68008plcc_device::m68008plcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68008PLCC", tag, owner, clock, M68008PLCC, 8,22, "m68008plcc", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68008PLCC, 8,22) { } @@ -2586,7 +2581,7 @@ void m68008plcc_device::device_start() m68010_device::m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68010", tag, owner, clock, M68010, 16,24, "m68010", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68010, 16,24) { } @@ -2598,7 +2593,7 @@ void m68010_device::device_start() m68020_device::m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68020", tag, owner, clock, M68020, 32,32, "m68020", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68020, 32,32) { } @@ -2609,7 +2604,7 @@ void m68020_device::device_start() m68020fpu_device::m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68020FPU", tag, owner, clock, M68020FPU, 32,32, "m68020fpu", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68020FPU, 32,32) { } @@ -2620,7 +2615,7 @@ void m68020fpu_device::device_start() // 68020 with 68851 PMMU m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68020PMMU", tag, owner, clock, M68020PMMU, 32,32, "m68020pmmu", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68020PMMU, 32,32) { } @@ -2645,7 +2640,7 @@ bool m68020hmmu_device::memory_translate(address_spacenum space, int intention, // 68020 with Apple HMMU & 68881 FPU // case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m68khmmu); break; m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68020HMMU", tag, owner, clock, M68020HMMU, 32,32, "m68020hmmu", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68020HMMU, 32,32) { } @@ -2656,7 +2651,7 @@ void m68020hmmu_device::device_start() m68ec020_device::m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68EC020", tag, owner, clock, M68EC020, 32,24, "m68ec020", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68EC020, 32,24) { } @@ -2666,7 +2661,7 @@ void m68ec020_device::device_start() } m68030_device::m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68030", tag, owner, clock, M68030, 32,32, "m68030", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68030, 32,32) { } @@ -2676,7 +2671,7 @@ void m68030_device::device_start() } m68ec030_device::m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68EC030", tag, owner, clock, M68EC030, 32,32, "m68ec030", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68EC030, 32,32) { } @@ -2686,7 +2681,7 @@ void m68ec030_device::device_start() } m68040_device::m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68040", tag, owner, clock, M68040, 32,32, "m68040", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68040, 32,32) { } @@ -2699,7 +2694,7 @@ void m68040_device::device_start() m68ec040_device::m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68EC040", tag, owner, clock, M68EC040, 32,32, "m68ec040", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68EC040, 32,32) { } @@ -2711,7 +2706,7 @@ void m68ec040_device::device_start() m68lc040_device::m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "M68LC040", tag, owner, clock, M68LC040, 32,32, "m68lc040", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, M68LC040, 32,32) { } @@ -2722,7 +2717,7 @@ void m68lc040_device::device_start() scc68070_device::scc68070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "SCC68070", tag, owner, clock, SCC68070, 16,32, "scc68070", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, SCC68070, 16,32) { } @@ -2733,13 +2728,13 @@ void scc68070_device::device_start() fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "Freescale CPU32 Core", tag, owner, clock, FSCPU32, 32,32, "fscpu32", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, FSCPU32, 32,32) { } -fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) - : m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source) +fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, + const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map) + : m68000_base_device(mconfig, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map) { } @@ -2752,7 +2747,7 @@ void fscpu32_device::device_start() mcf5206e_device::mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : m68000_base_device(mconfig, "MCF5206E", tag, owner, clock, MCF5206E, 32,32, "mcf5206e", __FILE__) + : m68000_base_device(mconfig, tag, owner, clock, MCF5206E, 32,32) { } |