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/minx | |
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/minx')
-rw-r--r-- | src/devices/cpu/minx/minx.cpp | 16 | ||||
-rw-r--r-- | src/devices/cpu/minx/minx.h | 122 | ||||
-rw-r--r-- | src/devices/cpu/minx/minxd.cpp | 14 | ||||
-rw-r--r-- | src/devices/cpu/minx/minxfunc.h | 158 | ||||
-rw-r--r-- | src/devices/cpu/minx/minxopce.h | 66 | ||||
-rw-r--r-- | src/devices/cpu/minx/minxopcf.h | 18 | ||||
-rw-r--r-- | src/devices/cpu/minx/minxops.h | 76 |
7 files changed, 235 insertions, 235 deletions
diff --git a/src/devices/cpu/minx/minx.cpp b/src/devices/cpu/minx/minx.cpp index f5bcc222d1d..4ec4a344371 100644 --- a/src/devices/cpu/minx/minx.cpp +++ b/src/devices/cpu/minx/minx.cpp @@ -75,20 +75,20 @@ TODO: const device_type MINX = &device_creator<minx_cpu_device>; -minx_cpu_device::minx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +minx_cpu_device::minx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cpu_device(mconfig, MINX, "Nintendo Minx", tag, owner, clock, "minx", __FILE__) , m_program_config("program", ENDIANNESS_BIG, 8, 24, 0) { } -UINT16 minx_cpu_device::rd16( UINT32 offset ) +uint16_t minx_cpu_device::rd16( uint32_t offset ) { return RD( offset ) | ( RD( offset + 1 ) << 8 ); } -void minx_cpu_device::wr16( UINT32 offset, UINT16 data ) +void minx_cpu_device::wr16( uint32_t offset, uint16_t data ) { WR( offset, ( data & 0x00FF ) ); WR( offset + 1, ( data >> 8 ) ); @@ -156,17 +156,17 @@ void minx_cpu_device::device_reset() } -UINT8 minx_cpu_device::rdop() +uint8_t minx_cpu_device::rdop() { - UINT8 op = RD( GET_MINX_PC ); + uint8_t op = RD( GET_MINX_PC ); m_PC++; return op; } -UINT16 minx_cpu_device::rdop16() +uint16_t minx_cpu_device::rdop16() { - UINT16 op = rdop(); + uint16_t op = rdop(); op = op | ( rdop() << 8 ); return op; } @@ -228,7 +228,7 @@ void minx_cpu_device::execute_set_input(int inputnum, int state) } -offs_t minx_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) +offs_t minx_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( minx ); return CPU_DISASSEMBLE_NAME(minx)(this, buffer, pc, oprom, opram, options); diff --git a/src/devices/cpu/minx/minx.h b/src/devices/cpu/minx/minx.h index a31db6ab7a0..ca0c18692ff 100644 --- a/src/devices/cpu/minx/minx.h +++ b/src/devices/cpu/minx/minx.h @@ -18,7 +18,7 @@ class minx_cpu_device : public cpu_device { public: // construction/destruction - minx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + minx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: // device-level overrides @@ -26,9 +26,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 4; } - 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 4; } + 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; @@ -39,70 +39,70 @@ 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 5; } - 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 5; } + 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; - UINT16 m_PC; - UINT16 m_SP; - UINT16 m_BA; - UINT16 m_HL; - UINT16 m_X; - UINT16 m_Y; - UINT8 m_U; - UINT8 m_V; - UINT8 m_F; - UINT8 m_E; - UINT8 m_N; - UINT8 m_I; - UINT8 m_XI; - UINT8 m_YI; - UINT8 m_halted; - UINT8 m_interrupt_pending; + uint16_t m_PC; + uint16_t m_SP; + uint16_t m_BA; + uint16_t m_HL; + uint16_t m_X; + uint16_t m_Y; + uint8_t m_U; + uint8_t m_V; + uint8_t m_F; + uint8_t m_E; + uint8_t m_N; + uint8_t m_I; + uint8_t m_XI; + uint8_t m_YI; + uint8_t m_halted; + uint8_t m_interrupt_pending; address_space *m_program; int m_icount; // For debugger - UINT32 m_curpc; - UINT16 m_flags; - - UINT16 rd16( UINT32 offset ); - void wr16( UINT32 offset, UINT16 data ); - UINT8 rdop(); - UINT16 rdop16(); - UINT8 ADD8( UINT8 arg1, UINT8 arg2 ); - UINT16 ADD16( UINT16 arg1, UINT16 arg2 ); - UINT8 ADDC8( UINT8 arg1, UINT8 arg2 ); - UINT16 ADDC16( UINT16 arg1, UINT16 arg2 ); - UINT8 INC8( UINT8 arg ); - UINT16 INC16( UINT16 arg ); - UINT8 SUB8( UINT8 arg1, UINT8 arg2 ); - UINT16 SUB16( UINT16 arg1, UINT16 arg2 ); - UINT8 SUBC8( UINT8 arg1, UINT8 arg2 ); - UINT16 SUBC16( UINT16 arg1, UINT16 arg2 ); - UINT8 DEC8( UINT8 arg ); - UINT16 DEC16( UINT16 arg ); - UINT8 AND8( UINT8 arg1, UINT8 arg2 ); - UINT8 OR8( UINT8 arg1, UINT8 arg2 ); - UINT8 XOR8( UINT8 arg1, UINT8 arg2 ); - UINT8 NOT8( UINT8 arg ); - UINT8 NEG8( UINT8 arg ); - UINT8 SAL8( UINT8 arg ); - UINT8 SAR8( UINT8 arg ); - UINT8 SHL8( UINT8 arg ); - UINT8 SHR8( UINT8 arg ); - UINT8 ROLC8( UINT8 arg ); - UINT8 RORC8( UINT8 arg ); - UINT8 ROL8( UINT8 arg ); - UINT8 ROR8( UINT8 arg ); - void PUSH8( UINT8 arg ); - void PUSH16( UINT16 arg ); - UINT8 POP8(); - UINT16 POP16(); - void JMP( UINT16 arg ); - void CALL( UINT16 arg ); + uint32_t m_curpc; + uint16_t m_flags; + + uint16_t rd16( uint32_t offset ); + void wr16( uint32_t offset, uint16_t data ); + uint8_t rdop(); + uint16_t rdop16(); + uint8_t ADD8( uint8_t arg1, uint8_t arg2 ); + uint16_t ADD16( uint16_t arg1, uint16_t arg2 ); + uint8_t ADDC8( uint8_t arg1, uint8_t arg2 ); + uint16_t ADDC16( uint16_t arg1, uint16_t arg2 ); + uint8_t INC8( uint8_t arg ); + uint16_t INC16( uint16_t arg ); + uint8_t SUB8( uint8_t arg1, uint8_t arg2 ); + uint16_t SUB16( uint16_t arg1, uint16_t arg2 ); + uint8_t SUBC8( uint8_t arg1, uint8_t arg2 ); + uint16_t SUBC16( uint16_t arg1, uint16_t arg2 ); + uint8_t DEC8( uint8_t arg ); + uint16_t DEC16( uint16_t arg ); + uint8_t AND8( uint8_t arg1, uint8_t arg2 ); + uint8_t OR8( uint8_t arg1, uint8_t arg2 ); + uint8_t XOR8( uint8_t arg1, uint8_t arg2 ); + uint8_t NOT8( uint8_t arg ); + uint8_t NEG8( uint8_t arg ); + uint8_t SAL8( uint8_t arg ); + uint8_t SAR8( uint8_t arg ); + uint8_t SHL8( uint8_t arg ); + uint8_t SHR8( uint8_t arg ); + uint8_t ROLC8( uint8_t arg ); + uint8_t RORC8( uint8_t arg ); + uint8_t ROL8( uint8_t arg ); + uint8_t ROR8( uint8_t arg ); + void PUSH8( uint8_t arg ); + void PUSH16( uint16_t arg ); + uint8_t POP8(); + uint16_t POP16(); + void JMP( uint16_t arg ); + void CALL( uint16_t arg ); void execute_one(); void execute_one_ce(); diff --git a/src/devices/cpu/minx/minxd.cpp b/src/devices/cpu/minx/minxd.cpp index 31f4a1f51d7..73001e9ec90 100644 --- a/src/devices/cpu/minx/minxd.cpp +++ b/src/devices/cpu/minx/minxd.cpp @@ -79,7 +79,7 @@ static const char *const s_mnemonic[] = { #define _OVER DASMFLAG_STEP_OVER #define _OUT DASMFLAG_STEP_OUT -static const UINT32 s_flags[] = { +static const uint32_t s_flags[] = { 0, 0, 0, 0, 0, 0, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, _OVER, @@ -94,9 +94,9 @@ static const UINT32 s_flags[] = { }; struct minxdasm { - UINT8 mnemonic; - UINT8 argument1; - UINT8 argument2; + uint8_t mnemonic; + uint8_t argument1; + uint8_t argument2; }; static const minxdasm mnemonic[256] = { @@ -423,9 +423,9 @@ case OP1: dst += sprintf( dst, "%c$%02X", fill, op1 ); break; CPU_DISASSEMBLE( minx ) { const minxdasm *instr; - UINT8 op, op1; - INT8 ofs8; - UINT16 ea; + uint8_t op, op1; + int8_t ofs8; + uint16_t ea; int pos = 0; char *dst = buffer; diff --git a/src/devices/cpu/minx/minxfunc.h b/src/devices/cpu/minx/minxfunc.h index 45478bc6667..adcc2d93641 100644 --- a/src/devices/cpu/minx/minxfunc.h +++ b/src/devices/cpu/minx/minxfunc.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol -UINT8 minx_cpu_device::ADD8( UINT8 arg1, UINT8 arg2 ) +uint8_t minx_cpu_device::ADD8( uint8_t arg1, uint8_t arg2 ) { - UINT32 res = arg1 + arg2; + uint32_t res = arg1 + arg2; m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( ( arg2 ^ arg1 ^ 0x80 ) & ( arg2 ^ res ) & 0x80 ) ? FLAG_O : 0 ) @@ -13,9 +13,9 @@ UINT8 minx_cpu_device::ADD8( UINT8 arg1, UINT8 arg2 ) } -UINT16 minx_cpu_device::ADD16( UINT16 arg1, UINT16 arg2 ) +uint16_t minx_cpu_device::ADD16( uint16_t arg1, uint16_t arg2 ) { - UINT32 res = arg1 + arg2; + uint32_t res = arg1 + arg2; m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x8000 ) ? FLAG_S : 0 ) | ( ( ( arg2 ^ arg1 ^ 0x8000 ) & ( arg2 ^ res ) & 0x8000 ) ? FLAG_O : 0 ) @@ -26,9 +26,9 @@ UINT16 minx_cpu_device::ADD16( UINT16 arg1, UINT16 arg2 ) } -UINT8 minx_cpu_device::ADDC8( UINT8 arg1, UINT8 arg2 ) +uint8_t minx_cpu_device::ADDC8( uint8_t arg1, uint8_t arg2 ) { - UINT32 res = arg1 + arg2 + ( ( m_F & FLAG_C ) ? 1 : 0 ); + uint32_t res = arg1 + arg2 + ( ( m_F & FLAG_C ) ? 1 : 0 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( ( arg2 ^ arg1 ^ 0x80 ) & ( arg2 ^ res ) & 0x80 ) ? FLAG_O : 0 ) @@ -39,9 +39,9 @@ UINT8 minx_cpu_device::ADDC8( UINT8 arg1, UINT8 arg2 ) } -UINT16 minx_cpu_device::ADDC16( UINT16 arg1, UINT16 arg2 ) +uint16_t minx_cpu_device::ADDC16( uint16_t arg1, uint16_t arg2 ) { - UINT32 res = arg1 + arg2 + ( ( m_F & FLAG_C ) ? 1 : 0 ); + uint32_t res = arg1 + arg2 + ( ( m_F & FLAG_C ) ? 1 : 0 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x8000 ) ? FLAG_S : 0 ) | ( ( ( arg2 ^ arg1 ^ 0x8000 ) & ( arg2 ^ res ) & 0x8000 ) ? FLAG_O : 0 ) @@ -52,10 +52,10 @@ UINT16 minx_cpu_device::ADDC16( UINT16 arg1, UINT16 arg2 ) } -UINT8 minx_cpu_device::INC8( UINT8 arg ) +uint8_t minx_cpu_device::INC8( uint8_t arg ) { - UINT8 old_F = m_F; - UINT8 res = ADD8( arg, 1 ); + uint8_t old_F = m_F; + uint8_t res = ADD8( arg, 1 ); m_F = ( old_F & ~ ( FLAG_Z ) ) | ( ( res ) ? 0 : FLAG_Z ) ; @@ -63,10 +63,10 @@ UINT8 minx_cpu_device::INC8( UINT8 arg ) } -UINT16 minx_cpu_device::INC16( UINT16 arg ) +uint16_t minx_cpu_device::INC16( uint16_t arg ) { - UINT8 old_F = m_F; - UINT16 res = ADD16( arg, 1 ); + uint8_t old_F = m_F; + uint16_t res = ADD16( arg, 1 ); m_F = ( old_F & ~ ( FLAG_Z ) ) | ( ( res ) ? 0 : FLAG_Z ) ; @@ -74,9 +74,9 @@ UINT16 minx_cpu_device::INC16( UINT16 arg ) } -UINT8 minx_cpu_device::SUB8( UINT8 arg1, UINT8 arg2 ) +uint8_t minx_cpu_device::SUB8( uint8_t arg1, uint8_t arg2 ) { - UINT32 res = arg1 - arg2; + uint32_t res = arg1 - arg2; m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( ( arg2 ^ arg1 ) & ( arg1 ^ res ) & 0x80 ) ? FLAG_O : 0 ) @@ -87,9 +87,9 @@ UINT8 minx_cpu_device::SUB8( UINT8 arg1, UINT8 arg2 ) } -UINT16 minx_cpu_device::SUB16( UINT16 arg1, UINT16 arg2 ) +uint16_t minx_cpu_device::SUB16( uint16_t arg1, uint16_t arg2 ) { - UINT32 res = arg1 - arg2; + uint32_t res = arg1 - arg2; m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x8000 ) ? FLAG_S : 0 ) | ( ( ( arg2 ^ arg1 ) & ( arg1 ^ res ) & 0x8000 ) ? FLAG_O : 0 ) @@ -100,9 +100,9 @@ UINT16 minx_cpu_device::SUB16( UINT16 arg1, UINT16 arg2 ) } -UINT8 minx_cpu_device::SUBC8( UINT8 arg1, UINT8 arg2 ) +uint8_t minx_cpu_device::SUBC8( uint8_t arg1, uint8_t arg2 ) { - UINT32 res = arg1 - arg2 - ( ( m_F & FLAG_C ) ? 1 : 0 ); + uint32_t res = arg1 - arg2 - ( ( m_F & FLAG_C ) ? 1 : 0 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( ( arg2 ^ arg1 ) & ( arg1 ^ res ) & 0x80 ) ? FLAG_O : 0 ) @@ -113,9 +113,9 @@ UINT8 minx_cpu_device::SUBC8( UINT8 arg1, UINT8 arg2 ) } -UINT16 minx_cpu_device::SUBC16( UINT16 arg1, UINT16 arg2 ) +uint16_t minx_cpu_device::SUBC16( uint16_t arg1, uint16_t arg2 ) { - UINT32 res = arg1 - arg2 - ( ( m_F & FLAG_C ) ? 1 : 0 ); + uint32_t res = arg1 - arg2 - ( ( m_F & FLAG_C ) ? 1 : 0 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x8000 ) ? FLAG_S : 0 ) | ( ( ( arg2 ^ arg1 ) & ( arg1 ^ res ) & 0x8000 ) ? FLAG_O : 0 ) @@ -126,10 +126,10 @@ UINT16 minx_cpu_device::SUBC16( UINT16 arg1, UINT16 arg2 ) } -UINT8 minx_cpu_device::DEC8( UINT8 arg ) +uint8_t minx_cpu_device::DEC8( uint8_t arg ) { - UINT8 old_F = m_F; - UINT8 res = SUB8( arg, 1 ); + uint8_t old_F = m_F; + uint8_t res = SUB8( arg, 1 ); m_F = ( old_F & ~ ( FLAG_Z ) ) | ( ( res ) ? 0 : FLAG_Z ) ; @@ -137,10 +137,10 @@ UINT8 minx_cpu_device::DEC8( UINT8 arg ) } -UINT16 minx_cpu_device::DEC16( UINT16 arg ) +uint16_t minx_cpu_device::DEC16( uint16_t arg ) { - UINT8 old_F = m_F; - UINT16 res = SUB16( arg, 1 ); + uint8_t old_F = m_F; + uint16_t res = SUB16( arg, 1 ); m_F = ( old_F & ~ ( FLAG_Z ) ) | ( ( res ) ? 0 : FLAG_Z ) ; @@ -148,9 +148,9 @@ UINT16 minx_cpu_device::DEC16( UINT16 arg ) } -UINT8 minx_cpu_device::AND8( UINT8 arg1, UINT8 arg2 ) +uint8_t minx_cpu_device::AND8( uint8_t arg1, uint8_t arg2 ) { - UINT8 res = arg1 & arg2; + uint8_t res = arg1 & arg2; m_F = ( m_F & ~ ( FLAG_S | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( res ) ? 0 : FLAG_Z ) @@ -159,9 +159,9 @@ UINT8 minx_cpu_device::AND8( UINT8 arg1, UINT8 arg2 ) } -UINT8 minx_cpu_device::OR8( UINT8 arg1, UINT8 arg2 ) +uint8_t minx_cpu_device::OR8( uint8_t arg1, uint8_t arg2 ) { - UINT8 res = arg1 | arg2; + uint8_t res = arg1 | arg2; m_F = ( m_F & ~ ( FLAG_S | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( res ) ? 0 : FLAG_Z ) @@ -170,9 +170,9 @@ UINT8 minx_cpu_device::OR8( UINT8 arg1, UINT8 arg2 ) } -UINT8 minx_cpu_device::XOR8( UINT8 arg1, UINT8 arg2 ) +uint8_t minx_cpu_device::XOR8( uint8_t arg1, uint8_t arg2 ) { - UINT8 res = arg1 ^ arg2; + uint8_t res = arg1 ^ arg2; m_F = ( m_F & ~ ( FLAG_S | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( res ) ? 0 : FLAG_Z ) @@ -181,9 +181,9 @@ UINT8 minx_cpu_device::XOR8( UINT8 arg1, UINT8 arg2 ) } -UINT8 minx_cpu_device::NOT8( UINT8 arg ) +uint8_t minx_cpu_device::NOT8( uint8_t arg ) { - UINT8 res = ~arg; + uint8_t res = ~arg; m_F = ( m_F & ~ ( FLAG_S | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( res ) ? 0 : FLAG_Z ) @@ -192,9 +192,9 @@ UINT8 minx_cpu_device::NOT8( UINT8 arg ) } -UINT8 minx_cpu_device::NEG8( UINT8 arg ) +uint8_t minx_cpu_device::NEG8( uint8_t arg ) { - UINT8 res = -arg; + uint8_t res = -arg; m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( res ) ? 0 : FLAG_Z ) @@ -203,9 +203,9 @@ UINT8 minx_cpu_device::NEG8( UINT8 arg ) } -UINT8 minx_cpu_device::SAL8( UINT8 arg ) +uint8_t minx_cpu_device::SAL8( uint8_t arg ) { - UINT16 res = arg << 1; + uint16_t res = arg << 1; m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( arg != 0 && res == 0 ) ? FLAG_O : 0 ) @@ -216,9 +216,9 @@ UINT8 minx_cpu_device::SAL8( UINT8 arg ) } -UINT8 minx_cpu_device::SAR8( UINT8 arg ) +uint8_t minx_cpu_device::SAR8( uint8_t arg ) { - UINT16 res = ( arg >> 1 ) | ( arg & 0x80 ); + uint16_t res = ( arg >> 1 ) | ( arg & 0x80 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_O | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( arg != 0x80 && res == 0x80 ) ? FLAG_O : 0 ) @@ -229,9 +229,9 @@ UINT8 minx_cpu_device::SAR8( UINT8 arg ) } -UINT8 minx_cpu_device::SHL8( UINT8 arg ) +uint8_t minx_cpu_device::SHL8( uint8_t arg ) { - UINT16 res = arg << 1; + uint16_t res = arg << 1; m_F = ( m_F & ~ ( FLAG_S | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( arg & 0x80 ) ? FLAG_C : 0 ) @@ -241,9 +241,9 @@ UINT8 minx_cpu_device::SHL8( UINT8 arg ) } -UINT8 minx_cpu_device::SHR8( UINT8 arg ) +uint8_t minx_cpu_device::SHR8( uint8_t arg ) { - UINT16 res = arg >> 1; + uint16_t res = arg >> 1; m_F = ( m_F & ~ ( FLAG_S | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( arg & 0x01 ) ? FLAG_C : 0 ) @@ -253,9 +253,9 @@ UINT8 minx_cpu_device::SHR8( UINT8 arg ) } -UINT8 minx_cpu_device::ROLC8( UINT8 arg ) +uint8_t minx_cpu_device::ROLC8( uint8_t arg ) { - UINT16 res = ( arg << 1 ) | ( ( m_F & FLAG_C ) ? 1 : 0 ); + uint16_t res = ( arg << 1 ) | ( ( m_F & FLAG_C ) ? 1 : 0 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( arg & 0x80 ) ? FLAG_C : 0 ) @@ -265,9 +265,9 @@ UINT8 minx_cpu_device::ROLC8( UINT8 arg ) } -UINT8 minx_cpu_device::RORC8( UINT8 arg ) +uint8_t minx_cpu_device::RORC8( uint8_t arg ) { - UINT16 res = ( arg >> 1 ) | ( ( m_F & FLAG_C ) ? 0x80 : 0 ); + uint16_t res = ( arg >> 1 ) | ( ( m_F & FLAG_C ) ? 0x80 : 0 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( arg & 0x01 ) ? FLAG_C : 0 ) @@ -277,9 +277,9 @@ UINT8 minx_cpu_device::RORC8( UINT8 arg ) } -UINT8 minx_cpu_device::ROL8( UINT8 arg ) +uint8_t minx_cpu_device::ROL8( uint8_t arg ) { - UINT16 res = ( arg << 1 ) | ( ( arg & 0x80 ) ? 1 : 0 ); + uint16_t res = ( arg << 1 ) | ( ( arg & 0x80 ) ? 1 : 0 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( arg & 0x80 ) ? FLAG_C : 0 ) @@ -289,9 +289,9 @@ UINT8 minx_cpu_device::ROL8( UINT8 arg ) } -UINT8 minx_cpu_device::ROR8( UINT8 arg ) +uint8_t minx_cpu_device::ROR8( uint8_t arg ) { - UINT16 res = ( arg >> 1 ) | ( ( arg & 0x01 ) ? 0x80 : 0 ); + uint16_t res = ( arg >> 1 ) | ( ( arg & 0x01 ) ? 0x80 : 0 ); m_F = ( m_F & ~ ( FLAG_S | FLAG_C | FLAG_Z ) ) | ( ( res & 0x80 ) ? FLAG_S : 0 ) | ( ( arg & 0x01 ) ? FLAG_C : 0 ) @@ -301,42 +301,42 @@ UINT8 minx_cpu_device::ROR8( UINT8 arg ) } -void minx_cpu_device::PUSH8( UINT8 arg ) +void minx_cpu_device::PUSH8( uint8_t arg ) { m_SP = m_SP - 1; WR( m_SP, arg ); } -void minx_cpu_device::PUSH16( UINT16 arg ) +void minx_cpu_device::PUSH16( uint16_t arg ) { PUSH8( arg >> 8 ); PUSH8( arg & 0x00FF ); } -UINT8 minx_cpu_device::POP8() +uint8_t minx_cpu_device::POP8() { - UINT8 res = RD( m_SP ); + uint8_t res = RD( m_SP ); m_SP = m_SP + 1; return res; } -UINT16 minx_cpu_device::POP16() +uint16_t minx_cpu_device::POP16() { return POP8() | ( POP8() << 8 ); } -void minx_cpu_device::JMP( UINT16 arg ) +void minx_cpu_device::JMP( uint16_t arg ) { m_V = m_U; m_PC = arg; } -void minx_cpu_device::CALL( UINT16 arg ) +void minx_cpu_device::CALL( uint16_t arg ) { PUSH8( m_V ); PUSH16( m_PC ); @@ -344,21 +344,21 @@ void minx_cpu_device::CALL( UINT16 arg ) } -#define AD1_IHL UINT32 addr1 = ( m_I << 16 ) | m_HL -#define AD1_IN8 UINT32 addr1 = ( m_I << 16 ) | ( m_N << 8 ) | rdop() -#define AD1_I16 UINT32 addr1 = ( m_I << 16 ) | rdop16() -#define AD1_XIX UINT32 addr1 = ( m_XI << 16 ) | m_X -#define AD1_YIY UINT32 addr1 = ( m_YI << 16 ) | m_Y -#define AD1_X8 UINT32 addr1 = ( m_XI << 16 ) | ( m_X + rdop() ) -#define AD1_Y8 UINT32 addr1 = ( m_YI << 16 ) | ( m_Y + rdop() ) -#define AD1_XL UINT32 addr1 = ( m_XI << 16 ) | ( m_X + ( m_HL & 0x00FF ) ) -#define AD1_YL UINT32 addr1 = ( m_YI << 16 ) | ( m_Y + ( m_HL & 0x00FF ) ) -#define AD2_IHL UINT32 addr2 = ( m_I << 16 ) | m_HL -#define AD2_IN8 UINT32 addr2 = ( m_I << 16 ) | ( m_N << 8 ) | rdop() -#define AD2_I16 UINT32 addr2 = ( m_I << 16 ) | rdop(); addr2 |= ( rdop() << 8 ) -#define AD2_XIX UINT32 addr2 = ( m_XI << 16 ) | m_X -#define AD2_YIY UINT32 addr2 = ( m_YI << 16 ) | m_Y -#define AD2_X8 UINT32 addr2 = ( m_XI << 16 ) | ( m_X + rdop() ) -#define AD2_Y8 UINT32 addr2 = ( m_YI << 16 ) | ( m_Y + rdop() ) -#define AD2_XL UINT32 addr2 = ( m_XI << 16 ) | ( m_X + ( m_HL & 0x00FF ) ) -#define AD2_YL UINT32 addr2 = ( m_YI << 16 ) | ( m_Y + ( m_HL & 0x00FF ) ) +#define AD1_IHL uint32_t addr1 = ( m_I << 16 ) | m_HL +#define AD1_IN8 uint32_t addr1 = ( m_I << 16 ) | ( m_N << 8 ) | rdop() +#define AD1_I16 uint32_t addr1 = ( m_I << 16 ) | rdop16() +#define AD1_XIX uint32_t addr1 = ( m_XI << 16 ) | m_X +#define AD1_YIY uint32_t addr1 = ( m_YI << 16 ) | m_Y +#define AD1_X8 uint32_t addr1 = ( m_XI << 16 ) | ( m_X + rdop() ) +#define AD1_Y8 uint32_t addr1 = ( m_YI << 16 ) | ( m_Y + rdop() ) +#define AD1_XL uint32_t addr1 = ( m_XI << 16 ) | ( m_X + ( m_HL & 0x00FF ) ) +#define AD1_YL uint32_t addr1 = ( m_YI << 16 ) | ( m_Y + ( m_HL & 0x00FF ) ) +#define AD2_IHL uint32_t addr2 = ( m_I << 16 ) | m_HL +#define AD2_IN8 uint32_t addr2 = ( m_I << 16 ) | ( m_N << 8 ) | rdop() +#define AD2_I16 uint32_t addr2 = ( m_I << 16 ) | rdop(); addr2 |= ( rdop() << 8 ) +#define AD2_XIX uint32_t addr2 = ( m_XI << 16 ) | m_X +#define AD2_YIY uint32_t addr2 = ( m_YI << 16 ) | m_Y +#define AD2_X8 uint32_t addr2 = ( m_XI << 16 ) | ( m_X + rdop() ) +#define AD2_Y8 uint32_t addr2 = ( m_YI << 16 ) | ( m_Y + rdop() ) +#define AD2_XL uint32_t addr2 = ( m_XI << 16 ) | ( m_X + ( m_HL & 0x00FF ) ) +#define AD2_YL uint32_t addr2 = ( m_YI << 16 ) | ( m_Y + ( m_HL & 0x00FF ) ) diff --git a/src/devices/cpu/minx/minxopce.h b/src/devices/cpu/minx/minxopce.h index ec0198273e3..2d44decf802 100644 --- a/src/devices/cpu/minx/minxopce.h +++ b/src/devices/cpu/minx/minxopce.h @@ -3,7 +3,7 @@ void minx_cpu_device::execute_one_ce() { - const UINT8 opcode = rdop(); + const uint8_t opcode = rdop(); switch (opcode) { @@ -469,70 +469,70 @@ void minx_cpu_device::execute_one_ce() case 0xDF: { /* illegal operation? */ } break; - case 0xE0: { INT8 d8 = rdop(); if ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_S ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_O ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE0: { int8_t d8 = rdop(); if ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_S ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_O ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE1: { INT8 d8 = rdop(); if ( ( m_F & FLAG_Z ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_S ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_O ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE1: { int8_t d8 = rdop(); if ( ( m_F & FLAG_Z ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_S ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_O ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE2: { INT8 d8 = rdop(); if ( !( m_F & FLAG_Z ) && ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == 0 ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == ( FLAG_S | FLAG_O ) ) ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE2: { int8_t d8 = rdop(); if ( !( m_F & FLAG_Z ) && ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == 0 ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == ( FLAG_S | FLAG_O ) ) ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE3: { INT8 d8 = rdop(); if ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == 0 ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == ( FLAG_S | FLAG_O ) ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE3: { int8_t d8 = rdop(); if ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == 0 ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == ( FLAG_S | FLAG_O ) ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE4: { INT8 d8 = rdop(); if ( ( m_F & FLAG_O ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE4: { int8_t d8 = rdop(); if ( ( m_F & FLAG_O ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE5: { INT8 d8 = rdop(); if ( ! ( m_F & FLAG_O ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE5: { int8_t d8 = rdop(); if ( ! ( m_F & FLAG_O ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE6: { INT8 d8 = rdop(); if ( ! ( m_F & FLAG_S ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE6: { int8_t d8 = rdop(); if ( ! ( m_F & FLAG_S ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE7: { INT8 d8 = rdop(); if ( ( m_F & FLAG_S ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE7: { int8_t d8 = rdop(); if ( ( m_F & FLAG_S ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE8: { INT8 d8 = rdop(); if ( ! ( m_E & EXEC_X0 ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE8: { int8_t d8 = rdop(); if ( ! ( m_E & EXEC_X0 ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE9: { INT8 d8 = rdop(); if ( ! ( m_E & EXEC_X1 ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE9: { int8_t d8 = rdop(); if ( ! ( m_E & EXEC_X1 ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xEA: { INT8 d8 = rdop(); if ( ! ( m_E & EXEC_X2 ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xEA: { int8_t d8 = rdop(); if ( ! ( m_E & EXEC_X2 ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xEB: { INT8 d8 = rdop(); if ( ! ( m_E & EXEC_DZ ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xEB: { int8_t d8 = rdop(); if ( ! ( m_E & EXEC_DZ ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xEC: { INT8 d8 = rdop(); if ( ( m_E & EXEC_X0 ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xEC: { int8_t d8 = rdop(); if ( ( m_E & EXEC_X0 ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xED: { INT8 d8 = rdop(); if ( ( m_E & EXEC_X1 ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xED: { int8_t d8 = rdop(); if ( ( m_E & EXEC_X1 ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xEE: { INT8 d8 = rdop(); if ( ( m_E & EXEC_X2 ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xEE: { int8_t d8 = rdop(); if ( ( m_E & EXEC_X2 ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xEF: { INT8 d8 = rdop(); if ( ( m_E & EXEC_DZ ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xEF: { int8_t d8 = rdop(); if ( ( m_E & EXEC_DZ ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xF0: { INT8 d8 = rdop(); if ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_S ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_O ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF0: { int8_t d8 = rdop(); if ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_S ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_O ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xF1: { INT8 d8 = rdop(); if ( ( m_F & FLAG_Z ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_S ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_O ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF1: { int8_t d8 = rdop(); if ( ( m_F & FLAG_Z ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_S ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == FLAG_O ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xF2: { INT8 d8 = rdop(); if ( !( m_F & FLAG_Z ) && ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == 0 ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == ( FLAG_S | FLAG_O ) ) ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF2: { int8_t d8 = rdop(); if ( !( m_F & FLAG_Z ) && ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == 0 ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == ( FLAG_S | FLAG_O ) ) ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xF3: { INT8 d8 = rdop(); if ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == 0 ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == ( FLAG_S | FLAG_O ) ) ) { CALL( m_PC + d8 - 1 ); } } + case 0xF3: { int8_t d8 = rdop(); if ( ( ( m_F & ( FLAG_S | FLAG_O ) ) == 0 ) || ( ( m_F & ( FLAG_S | FLAG_O ) ) == ( FLAG_S | FLAG_O ) ) ) { CALL( m_PC + d8 - 1 ); } } break; - case 0xF4: { INT8 d8 = rdop(); if ( ( m_F & FLAG_O ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF4: { int8_t d8 = rdop(); if ( ( m_F & FLAG_O ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xF5: { INT8 d8 = rdop(); if ( ! ( m_F & FLAG_O ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF5: { int8_t d8 = rdop(); if ( ! ( m_F & FLAG_O ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xF6: { INT8 d8 = rdop(); if ( ! ( m_F & FLAG_S ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF6: { int8_t d8 = rdop(); if ( ! ( m_F & FLAG_S ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xF7: { INT8 d8 = rdop(); if ( ( m_F & FLAG_S ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF7: { int8_t d8 = rdop(); if ( ( m_F & FLAG_S ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xF8: { INT8 d8 = rdop(); if ( ! ( m_E & EXEC_X0 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF8: { int8_t d8 = rdop(); if ( ! ( m_E & EXEC_X0 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xF9: { INT8 d8 = rdop(); if ( ! ( m_E & EXEC_X1 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xF9: { int8_t d8 = rdop(); if ( ! ( m_E & EXEC_X1 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xFA: { INT8 d8 = rdop(); if ( ! ( m_E & EXEC_X2 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xFA: { int8_t d8 = rdop(); if ( ! ( m_E & EXEC_X2 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xFB: { INT8 d8 = rdop(); if ( ! ( m_E & EXEC_DZ ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xFB: { int8_t d8 = rdop(); if ( ! ( m_E & EXEC_DZ ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xFC: { INT8 d8 = rdop(); if ( ( m_E & EXEC_X0 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xFC: { int8_t d8 = rdop(); if ( ( m_E & EXEC_X0 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xFD: { INT8 d8 = rdop(); if ( ( m_E & EXEC_X1 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xFD: { int8_t d8 = rdop(); if ( ( m_E & EXEC_X1 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xFE: { INT8 d8 = rdop(); if ( ( m_E & EXEC_X2 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xFE: { int8_t d8 = rdop(); if ( ( m_E & EXEC_X2 ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xFF: { INT8 d8 = rdop(); if ( ( m_E & EXEC_DZ ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xFF: { int8_t d8 = rdop(); if ( ( m_E & EXEC_DZ ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; } diff --git a/src/devices/cpu/minx/minxopcf.h b/src/devices/cpu/minx/minxopcf.h index f81d991304a..adaf357784a 100644 --- a/src/devices/cpu/minx/minxopcf.h +++ b/src/devices/cpu/minx/minxopcf.h @@ -3,7 +3,7 @@ void minx_cpu_device::execute_one_cf() { - const UINT8 opcode = rdop(); + const uint8_t opcode = rdop(); switch (opcode) { @@ -238,21 +238,21 @@ void minx_cpu_device::execute_one_cf() case 0x6F: { /* illegal instruction? */ } break; - case 0x70: { UINT8 ofs8 = rdop(); m_BA = rd16( m_SP + ofs8 ); } + case 0x70: { uint8_t ofs8 = rdop(); m_BA = rd16( m_SP + ofs8 ); } break; - case 0x71: { UINT8 ofs8 = rdop(); m_HL = rd16( m_SP + ofs8 ); } + case 0x71: { uint8_t ofs8 = rdop(); m_HL = rd16( m_SP + ofs8 ); } break; - case 0x72: { UINT8 ofs8 = rdop(); m_X = rd16( m_SP + ofs8 ); } + case 0x72: { uint8_t ofs8 = rdop(); m_X = rd16( m_SP + ofs8 ); } break; - case 0x73: { UINT8 ofs8 = rdop(); m_Y = rd16( m_SP + ofs8 ); } + case 0x73: { uint8_t ofs8 = rdop(); m_Y = rd16( m_SP + ofs8 ); } break; - case 0x74: { UINT8 ofs8 = rdop(); wr16( m_SP + ofs8, m_BA ); } + case 0x74: { uint8_t ofs8 = rdop(); wr16( m_SP + ofs8, m_BA ); } break; - case 0x75: { UINT8 ofs8 = rdop(); wr16( m_SP + ofs8, m_HL ); } + case 0x75: { uint8_t ofs8 = rdop(); wr16( m_SP + ofs8, m_HL ); } break; - case 0x76: { UINT8 ofs8 = rdop(); wr16( m_SP + ofs8, m_X ); } + case 0x76: { uint8_t ofs8 = rdop(); wr16( m_SP + ofs8, m_X ); } break; - case 0x77: { UINT8 ofs8 = rdop(); wr16( m_SP + ofs8, m_Y ); } + case 0x77: { uint8_t ofs8 = rdop(); wr16( m_SP + ofs8, m_Y ); } break; case 0x78: { AD2_I16; m_SP = rd16( addr2 ); } break; diff --git a/src/devices/cpu/minx/minxops.h b/src/devices/cpu/minx/minxops.h index b19e733deb2..9a5829d3841 100644 --- a/src/devices/cpu/minx/minxops.h +++ b/src/devices/cpu/minx/minxops.h @@ -3,7 +3,7 @@ void minx_cpu_device::execute_one() { - const UINT8 opcode = rdop(); + const uint8_t opcode = rdop(); switch (opcode) { @@ -370,21 +370,21 @@ void minx_cpu_device::execute_one() case 0xAF: { m_F = POP8(); } break; - case 0xB0: { UINT8 op = rdop(); m_BA = ( m_BA & 0xFF00 ) | op; } + case 0xB0: { uint8_t op = rdop(); m_BA = ( m_BA & 0xFF00 ) | op; } break; - case 0xB1: { UINT8 op = rdop(); m_BA = ( m_BA & 0x00FF ) | ( op << 8 ); } + case 0xB1: { uint8_t op = rdop(); m_BA = ( m_BA & 0x00FF ) | ( op << 8 ); } break; - case 0xB2: { UINT8 op = rdop(); m_HL = ( m_HL & 0xFF00 ) | op; } + case 0xB2: { uint8_t op = rdop(); m_HL = ( m_HL & 0xFF00 ) | op; } break; - case 0xB3: { UINT8 op = rdop(); m_HL = ( m_HL & 0x00FF ) | ( op << 8 ); } + case 0xB3: { uint8_t op = rdop(); m_HL = ( m_HL & 0x00FF ) | ( op << 8 ); } break; - case 0xB4: { UINT8 op = rdop(); m_N = op; } + case 0xB4: { uint8_t op = rdop(); m_N = op; } break; - case 0xB5: { AD1_IHL; UINT8 op = rdop(); WR( addr1, op); } + case 0xB5: { AD1_IHL; uint8_t op = rdop(); WR( addr1, op); } break; - case 0xB6: { AD1_XIX; UINT8 op = rdop(); WR( addr1, op ); } + case 0xB6: { AD1_XIX; uint8_t op = rdop(); WR( addr1, op ); } break; - case 0xB7: { AD1_YIY; UINT8 op = rdop(); WR( addr1, op ); } + case 0xB7: { AD1_YIY; uint8_t op = rdop(); WR( addr1, op ); } break; case 0xB8: { AD2_I16; m_BA = rd16( addr2 ); } break; @@ -419,17 +419,17 @@ void minx_cpu_device::execute_one() break; case 0xC7: { m_Y = rdop16(); } break; - case 0xC8: { UINT16 t = m_BA; m_BA = m_HL; m_HL = t; } + case 0xC8: { uint16_t t = m_BA; m_BA = m_HL; m_HL = t; } break; - case 0xC9: { UINT16 t = m_BA; m_BA = m_X; m_X = t; } + case 0xC9: { uint16_t t = m_BA; m_BA = m_X; m_X = t; } break; - case 0xCA: { UINT16 t = m_BA; m_BA = m_Y; m_Y = t; } + case 0xCA: { uint16_t t = m_BA; m_BA = m_Y; m_Y = t; } break; - case 0xCB: { UINT16 t = m_BA; m_BA = m_SP; m_SP = t; } + case 0xCB: { uint16_t t = m_BA; m_BA = m_SP; m_SP = t; } break; case 0xCC: { m_BA = ( m_BA >> 8 ) | ( ( m_BA & 0x00FF ) << 8 ); } break; - case 0xCD: { UINT8 t; AD2_IHL; t = RD( addr2 ); WR( addr2, ( m_BA & 0x00FF ) ); m_BA = ( m_BA & 0xFF00 ) | t; } + case 0xCD: { uint8_t t; AD2_IHL; t = RD( addr2 ); WR( addr2, ( m_BA & 0x00FF ) ); m_BA = ( m_BA & 0xFF00 ) | t; } break; case 0xCE: { execute_one_ce(); } break; @@ -469,54 +469,54 @@ void minx_cpu_device::execute_one() case 0xDF: { m_BA = ( ( m_BA & 0x0080 ) ? 0xFF00 : 0x0000 ) | ( m_BA & 0x000F ); } break; - case 0xE0: { INT8 d8 = rdop(); if ( m_F & FLAG_C ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xE0: { int8_t d8 = rdop(); if ( m_F & FLAG_C ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xE1: { INT8 d8 = rdop(); if ( ! ( m_F & FLAG_C ) ) { CALL( m_PC + d8- 1 ); m_icount -= 12; } } + case 0xE1: { int8_t d8 = rdop(); if ( ! ( m_F & FLAG_C ) ) { CALL( m_PC + d8- 1 ); m_icount -= 12; } } break; - case 0xE2: { INT8 d8 = rdop(); if ( m_F & FLAG_Z ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xE2: { int8_t d8 = rdop(); if ( m_F & FLAG_Z ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xE3: { INT8 d8 = rdop(); if ( ! ( m_F & FLAG_Z ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } + case 0xE3: { int8_t d8 = rdop(); if ( ! ( m_F & FLAG_Z ) ) { CALL( m_PC + d8 - 1 ); m_icount -= 12; } } break; - case 0xE4: { INT8 d8 = rdop(); if ( m_F & FLAG_C ) { JMP( m_PC + d8 - 1 ); } } + case 0xE4: { int8_t d8 = rdop(); if ( m_F & FLAG_C ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE5: { INT8 d8 = rdop(); if ( ! ( m_F & FLAG_C ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE5: { int8_t d8 = rdop(); if ( ! ( m_F & FLAG_C ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE6: { INT8 d8 = rdop(); if ( m_F & FLAG_Z ) { JMP( m_PC + d8 - 1 ); } } + case 0xE6: { int8_t d8 = rdop(); if ( m_F & FLAG_Z ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE7: { INT8 d8 = rdop(); if ( ! ( m_F & FLAG_Z ) ) { JMP( m_PC + d8 - 1 ); } } + case 0xE7: { int8_t d8 = rdop(); if ( ! ( m_F & FLAG_Z ) ) { JMP( m_PC + d8 - 1 ); } } break; - case 0xE8: { UINT16 d16 = rdop16(); if ( m_F & FLAG_C ) { CALL( m_PC + d16 - 1 ); m_icount -= 12; } } + case 0xE8: { uint16_t d16 = rdop16(); if ( m_F & FLAG_C ) { CALL( m_PC + d16 - 1 ); m_icount -= 12; } } break; - case 0xE9: { UINT16 d16 = rdop16(); if ( ! ( m_F & FLAG_C ) ) { CALL( m_PC + d16 - 1 ); m_icount -= 12; } } + case 0xE9: { uint16_t d16 = rdop16(); if ( ! ( m_F & FLAG_C ) ) { CALL( m_PC + d16 - 1 ); m_icount -= 12; } } break; - case 0xEA: { UINT16 d16 = rdop16(); if ( m_F & FLAG_Z ) { CALL( m_PC + d16 - 1 ); m_icount -= 12; } } + case 0xEA: { uint16_t d16 = rdop16(); if ( m_F & FLAG_Z ) { CALL( m_PC + d16 - 1 ); m_icount -= 12; } } break; - case 0xEB: { UINT16 d16 = rdop16(); if ( ! ( m_F & FLAG_Z ) ) { CALL( m_PC + d16 - 1 ); m_icount -= 12; } } + case 0xEB: { uint16_t d16 = rdop16(); if ( ! ( m_F & FLAG_Z ) ) { CALL( m_PC + d16 - 1 ); m_icount -= 12; } } break; - case 0xEC: { UINT16 d16 = rdop16(); if ( m_F & FLAG_C ) { JMP( m_PC + d16 - 1 ); } } + case 0xEC: { uint16_t d16 = rdop16(); if ( m_F & FLAG_C ) { JMP( m_PC + d16 - 1 ); } } break; - case 0xED: { UINT16 d16 = rdop16(); if ( ! ( m_F & FLAG_C ) ) { JMP( m_PC + d16 - 1 ); } } + case 0xED: { uint16_t d16 = rdop16(); if ( ! ( m_F & FLAG_C ) ) { JMP( m_PC + d16 - 1 ); } } break; - case 0xEE: { UINT16 d16 = rdop16(); if ( m_F & FLAG_Z ) { JMP( m_PC + d16 - 1 ); } } + case 0xEE: { uint16_t d16 = rdop16(); if ( m_F & FLAG_Z ) { JMP( m_PC + d16 - 1 ); } } break; - case 0xEF: { UINT16 d16 = rdop16(); if ( ! ( m_F & FLAG_Z ) ) { JMP( m_PC + d16 - 1 ); } } + case 0xEF: { uint16_t d16 = rdop16(); if ( ! ( m_F & FLAG_Z ) ) { JMP( m_PC + d16 - 1 ); } } break; - case 0xF0: { INT8 d8 = rdop(); CALL( m_PC + d8 - 1 ); } + case 0xF0: { int8_t d8 = rdop(); CALL( m_PC + d8 - 1 ); } break; - case 0xF1: { INT8 d8 = rdop(); JMP( m_PC + d8 - 1 ); } + case 0xF1: { int8_t d8 = rdop(); JMP( m_PC + d8 - 1 ); } break; - case 0xF2: { UINT16 d16 = rdop16(); CALL( m_PC + d16 - 1 ); } + case 0xF2: { uint16_t d16 = rdop16(); CALL( m_PC + d16 - 1 ); } break; - case 0xF3: { UINT16 d16 = rdop16(); JMP( m_PC + d16 - 1 ); } + case 0xF3: { uint16_t d16 = rdop16(); JMP( m_PC + d16 - 1 ); } break; case 0xF4: { JMP( m_HL ); } break; - case 0xF5: { INT8 d8 = rdop(); m_BA = m_BA - 0x0100; if ( m_BA & 0xFF00 ) { JMP( m_PC + d8 - 1 ); } } + case 0xF5: { int8_t d8 = rdop(); m_BA = m_BA - 0x0100; if ( m_BA & 0xFF00 ) { JMP( m_PC + d8 - 1 ); } } break; case 0xF6: { m_BA = ( m_BA & 0xFF00 ) | ( ( m_BA & 0x00F0 ) >> 4 ) | ( ( m_BA & 0x000F ) << 4 ); } break; - case 0xF7: { UINT8 d; AD1_IHL; d = RD( addr1 ); WR( addr1, ( ( d & 0xF0 ) >> 4 ) | ( ( d & 0x0F ) << 4 ) ); } + case 0xF7: { uint8_t d; AD1_IHL; d = RD( addr1 ); WR( addr1, ( ( d & 0xF0 ) >> 4 ) | ( ( d & 0x0F ) << 4 ) ); } break; case 0xF8: { m_PC = POP16(); m_V = POP8(); m_U = m_V; } break; @@ -526,9 +526,9 @@ void minx_cpu_device::execute_one() break; case 0xFB: { AD1_I16; CALL( rd16( addr1 ) ); } break; - case 0xFC: { UINT8 i = rdop() & 0xFE; CALL( rd16( i ) ); PUSH8( m_F ); } + case 0xFC: { uint8_t i = rdop() & 0xFE; CALL( rd16( i ) ); PUSH8( m_F ); } break; - case 0xFD: { UINT8 i = rdop() & 0xFE; JMP( rd16( i ) ); /* PUSH8( m_F );?? */ } + case 0xFD: { uint8_t i = rdop() & 0xFE; JMP( rd16( i ) ); /* PUSH8( m_F );?? */ } break; case 0xFE: { /* illegal operation? */ } break; |