diff options
author | 2016-10-22 13:13:17 +0200 | |
---|---|---|
committer | 2016-10-22 13:13:17 +0200 | |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/devices/cpu/i8085/i8085.h | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (diff) |
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8
also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/devices/cpu/i8085/i8085.h')
-rw-r--r-- | src/devices/cpu/i8085/i8085.h | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/devices/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h index dfd1b8a9e02..c1e8c33e70b 100644 --- a/src/devices/cpu/i8085/i8085.h +++ b/src/devices/cpu/i8085/i8085.h @@ -53,8 +53,8 @@ class i8085a_cpu_device : public cpu_device { public: // construction/destruction - i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - i8085a_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, int cputype); + i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i8085a_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, int cputype); // static configuration helpers template<class _Object> static devcb_base &set_out_status_func(device_t &device, _Object object) { return downcast<i8085a_cpu_device &>(device).m_out_status_func.set_callback(object); } @@ -68,14 +68,14 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const override { return 4; } - virtual UINT32 execute_max_cycles() const override { return 16; } - virtual UINT32 execute_input_lines() const override { return 4; } - virtual UINT32 execute_default_irq_vector() const override { return 0xff; } + virtual uint32_t execute_min_cycles() const override { return 4; } + virtual uint32_t execute_max_cycles() const override { return 16; } + virtual uint32_t execute_input_lines() const override { return 4; } + virtual uint32_t execute_default_irq_vector() const override { return 0xff; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return (clocks + 2 - 1) / 2; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); } // device_memory_interface overrides virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } @@ -86,9 +86,9 @@ protected: virtual void state_import(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const override { return 3; } - 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 1; } + virtual uint32_t disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; private: address_space_config m_program_config; @@ -101,16 +101,16 @@ private: int m_cputype; /* 0 8080, 1 8085A */ PAIR m_PC,m_SP,m_AF,m_BC,m_DE,m_HL,m_WZ; - UINT8 m_HALT; - UINT8 m_IM; /* interrupt mask (8085A only) */ - UINT8 m_STATUS; /* status word */ + uint8_t m_HALT; + uint8_t m_IM; /* interrupt mask (8085A only) */ + uint8_t m_STATUS; /* status word */ - UINT8 m_after_ei; /* post-EI processing; starts at 2, check for ints at 0 */ - UINT8 m_nmi_state; /* raw NMI line state */ - UINT8 m_irq_state[4]; /* raw IRQ line states */ - UINT8 m_trap_pending; /* TRAP interrupt latched? */ - UINT8 m_trap_im_copy; /* copy of IM register when TRAP was taken */ - UINT8 m_sod_state; /* state of the SOD line */ + uint8_t m_after_ei; /* post-EI processing; starts at 2, check for ints at 0 */ + uint8_t m_nmi_state; /* raw NMI line state */ + uint8_t m_irq_state[4]; /* raw IRQ line states */ + uint8_t m_trap_pending; /* TRAP interrupt latched? */ + uint8_t m_trap_im_copy; /* copy of IM register when TRAP was taken */ + uint8_t m_sod_state; /* state of the SOD line */ bool m_ietemp; /* import/export temp space */ @@ -120,23 +120,23 @@ private: int m_icount; /* cycles lookup */ - static const UINT8 lut_cycles_8080[256]; - static const UINT8 lut_cycles_8085[256]; - UINT8 lut_cycles[256]; + static const uint8_t lut_cycles_8080[256]; + static const uint8_t lut_cycles_8085[256]; + uint8_t lut_cycles[256]; /* flags lookup */ - UINT8 ZS[256]; - UINT8 ZSP[256]; + uint8_t ZS[256]; + uint8_t ZSP[256]; void set_sod(int state); void set_inte(int state); - void set_status(UINT8 status); - UINT8 get_rim_value(); + void set_status(uint8_t status); + uint8_t get_rim_value(); void break_halt_for_interrupt(); - UINT8 ROP(); - UINT8 ARG(); - UINT16 ARG16(); - UINT8 RM(UINT32 a); - void WM(UINT32 a, UINT8 v); + uint8_t ROP(); + uint8_t ARG(); + uint16_t ARG16(); + uint8_t RM(uint32_t a); + void WM(uint32_t a, uint8_t v); void check_for_interrupts(); void execute_one(int opcode); void init_tables(); @@ -148,12 +148,12 @@ class i8080_cpu_device : public i8085a_cpu_device { public: // construction/destruction - i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual UINT32 execute_input_lines() const override { return 1; } - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return clocks; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return cycles; } + virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return clocks; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return cycles; } }; @@ -161,12 +161,12 @@ class i8080a_cpu_device : public i8085a_cpu_device { public: // construction/destruction - i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual UINT32 execute_input_lines() const override { return 1; } - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return clocks; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return cycles; } + virtual uint32_t execute_input_lines() const override { return 1; } + virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return clocks; } + virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return cycles; } }; |