summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/i386/i386.h
diff options
context:
space:
mode:
author yz70s <yz70s@users.noreply.github.com>2018-11-03 11:19:29 +0100
committer yz70s <yz70s@users.noreply.github.com>2018-11-03 11:19:29 +0100
commit65330e1fb737942db17a6ac8e2d131d76cb4bf94 (patch)
tree3e3aa2fa6294a4b0b0eecb9e4296420823e8bc36 /src/devices/cpu/i386/i386.h
parent4f5f5c6c92236a8d1948293bf5129117333f4152 (diff)
i386.cpp: pentium mmx class derives from pentium_device (nw)
Diffstat (limited to 'src/devices/cpu/i386/i386.h')
-rw-r--r--src/devices/cpu/i386/i386.h22
1 files changed, 11 insertions, 11 deletions
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,11 +1547,11 @@ protected:
};
-class mediagx_device : public i386_device
+class pentium_mmx_device : public pentium_device
{
public:
// construction/destruction
- mediagx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
@@ -1559,29 +1559,29 @@ protected:
};
-class pentium_pro_device : public pentium_device
+class mediagx_device : public i386_device
{
public:
// construction/destruction
- pentium_pro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mediagx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
- pentium_pro_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-
- virtual uint64_t opcode_rdmsr(bool &valid_msr) override;
- virtual void opcode_wrmsr(uint64_t data, bool &valid_msr) override;
virtual void device_start() override;
virtual void device_reset() override;
};
-class pentium_mmx_device : public pentium_pro_device
+class pentium_pro_device : public pentium_device
{
public:
// construction/destruction
- pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pentium_pro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
+ pentium_pro_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+ virtual uint64_t opcode_rdmsr(bool &valid_msr) override;
+ virtual void opcode_wrmsr(uint64_t data, bool &valid_msr) override;
virtual void device_start() override;
virtual void device_reset() override;
};
@@ -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)