diff options
Diffstat (limited to 'src/devices/cpu/i386')
-rw-r--r-- | src/devices/cpu/i386/athlon.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/i386/athlon.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/i386/i386.cpp | 30 | ||||
-rw-r--r-- | src/devices/cpu/i386/i386.h | 30 |
4 files changed, 32 insertions, 32 deletions
diff --git a/src/devices/cpu/i386/athlon.cpp b/src/devices/cpu/i386/athlon.cpp index dddfa80fa35..692f0e4d1d1 100644 --- a/src/devices/cpu/i386/athlon.cpp +++ b/src/devices/cpu/i386/athlon.cpp @@ -7,7 +7,7 @@ DEFINE_DEVICE_TYPE(ATHLONXP, athlonxp_device, "athlonxp", "Amd Athlon XP") -athlonxp_device::athlonxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +athlonxp_device::athlonxp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : pentium_device(mconfig, ATHLONXP, tag, owner, clock) , m_data_config("mmio", ENDIANNESS_LITTLE, 32, 32, 0, 32, 12) , m_opcodes_config("debugger", ENDIANNESS_LITTLE, 32, 32, 0, 32, 12) diff --git a/src/devices/cpu/i386/athlon.h b/src/devices/cpu/i386/athlon.h index 69cc6d84794..9c41b90cd2a 100644 --- a/src/devices/cpu/i386/athlon.h +++ b/src/devices/cpu/i386/athlon.h @@ -13,7 +13,7 @@ class athlonxp_device : public pentium_device { public: // construction/destruction - athlonxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + athlonxp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void opcode_cpuid() override; diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp index 152691db3c3..81765619596 100644 --- a/src/devices/cpu/i386/i386.cpp +++ b/src/devices/cpu/i386/i386.cpp @@ -44,13 +44,13 @@ DEFINE_DEVICE_TYPE(PENTIUM3, pentium3_device, "pentium3", "Intel Pentiu DEFINE_DEVICE_TYPE(PENTIUM4, pentium4_device, "pentium4", "Intel Pentium 4") -i386_device::i386_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i386_device::i386_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : i386_device(mconfig, I386, tag, owner, clock, 32, 32, 32) { } -i386_device::i386_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_data_width, int program_addr_width, int io_data_width) +i386_device::i386_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int program_data_width, int program_addr_width, int io_data_width) : cpu_device(mconfig, type, tag, owner, clock) , device_vtlb_interface(mconfig, *this, AS_PROGRAM) , m_program_config("program", ENDIANNESS_LITTLE, program_data_width, program_addr_width, 0, 32, 12) @@ -62,75 +62,75 @@ i386_device::i386_device(const machine_config &mconfig, device_type type, const set_vtlb_dynamic_entries(32); } -i386sx_device::i386sx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i386sx_device::i386sx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : i386_device(mconfig, I386SX, tag, owner, clock, 16, 24, 16) { } -i486_device::i486_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i486_device::i486_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : i486_device(mconfig, I486, tag, owner, clock) { } -i486_device::i486_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +i486_device::i486_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : i386_device(mconfig, type, tag, owner, clock, 32, 32, 32) { } -i486dx4_device::i486dx4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i486dx4_device::i486dx4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : i486_device(mconfig, I486DX4, tag, owner, clock) { } -pentium_device::pentium_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +pentium_device::pentium_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : pentium_device(mconfig, PENTIUM, tag, owner, clock) { } -pentium_device::pentium_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +pentium_device::pentium_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : i386_device(mconfig, type, tag, owner, clock, 32, 32, 32) { // 64 dtlb small, 8 dtlb large, 32 itlb set_vtlb_dynamic_entries(96); } -mediagx_device::mediagx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mediagx_device::mediagx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : i386_device(mconfig, MEDIAGX, tag, owner, clock, 32, 32, 32) { } -pentium_pro_device::pentium_pro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +pentium_pro_device::pentium_pro_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : pentium_pro_device(mconfig, PENTIUM_PRO, tag, owner, clock) { } -pentium_pro_device::pentium_pro_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +pentium_pro_device::pentium_pro_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : pentium_device(mconfig, type, tag, owner, clock) { } -pentium_mmx_device::pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +pentium_mmx_device::pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &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); } -pentium2_device::pentium2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +pentium2_device::pentium2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : pentium_pro_device(mconfig, PENTIUM2, tag, owner, clock) { // 64 dtlb small, 8 dtlb large, 32 itlb small, 2 itlb large set_vtlb_dynamic_entries(96); } -pentium3_device::pentium3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +pentium3_device::pentium3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : pentium_pro_device(mconfig, PENTIUM3, tag, owner, clock) { // 64 dtlb small, 8 dtlb large, 32 itlb small, 2 itlb large set_vtlb_dynamic_entries(96); } -pentium4_device::pentium4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +pentium4_device::pentium4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : pentium_device(mconfig, PENTIUM4, tag, owner, clock) { // 128 dtlb, 64 itlb diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index 60bf5b59b8d..6bb28ee9ff1 100644 --- a/src/devices/cpu/i386/i386.h +++ b/src/devices/cpu/i386/i386.h @@ -29,7 +29,7 @@ class i386_device : public cpu_device, public device_vtlb_interface, public i386 { public: // construction/destruction - i386_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i386_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // configuration helpers auto smiact() { return m_smiact.bind(); } @@ -42,7 +42,7 @@ public: uint64_t debug_cacheflush(int params, const uint64_t *param); protected: - i386_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_data_width, int program_addr_width, int io_data_width); + i386_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int program_data_width, int program_addr_width, int io_data_width); // device-level overrides virtual void device_start() override; @@ -1528,7 +1528,7 @@ class i386sx_device : public i386_device { public: // construction/destruction - i386sx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i386sx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual u8 mem_pr8(offs_t address) override { return macache16.read_byte(address); } @@ -1551,10 +1551,10 @@ class i486_device : public i386_device { public: // construction/destruction - i486_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i486_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - i486_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + i486_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; virtual void device_reset() override; @@ -1564,7 +1564,7 @@ class i486dx4_device : public i486_device { public: // construction/destruction - i486dx4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i486dx4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_reset() override; @@ -1575,10 +1575,10 @@ class pentium_device : public i386_device { public: // construction/destruction - pentium_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + pentium_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - pentium_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + pentium_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return inputnum == INPUT_LINE_NMI || inputnum == INPUT_LINE_SMI; } virtual void execute_set_input(int inputnum, int state) override; @@ -1593,7 +1593,7 @@ 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); + pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; @@ -1605,7 +1605,7 @@ class mediagx_device : public i386_device { public: // construction/destruction - mediagx_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, const XTAL &clock); protected: virtual void device_start() override; @@ -1617,10 +1617,10 @@ class pentium_pro_device : public pentium_device { public: // construction/destruction - pentium_pro_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, const XTAL &clock); protected: - pentium_pro_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + pentium_pro_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual uint64_t opcode_rdmsr(bool &valid_msr) override; virtual void opcode_wrmsr(uint64_t data, bool &valid_msr) override; @@ -1633,7 +1633,7 @@ class pentium2_device : public pentium_pro_device { public: // construction/destruction - pentium2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + pentium2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; @@ -1645,7 +1645,7 @@ class pentium3_device : public pentium_pro_device { public: // construction/destruction - pentium3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + pentium3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; @@ -1659,7 +1659,7 @@ class pentium4_device : public pentium_device { public: // construction/destruction - pentium4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + pentium4_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual uint64_t opcode_rdmsr(bool &valid_msr) override; |