diff options
Diffstat (limited to 'src/devices/cpu/arm/arm.h')
-rw-r--r-- | src/devices/cpu/arm/arm.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/devices/cpu/arm/arm.h b/src/devices/cpu/arm/arm.h index 27f764e26df..072ae9b7583 100644 --- a/src/devices/cpu/arm/arm.h +++ b/src/devices/cpu/arm/arm.h @@ -41,16 +41,15 @@ protected: ARM32_IR13, ARM32_IR14, ARM32_SR13, ARM32_SR14 }; - arm_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, endianness_t endianness); + arm_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; + virtual void device_start() override ATTR_COLD; + virtual void device_reset() override ATTR_COLD; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 3; } - virtual uint32_t execute_max_cycles() const override { return 4; } - virtual uint32_t execute_input_lines() const override { return 2; } + virtual uint32_t execute_min_cycles() const noexcept override { return 3; } + virtual uint32_t execute_max_cycles() const noexcept override { return 4; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -64,6 +63,7 @@ protected: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; address_space_config m_program_config; + memory_access<26, 2, 0, ENDIANNESS_LITTLE>::cache m_cache; int m_icount; uint32_t m_sArmRegister[27]; @@ -71,8 +71,6 @@ protected: uint8_t m_pendingIrq; uint8_t m_pendingFiq; address_space *m_program; - std::function<u32 (offs_t)> m_pr32; - endianness_t m_endian; copro_type m_copro_type; void cpu_write32( int addr, uint32_t data ); @@ -101,15 +99,6 @@ protected: }; -class arm_be_cpu_device : public arm_cpu_device -{ -public: - // construction/destruction - arm_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); -}; - - -DECLARE_DEVICE_TYPE(ARM, arm_cpu_device) -DECLARE_DEVICE_TYPE(ARM_BE, arm_be_cpu_device) +DECLARE_DEVICE_TYPE(ARM, arm_cpu_device) #endif // MAME_CPU_ARM_ARM_H |