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/v30mz/v30mz.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/v30mz/v30mz.h')
-rw-r--r-- | src/devices/cpu/v30mz/v30mz.h | 174 |
1 files changed, 87 insertions, 87 deletions
diff --git a/src/devices/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h index 6ba07800b9e..db0e0a3ca22 100644 --- a/src/devices/cpu/v30mz/v30mz.h +++ b/src/devices/cpu/v30mz/v30mz.h @@ -6,7 +6,7 @@ struct nec_config { - const UINT8* v25v35_decryptiontable; // internal decryption table + const uint8_t* v25v35_decryptiontable; // internal decryption table }; enum @@ -26,7 +26,7 @@ class v30mz_cpu_device : public cpu_device { public: // construction/destruction - v30mz_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + v30mz_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: // device-level overrides @@ -34,9 +34,9 @@ protected: virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const override { return 1; } - virtual UINT32 execute_max_cycles() const override { return 80; } - virtual UINT32 execute_input_lines() const override { return 1; } + virtual uint32_t execute_min_cycles() const override { return 1; } + virtual uint32_t execute_max_cycles() const override { return 80; } + virtual uint32_t execute_input_lines() const override { return 1; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -47,50 +47,50 @@ 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 1; } - virtual UINT32 disasm_max_opcode_bytes() const override { return 7; } - 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 7; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; void interrupt(int int_num); - inline UINT32 pc(); + inline uint32_t pc(); // Accessing memory and io - inline UINT8 read_byte(UINT32 addr); - inline UINT16 read_word(UINT32 addr); - inline void write_byte(UINT32 addr, UINT8 data); - inline void write_word(UINT32 addr, UINT16 data); - inline UINT8 read_port(UINT16 port); - inline void write_port(UINT16 port, UINT8 data); + inline uint8_t read_byte(uint32_t addr); + inline uint16_t read_word(uint32_t addr); + inline void write_byte(uint32_t addr, uint8_t data); + inline void write_word(uint32_t addr, uint16_t data); + inline uint8_t read_port(uint16_t port); + inline void write_port(uint16_t port, uint8_t data); // Executing instructions - inline UINT8 fetch_op(); - inline UINT8 fetch(); - inline UINT16 fetch_word(); - inline UINT8 repx_op(); + inline uint8_t fetch_op(); + inline uint8_t fetch(); + inline uint16_t fetch_word(); + inline uint8_t repx_op(); // Cycles passed while executing instructions - inline void CLK(UINT32 cycles); - inline void CLKM(UINT32 cycles_reg, UINT32 cycles_mem); + inline void CLK(uint32_t cycles); + inline void CLKM(uint32_t cycles_reg, uint32_t cycles_mem); // Memory handling while executing instructions - inline UINT32 default_base(int seg); - inline UINT32 get_ea(); - inline void PutbackRMByte(UINT8 data); - inline void PutbackRMWord(UINT16 data); - inline void RegByte(UINT8 data); - inline void RegWord(UINT16 data); - inline UINT8 RegByte(); - inline UINT16 RegWord(); - inline UINT16 GetRMWord(); - inline UINT16 GetnextRMWord(); - inline UINT8 GetRMByte(); - inline void PutMemB(int seg, UINT16 offset, UINT8 data); - inline void PutMemW(int seg, UINT16 offset, UINT16 data); - inline UINT8 GetMemB(int seg, UINT16 offset); - inline UINT16 GetMemW(int seg, UINT16 offset); + inline uint32_t default_base(int seg); + inline uint32_t get_ea(); + inline void PutbackRMByte(uint8_t data); + inline void PutbackRMWord(uint16_t data); + inline void RegByte(uint8_t data); + inline void RegWord(uint16_t data); + inline uint8_t RegByte(); + inline uint16_t RegWord(); + inline uint16_t GetRMWord(); + inline uint16_t GetnextRMWord(); + inline uint8_t GetRMByte(); + inline void PutMemB(int seg, uint16_t offset, uint8_t data); + inline void PutMemW(int seg, uint16_t offset, uint16_t data); + inline uint8_t GetMemB(int seg, uint16_t offset); + inline uint16_t GetMemW(int seg, uint16_t offset); inline void PutImmRMWord(); - inline void PutRMWord(UINT16 val); - inline void PutRMByte(UINT8 val); + inline void PutRMWord(uint16_t val); + inline void PutRMByte(uint8_t val); inline void PutImmRMByte(); inline void DEF_br8(); inline void DEF_wr16(); @@ -100,20 +100,20 @@ protected: inline void DEF_axd16(); // Flags - inline void set_CFB(UINT32 x); - inline void set_CFW(UINT32 x); - inline void set_AF(UINT32 x,UINT32 y,UINT32 z); - inline void set_SF(UINT32 x); - inline void set_ZF(UINT32 x); - inline void set_PF(UINT32 x); - inline void set_SZPF_Byte(UINT32 x); - inline void set_SZPF_Word(UINT32 x); - inline void set_OFW_Add(UINT32 x,UINT32 y,UINT32 z); - inline void set_OFB_Add(UINT32 x,UINT32 y,UINT32 z); - inline void set_OFW_Sub(UINT32 x,UINT32 y,UINT32 z); - inline void set_OFB_Sub(UINT32 x,UINT32 y,UINT32 z); - inline UINT16 CompressFlags() const; - inline void ExpandFlags(UINT16 f); + inline void set_CFB(uint32_t x); + inline void set_CFW(uint32_t x); + inline void set_AF(uint32_t x,uint32_t y,uint32_t z); + inline void set_SF(uint32_t x); + inline void set_ZF(uint32_t x); + inline void set_PF(uint32_t x); + inline void set_SZPF_Byte(uint32_t x); + inline void set_SZPF_Word(uint32_t x); + inline void set_OFW_Add(uint32_t x,uint32_t y,uint32_t z); + inline void set_OFB_Add(uint32_t x,uint32_t y,uint32_t z); + inline void set_OFW_Sub(uint32_t x,uint32_t y,uint32_t z); + inline void set_OFB_Sub(uint32_t x,uint32_t y,uint32_t z); + inline uint16_t CompressFlags() const; + inline void ExpandFlags(uint16_t f); // rep instructions inline void i_insb(); @@ -151,20 +151,20 @@ protected: inline void ROLC_WORD(); inline void RORC_BYTE(); inline void RORC_WORD(); - inline void SHL_BYTE(UINT8 c); - inline void SHL_WORD(UINT8 c); - inline void SHR_BYTE(UINT8 c); - inline void SHR_WORD(UINT8 c); - inline void SHRA_BYTE(UINT8 c); - inline void SHRA_WORD(UINT8 c); - inline void XchgAWReg(UINT8 reg); - inline void IncWordReg(UINT8 reg); - inline void DecWordReg(UINT8 reg); - inline void PUSH(UINT16 data); - inline UINT16 POP(); + inline void SHL_BYTE(uint8_t c); + inline void SHL_WORD(uint8_t c); + inline void SHR_BYTE(uint8_t c); + inline void SHR_WORD(uint8_t c); + inline void SHRA_BYTE(uint8_t c); + inline void SHRA_WORD(uint8_t c); + inline void XchgAWReg(uint8_t reg); + inline void IncWordReg(uint8_t reg); + inline void DecWordReg(uint8_t reg); + inline void PUSH(uint16_t data); + inline uint16_t POP(); inline void JMP(bool cond); - inline void ADJ4(INT8 param1, INT8 param2); - inline void ADJB(INT8 param1, INT8 param2); + inline void ADJ4(int8_t param1, int8_t param2); + inline void ADJB(int8_t param1, int8_t param2); protected: address_space_config m_program_config; @@ -172,44 +172,44 @@ protected: union { /* eight general registers */ - UINT16 w[8]; /* viewed as 16 bits registers */ - UINT8 b[16]; /* or as 8 bit registers */ + uint16_t w[8]; /* viewed as 16 bits registers */ + uint8_t b[16]; /* or as 8 bit registers */ } m_regs; - UINT16 m_sregs[4]; + uint16_t m_sregs[4]; - UINT16 m_ip; + uint16_t m_ip; - INT32 m_SignVal; - UINT32 m_AuxVal, m_OverVal, m_ZeroVal, m_CarryVal, m_ParityVal; /* 0 or non-0 valued flags */ - UINT8 m_TF, m_IF, m_DF, m_MF; /* 0 or 1 valued flags */ /* OB[19.07.99] added Mode Flag V30 */ - UINT32 m_int_vector; - UINT32 m_pending_irq; - UINT32 m_nmi_state; - UINT32 m_irq_state; - UINT8 m_no_interrupt; - UINT8 m_fire_trap; + int32_t m_SignVal; + uint32_t m_AuxVal, m_OverVal, m_ZeroVal, m_CarryVal, m_ParityVal; /* 0 or non-0 valued flags */ + uint8_t m_TF, m_IF, m_DF, m_MF; /* 0 or 1 valued flags */ /* OB[19.07.99] added Mode Flag V30 */ + uint32_t m_int_vector; + uint32_t m_pending_irq; + uint32_t m_nmi_state; + uint32_t m_irq_state; + uint8_t m_no_interrupt; + uint8_t m_fire_trap; address_space *m_program; direct_read_data *m_direct; address_space *m_io; int m_icount; - UINT32 m_prefix_base; /* base address of the latest prefix segment */ + uint32_t m_prefix_base; /* base address of the latest prefix segment */ bool m_seg_prefix; /* prefix segment indicator */ bool m_seg_prefix_next; /* prefix segment for next instruction */ - UINT32 m_ea; - UINT16 m_eo; - UINT16 m_e16; + uint32_t m_ea; + uint16_t m_eo; + uint16_t m_e16; // Used during execution of instructions - UINT8 m_modrm; - UINT32 m_dst; - UINT32 m_src; - UINT32 m_pc; + uint8_t m_modrm; + uint32_t m_dst; + uint32_t m_src; + uint32_t m_pc; // Lookup tables - UINT8 m_parity_table[256]; + uint8_t m_parity_table[256]; struct { struct { int w[256]; |