diff options
Diffstat (limited to 'src/devices/cpu/arm/arm.h')
-rw-r--r-- | src/devices/cpu/arm/arm.h | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/devices/cpu/arm/arm.h b/src/devices/cpu/arm/arm.h index d2f6156127b..051c88f64b9 100644 --- a/src/devices/cpu/arm/arm.h +++ b/src/devices/cpu/arm/arm.h @@ -40,8 +40,8 @@ class arm_cpu_device : public cpu_device { public: // construction/destruction - arm_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - arm_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, endianness_t endianness); + arm_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + arm_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, endianness_t endianness); static void set_copro_type(device_t &device, int type) { downcast<arm_cpu_device &>(device).m_copro_type = type; } @@ -51,9 +51,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const override { return 3; } - virtual UINT32 execute_max_cycles() const override { return 4; } - virtual UINT32 execute_input_lines() const override { return 2; } + 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 void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -64,45 +64,45 @@ protected: virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual uint32_t disasm_min_opcode_bytes() const override { return 4; } + virtual uint32_t disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; address_space_config m_program_config; int m_icount; - UINT32 m_sArmRegister[27]; - UINT32 m_coproRegister[16]; - UINT8 m_pendingIrq; - UINT8 m_pendingFiq; + uint32_t m_sArmRegister[27]; + uint32_t m_coproRegister[16]; + uint8_t m_pendingIrq; + uint8_t m_pendingFiq; address_space *m_program; direct_read_data *m_direct; endianness_t m_endian; - UINT8 m_copro_type; - - void cpu_write32( int addr, UINT32 data ); - void cpu_write8( int addr, UINT8 data ); - UINT32 cpu_read32( int addr ); - UINT8 cpu_read8( int addr ); - UINT32 GetRegister( int rIndex ); - void SetRegister( int rIndex, UINT32 value ); - UINT32 GetModeRegister( int mode, int rIndex ); - void SetModeRegister( int mode, int rIndex, UINT32 value ); - void HandleALU(UINT32 insn); - void HandleMul(UINT32 insn); - void HandleBranch(UINT32 insn); - void HandleMemSingle(UINT32 insn); - void HandleMemBlock(UINT32 insn); - void HandleCoPro(UINT32 insn); - void HandleCoProVL86C020(UINT32 insn); - UINT32 decodeShift(UINT32 insn, UINT32 *pCarry); + uint8_t m_copro_type; + + void cpu_write32( int addr, uint32_t data ); + void cpu_write8( int addr, uint8_t data ); + uint32_t cpu_read32( int addr ); + uint8_t cpu_read8( int addr ); + uint32_t GetRegister( int rIndex ); + void SetRegister( int rIndex, uint32_t value ); + uint32_t GetModeRegister( int mode, int rIndex ); + void SetModeRegister( int mode, int rIndex, uint32_t value ); + void HandleALU(uint32_t insn); + void HandleMul(uint32_t insn); + void HandleBranch(uint32_t insn); + void HandleMemSingle(uint32_t insn); + void HandleMemBlock(uint32_t insn); + void HandleCoPro(uint32_t insn); + void HandleCoProVL86C020(uint32_t insn); + uint32_t decodeShift(uint32_t insn, uint32_t *pCarry); void arm_check_irq_state(); - int loadInc(UINT32 pat, UINT32 rbv, UINT32 s); - int loadDec(UINT32 pat, UINT32 rbv, UINT32 s, UINT32* deferredR15, int* defer); - int storeInc(UINT32 pat, UINT32 rbv); - int storeDec(UINT32 pat, UINT32 rbv); - static UINT32 BCDToDecimal(UINT32 value); - static UINT32 DecimalToBCD(UINT32 value); + int loadInc(uint32_t pat, uint32_t rbv, uint32_t s); + int loadDec(uint32_t pat, uint32_t rbv, uint32_t s, uint32_t* deferredR15, int* defer); + int storeInc(uint32_t pat, uint32_t rbv); + int storeDec(uint32_t pat, uint32_t rbv); + static uint32_t BCDToDecimal(uint32_t value); + static uint32_t DecimalToBCD(uint32_t value); }; @@ -110,10 +110,10 @@ 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 clock); + arm_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; }; |