From 65330e1fb737942db17a6ac8e2d131d76cb4bf94 Mon Sep 17 00:00:00 2001 From: yz70s Date: Sat, 3 Nov 2018 11:19:29 +0100 Subject: [PATCH] i386.cpp: pentium mmx class derives from pentium_device (nw) --- src/devices/cpu/i386/i386.cpp | 4 ++-- src/devices/cpu/i386/i386.h | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp index 8d9617507e1..7a86fdc8b4c 100644 --- a/src/devices/cpu/i386/i386.cpp +++ b/src/devices/cpu/i386/i386.cpp @@ -36,9 +36,9 @@ DEFINE_DEVICE_TYPE(I386SX, i386sx_device, "i386sx", "Intel I386SX DEFINE_DEVICE_TYPE(I486, i486_device, "i486", "Intel I486") DEFINE_DEVICE_TYPE(I486DX4, i486dx4_device, "i486dx4", "Intel I486DX4") DEFINE_DEVICE_TYPE(PENTIUM, pentium_device, "pentium", "Intel Pentium") +DEFINE_DEVICE_TYPE(PENTIUM_MMX, pentium_mmx_device, "pentium_mmx", "Intel Pentium MMX") DEFINE_DEVICE_TYPE(MEDIAGX, mediagx_device, "mediagx", "Cyrix MediaGX") DEFINE_DEVICE_TYPE(PENTIUM_PRO, pentium_pro_device, "pentium_pro", "Intel Pentium Pro") -DEFINE_DEVICE_TYPE(PENTIUM_MMX, pentium_mmx_device, "pentium_mmx", "Intel Pentium MMX") DEFINE_DEVICE_TYPE(PENTIUM2, pentium2_device, "pentium2", "Intel Pentium II") DEFINE_DEVICE_TYPE(PENTIUM3, pentium3_device, "pentium3", "Intel Pentium III") DEFINE_DEVICE_TYPE(ATHLONXP, athlonxp_device, "athlonxp", "Amd Athlon XP") @@ -111,7 +111,7 @@ pentium_pro_device::pentium_pro_device(const machine_config &mconfig, device_typ } pentium_mmx_device::pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : pentium_pro_device(mconfig, PENTIUM_MMX, tag, owner, clock) + : pentium_device(mconfig, PENTIUM_MMX, tag, owner, clock) { // 64 dtlb small, 8 dtlb large, 32 itlb small, 2 itlb large set_vtlb_dynamic_entries(96); diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index 340e7a0c256..fe9236167ee 100644 --- a/src/devices/cpu/i386/i386.h +++ b/src/devices/cpu/i386/i386.h @@ -1547,6 +1547,18 @@ protected: }; +class pentium_mmx_device : public pentium_device +{ +public: + // construction/destruction + pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + +protected: + virtual void device_start() override; + virtual void device_reset() override; +}; + + class mediagx_device : public i386_device { public: @@ -1575,18 +1587,6 @@ protected: }; -class pentium_mmx_device : public pentium_pro_device -{ -public: - // construction/destruction - pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - -protected: - virtual void device_start() override; - virtual void device_reset() override; -}; - - class pentium2_device : public pentium_pro_device { public: @@ -1642,9 +1642,9 @@ DECLARE_DEVICE_TYPE(I386SX, i386sx_device) DECLARE_DEVICE_TYPE(I486, i486_device) DECLARE_DEVICE_TYPE(I486DX4, i486dx4_device) DECLARE_DEVICE_TYPE(PENTIUM, pentium_device) +DECLARE_DEVICE_TYPE(PENTIUM_MMX, pentium_mmx_device) DECLARE_DEVICE_TYPE(MEDIAGX, mediagx_device) DECLARE_DEVICE_TYPE(PENTIUM_PRO, pentium_pro_device) -DECLARE_DEVICE_TYPE(PENTIUM_MMX, pentium_mmx_device) DECLARE_DEVICE_TYPE(PENTIUM2, pentium2_device) DECLARE_DEVICE_TYPE(PENTIUM3, pentium3_device) DECLARE_DEVICE_TYPE(ATHLONXP, athlonxp_device)