diff options
author | hap <happppp@users.noreply.github.com> | 2017-11-14 18:27:47 +0100 |
---|---|---|
committer | hap <happppp@users.noreply.github.com> | 2017-11-14 18:27:47 +0100 |
commit | c400db56f3dbf4b8a348c2762605e40d85c247b7 (patch) | |
tree | 0a7785cdb5605d526f72605e7ecdea7c8c704fe1 | |
parent | 692859c7ee8d8e3e4d278143eb8a7fc08f4e538c (diff) |
i8085: shorthand variable types (nw)
-rw-r--r-- | src/devices/cpu/i8085/i8085.cpp | 44 | ||||
-rw-r--r-- | src/devices/cpu/i8085/i8085.h | 98 |
2 files changed, 71 insertions, 71 deletions
diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp index ad2999db7f8..9e8bb5122fd 100644 --- a/src/devices/cpu/i8085/i8085.cpp +++ b/src/devices/cpu/i8085/i8085.cpp @@ -149,7 +149,7 @@ constexpr u16 ADDR_INTR = 0x0038; ***************************************************************************/ /* cycles lookup */ -const uint8_t i8085a_cpu_device::lut_cycles_8080[256]={ +const u8 i8085a_cpu_device::lut_cycles_8080[256]={ /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ /* 0 */ 4, 10,7, 5, 5, 5, 7, 4, 4, 10,7, 5, 5, 5, 7, 4, /* 1 */ 4, 10,7, 5, 5, 5, 7, 4, 4, 10,7, 5, 5, 5, 7, 4, @@ -167,7 +167,7 @@ const uint8_t i8085a_cpu_device::lut_cycles_8080[256]={ /* D */ 5, 10,10,10,11,11,7, 11,5, 10,10,10,11,11,7, 11, /* E */ 5, 10,10,18,11,11,7, 11,5, 5, 10,5, 11,11,7, 11, /* F */ 5, 10,10,4, 11,11,7, 11,5, 5, 10,4, 11,11,7, 11 }; -const uint8_t i8085a_cpu_device::lut_cycles_8085[256]={ +const u8 i8085a_cpu_device::lut_cycles_8085[256]={ /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ /* 0 */ 4, 10,7, 6, 4, 4, 7, 4, 10,10,7, 6, 4, 4, 7, 4, /* 1 */ 7, 10,7, 6, 4, 4, 7, 4, 10,10,7, 6, 4, 4, 7, 4, @@ -203,12 +203,12 @@ DEFINE_DEVICE_TYPE(I8080A, i8080a_cpu_device, "i8080a", "8080A") DEFINE_DEVICE_TYPE(I8085A, i8085a_cpu_device, "i8085a", "8085A") -i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : i8085a_cpu_device(mconfig, I8085A, tag, owner, clock, CPUTYPE_8085A) { } -i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int cputype) +i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int cputype) : cpu_device(mconfig, type, tag, owner, clock) , m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0) , m_io_config("io", ENDIANNESS_LITTLE, 8, 8, 0) @@ -220,12 +220,12 @@ i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, device_type { } -i8080_cpu_device::i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i8080_cpu_device::i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : i8085a_cpu_device(mconfig, I8080, tag, owner, clock, CPUTYPE_8080) { } -i8080a_cpu_device::i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +i8080a_cpu_device::i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : i8085a_cpu_device(mconfig, I8080A, tag, owner, clock, CPUTYPE_8080A) { } @@ -288,7 +288,7 @@ void i8085a_cpu_device::set_inte(int state) } -void i8085a_cpu_device::set_status(uint8_t status) +void i8085a_cpu_device::set_status(u8 status) { if (status != m_status) m_out_status_func(status); @@ -297,9 +297,9 @@ void i8085a_cpu_device::set_status(uint8_t status) } -uint8_t i8085a_cpu_device::get_rim_value() +u8 i8085a_cpu_device::get_rim_value() { - uint8_t result = m_im; + u8 result = m_im; int sid = m_in_sid_func(); /* copy live RST5.5 and RST6.5 states */ @@ -313,20 +313,20 @@ uint8_t i8085a_cpu_device::get_rim_value() return result; } -uint8_t i8085a_cpu_device::read_op() +u8 i8085a_cpu_device::read_op() { set_status(0xa2); // instruction fetch return m_direct->read_byte(m_PC.w.l++); } -uint8_t i8085a_cpu_device::read_arg() +u8 i8085a_cpu_device::read_arg() { return m_direct->read_byte(m_PC.w.l++); } -uint16_t i8085a_cpu_device::read_arg16() +u16 i8085a_cpu_device::read_arg16() { - uint16_t w; + u16 w; w = m_direct->read_byte(m_PC.d); m_PC.w.l++; w += m_direct->read_byte(m_PC.d) << 8; @@ -334,13 +334,13 @@ uint16_t i8085a_cpu_device::read_arg16() return w; } -uint8_t i8085a_cpu_device::read_mem(uint32_t a) +u8 i8085a_cpu_device::read_mem(u32 a) { set_status(0x82); // memory read return m_program->read_byte(a); } -void i8085a_cpu_device::write_mem(uint32_t a, uint8_t v) +void i8085a_cpu_device::write_mem(u32 a, u8 v) { set_status(0x00); // memory write m_program->write_byte(a, v); @@ -352,11 +352,11 @@ void i8085a_cpu_device::write_mem(uint32_t a, uint8_t v) /* logical */ #define M_ORA(R) m_AF.b.h|=R; m_AF.b.l=lut_zsp[m_AF.b.h] #define M_XRA(R) m_AF.b.h^=R; m_AF.b.l=lut_zsp[m_AF.b.h] -#define M_ANA(R) {uint8_t hc = ((m_AF.b.h | R)<<1) & HF; m_AF.b.h&=R; m_AF.b.l=lut_zsp[m_AF.b.h]; if(is_8085()) { m_AF.b.l |= HF; } else {m_AF.b.l |= hc; } } +#define M_ANA(R) {u8 hc = ((m_AF.b.h | R)<<1) & HF; m_AF.b.h&=R; m_AF.b.l=lut_zsp[m_AF.b.h]; if(is_8085()) { m_AF.b.l |= HF; } else {m_AF.b.l |= hc; } } /* increase / decrease */ -#define M_INR(R) {uint8_t hc = ((R & 0x0f) == 0x0f) ? HF : 0; ++R; m_AF.b.l= (m_AF.b.l & CF ) | lut_zsp[R] | hc; } -#define M_DCR(R) {uint8_t hc = ((R & 0x0f) != 0x00) ? HF : 0; --R; m_AF.b.l= (m_AF.b.l & CF ) | lut_zsp[R] | hc | VF; } +#define M_INR(R) {u8 hc = ((R & 0x0f) == 0x0f) ? HF : 0; ++R; m_AF.b.l= (m_AF.b.l & CF ) | lut_zsp[R] | hc; } +#define M_DCR(R) {u8 hc = ((R & 0x0f) != 0x00) ? HF : 0; --R; m_AF.b.l= (m_AF.b.l & CF ) | lut_zsp[R] | hc | VF; } /* arithmetic */ #define M_ADD(R) { \ @@ -423,7 +423,7 @@ void i8085a_cpu_device::write_mem(uint32_t a, uint8_t v) { \ if (cc) \ { \ - uint16_t a = read_arg16(); \ + u16 a = read_arg16(); \ m_icount -= (is_8085()) ? 7 : 6 ; \ M_PUSH(PC); \ m_PC.d = a; \ @@ -561,7 +561,7 @@ void i8085a_cpu_device::check_for_interrupts() /* followed by classic INTR */ else if (m_irq_state[I8085_INTR_LINE] && (m_im & IM_IE)) { - uint32_t vector; + u32 vector; /* break out of HALT state and call the IRQ ack callback */ break_halt_for_interrupt(); @@ -1403,7 +1403,7 @@ void i8085a_cpu_device::execute_one(int opcode) void i8085a_cpu_device::init_tables() { - uint8_t zs; + u8 zs; int i, p; for (i = 0; i < 256; i++) { @@ -1602,7 +1602,7 @@ void i8085a_cpu_device::state_string_export(const device_state_entry &entry, std -offs_t i8085a_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t i8085a_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const u8 *oprom, const u8 *opram, u32 options) { extern CPU_DISASSEMBLE( i8085 ); return CPU_DISASSEMBLE_NAME(i8085)(this, stream, pc, oprom, opram, options); diff --git a/src/devices/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h index deef88ec890..d686583cb92 100644 --- a/src/devices/cpu/i8085/i8085.h +++ b/src/devices/cpu/i8085/i8085.h @@ -53,17 +53,17 @@ public: I8085_HALT, I8085_IM }; - static constexpr uint8_t STATUS_INTA = 0x01; - static constexpr uint8_t STATUS_WO = 0x02; - static constexpr uint8_t STATUS_STACK = 0x04; - static constexpr uint8_t STATUS_HLTA = 0x08; - static constexpr uint8_t STATUS_OUT = 0x10; - static constexpr uint8_t STATUS_M1 = 0x20; - static constexpr uint8_t STATUS_INP = 0x40; - static constexpr uint8_t STATUS_MEMR = 0x80; + static constexpr u8 STATUS_INTA = 0x01; + static constexpr u8 STATUS_WO = 0x02; + static constexpr u8 STATUS_STACK = 0x04; + static constexpr u8 STATUS_HLTA = 0x08; + static constexpr u8 STATUS_OUT = 0x10; + static constexpr u8 STATUS_M1 = 0x20; + static constexpr u8 STATUS_INP = 0x40; + static constexpr u8 STATUS_MEMR = 0x80; // construction/destruction - i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i8085a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); // static configuration helpers template <class Object> static devcb_base &set_out_status_func(device_t &device, Object &&cb) { return downcast<i8085a_cpu_device &>(device).m_out_status_func.set_callback(std::forward<Object>(cb)); } @@ -73,7 +73,7 @@ public: static void static_set_clk_out(device_t &device, clock_update_delegate &&clk_out) { downcast<i8085a_cpu_device &>(device).m_clk_out_func = std::move(clk_out); } protected: - i8085a_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int cputype); + i8085a_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int cputype); // device-level overrides virtual void device_config_complete() override; @@ -82,14 +82,14 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - 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 u32 execute_min_cycles() const override { return 4; } + virtual u32 execute_max_cycles() const override { return 16; } + virtual u32 execute_input_lines() const override { return 4; } + virtual u32 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_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); } + virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return (clocks + 2 - 1) / 2; } + virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return (cycles * 2); } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; @@ -100,9 +100,9 @@ protected: virtual void state_import(const device_state_entry &entry) override; // device_disasm_interface overrides - 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(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; + virtual u32 disasm_min_opcode_bytes() const override { return 1; } + virtual u32 disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const u8 *oprom, const u8 *opram, u32 options) override; enum { @@ -126,18 +126,18 @@ private: int m_cputype; PAIR m_PC,m_SP,m_AF,m_BC,m_DE,m_HL,m_WZ; - uint8_t m_halt; - uint8_t m_im; /* interrupt mask (8085A only) */ - uint8_t m_status; /* status word */ + u8 m_halt; + u8 m_im; /* interrupt mask (8085A only) */ + u8 m_status; /* status word */ - 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 */ + u8 m_after_ei; /* post-EI processing; starts at 2, check for ints at 0 */ + u8 m_nmi_state; /* raw NMI line state */ + u8 m_irq_state[4]; /* raw IRQ line states */ + u8 m_trap_pending; /* TRAP interrupt latched? */ + u8 m_trap_im_copy; /* copy of IM register when TRAP was taken */ + u8 m_sod_state; /* state of the SOD line */ - bool m_ietemp; /* import/export temp space */ + bool m_ietemp; /* import/export temp space */ address_space *m_program; direct_read_data *m_direct; @@ -145,23 +145,23 @@ private: int m_icount; /* cycles lookup */ - static const uint8_t lut_cycles_8080[256]; - static const uint8_t lut_cycles_8085[256]; - uint8_t lut_cycles[256]; + static const u8 lut_cycles_8080[256]; + static const u8 lut_cycles_8085[256]; + u8 lut_cycles[256]; /* flags lookup */ - uint8_t lut_zs[256]; - uint8_t lut_zsp[256]; + u8 lut_zs[256]; + u8 lut_zsp[256]; void set_sod(int state); void set_inte(int state); - void set_status(uint8_t status); - uint8_t get_rim_value(); + void set_status(u8 status); + u8 get_rim_value(); void break_halt_for_interrupt(); - uint8_t read_op(); - uint8_t read_arg(); - uint16_t read_arg16(); - uint8_t read_mem(uint32_t a); - void write_mem(uint32_t a, uint8_t v); + u8 read_op(); + u8 read_arg(); + u16 read_arg16(); + u8 read_mem(u32 a); + void write_mem(u32 a, u8 v); void check_for_interrupts(); void execute_one(int opcode); void init_tables(); @@ -172,12 +172,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_t clock); + i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); protected: - 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; } + virtual u32 execute_input_lines() const override { return 1; } + virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return clocks; } + virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return cycles; } }; @@ -185,12 +185,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_t clock); + i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); protected: - 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; } + virtual u32 execute_input_lines() const override { return 1; } + virtual u64 execute_clocks_to_cycles(u64 clocks) const override { return clocks; } + virtual u64 execute_cycles_to_clocks(u64 cycles) const override { return cycles; } }; |