From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/devices/cpu/m68000/m68kcpu.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/devices/cpu/m68000/m68kcpu.cpp') diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index 851c27163ea..e875b377af3 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -2019,6 +2019,11 @@ std::unique_ptr m68000_device::create_disassembler() return std::make_unique(m68k_disassembler::TYPE_68000); } +std::unique_ptr m68301_device::create_disassembler() +{ + return std::make_unique(m68k_disassembler::TYPE_68000); +} + std::unique_ptr m68008_device::create_disassembler() { return std::make_unique(m68k_disassembler::TYPE_68008); @@ -2357,6 +2362,7 @@ device_memory_interface::space_config_vector m68000_base_device::memory_space_co DEFINE_DEVICE_TYPE(M68000, m68000_device, "m68000", "Motorola MC68000") +DEFINE_DEVICE_TYPE(M68301, m68301_device, "m68301", "Motorola MC68301") DEFINE_DEVICE_TYPE(M68008, m68008_device, "m68008", "Motorola MC68008") DEFINE_DEVICE_TYPE(M68008PLCC, m68008plcc_device, "m68008plcc", "Motorola MC68008PLCC") DEFINE_DEVICE_TYPE(M68010, m68010_device, "m68010", "Motorola MC68010") @@ -2399,6 +2405,21 @@ m68000_device::m68000_device(const machine_config &mconfig, const char *tag, dev +m68301_device::m68301_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : m68000_base_device(mconfig, tag, owner, clock, M68301, 16,24) +{ +} + + +void m68301_device::device_start() +{ + init_cpu_m68000(); +} + + + + + /* m68008_device */ -- cgit v1.2.3-70-g09d2