diff options
Diffstat (limited to 'src/devices/cpu/z8000/z8000ops.hxx')
-rw-r--r-- | src/devices/cpu/z8000/z8000ops.hxx | 348 |
1 files changed, 174 insertions, 174 deletions
diff --git a/src/devices/cpu/z8000/z8000ops.hxx b/src/devices/cpu/z8000/z8000ops.hxx index 82b9bd86442..1e3b2834a2d 100644 --- a/src/devices/cpu/z8000/z8000ops.hxx +++ b/src/devices/cpu/z8000/z8000ops.hxx @@ -137,62 +137,62 @@ void z8002_device::set_pc(uint32_t addr) uint8_t z8002_device::RDIR_B(uint8_t reg) { - return RDMEM_B(reg == SP ? *m_stack : *m_data, addr_from_reg(reg)); + return RDMEM_B(reg == SP ? m_stack : m_data, addr_from_reg(reg)); } uint16_t z8002_device::RDIR_W(uint8_t reg) { - return RDMEM_W(reg == SP ? *m_stack : *m_data, addr_from_reg(reg)); + return RDMEM_W(reg == SP ? m_stack : m_data, addr_from_reg(reg)); } uint32_t z8002_device::RDIR_L(uint8_t reg) { - return RDMEM_L(reg == SP ? *m_stack : *m_data, addr_from_reg(reg)); + return RDMEM_L(reg == SP ? m_stack : m_data, addr_from_reg(reg)); } void z8002_device::WRIR_B(uint8_t reg, uint8_t value) { - WRMEM_B(reg == SP ? *m_stack : *m_data, addr_from_reg(reg), value); + WRMEM_B(reg == SP ? m_stack : m_data, addr_from_reg(reg), value); } void z8002_device::WRIR_W(uint8_t reg, uint16_t value) { - WRMEM_W(reg == SP ? *m_stack : *m_data, addr_from_reg(reg), value); + WRMEM_W(reg == SP ? m_stack : m_data, addr_from_reg(reg), value); } void z8002_device::WRIR_L(uint8_t reg, uint32_t value) { - WRMEM_L(reg == SP ? *m_stack : *m_data, addr_from_reg(reg), value); + WRMEM_L(reg == SP ? m_stack : m_data, addr_from_reg(reg), value); } uint8_t z8002_device::RDBX_B(uint8_t reg, uint16_t idx) { - return RDMEM_B(reg == SP ? *m_stack : *m_data, addr_add(addr_from_reg(reg), idx)); + return RDMEM_B(reg == SP ? m_stack : m_data, addr_add(addr_from_reg(reg), idx)); } uint16_t z8002_device::RDBX_W(uint8_t reg, uint16_t idx) { - return RDMEM_W(reg == SP ? *m_stack : *m_data, addr_add(addr_from_reg(reg), idx)); + return RDMEM_W(reg == SP ? m_stack : m_data, addr_add(addr_from_reg(reg), idx)); } uint32_t z8002_device::RDBX_L(uint8_t reg, uint16_t idx) { - return RDMEM_L(reg == SP ? *m_stack : *m_data, addr_add(addr_from_reg(reg), idx)); + return RDMEM_L(reg == SP ? m_stack : m_data, addr_add(addr_from_reg(reg), idx)); } void z8002_device::WRBX_B(uint8_t reg, uint16_t idx, uint8_t value) { - WRMEM_B(reg == SP ? *m_stack : *m_data, addr_add(addr_from_reg(reg), idx), value); + WRMEM_B(reg == SP ? m_stack : m_data, addr_add(addr_from_reg(reg), idx), value); } void z8002_device::WRBX_W(uint8_t reg, uint16_t idx, uint16_t value) { - WRMEM_W(reg == SP ? *m_stack : *m_data, addr_add(addr_from_reg(reg), idx), value); + WRMEM_W(reg == SP ? m_stack : m_data, addr_add(addr_from_reg(reg), idx), value); } void z8002_device::WRBX_L(uint8_t reg, uint16_t idx, uint32_t value) { - WRMEM_L(reg == SP ? *m_stack : *m_data, addr_add(addr_from_reg(reg), idx), value); + WRMEM_L(reg == SP ? m_stack : m_data, addr_add(addr_from_reg(reg), idx), value); } void z8002_device::PUSHW(uint8_t dst, uint16_t value) @@ -1535,7 +1535,7 @@ void z8002_device::Z0B_ssN0_dddd() void z8002_device::Z0C_ddN0_0000() { GET_DST(OP0,NIB3); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_B(space, addr, COMB(RDMEM_B(space, addr))); } @@ -1558,7 +1558,7 @@ void z8002_device::Z0C_ddN0_0001_imm8() void z8002_device::Z0C_ddN0_0010() { GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_B(space, addr, NEGB(RDMEM_B(space, addr))); } @@ -1591,7 +1591,7 @@ void z8002_device::Z0C_ddN0_0101_imm8() void z8002_device::Z0C_ddN0_0110() { GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); if (RDMEM_B(space, addr) & S08) SET_S; else CLR_S; WRMEM_B(space, addr, 0xff); @@ -1614,7 +1614,7 @@ void z8002_device::Z0C_ddN0_1000() void z8002_device::Z0D_ddN0_0000() { GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_W(space, addr, COMW(RDMEM_W(space, addr))); } @@ -1637,7 +1637,7 @@ void z8002_device::Z0D_ddN0_0001_imm16() void z8002_device::Z0D_ddN0_0010() { GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_W(space, addr, NEGW(RDMEM_W(space, addr))); } @@ -1670,7 +1670,7 @@ void z8002_device::Z0D_ddN0_0101_imm16() void z8002_device::Z0D_ddN0_0110() { GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); if (RDMEM_W(space, addr) & S16) SET_S; else CLR_S; WRMEM_W(space, addr, 0xffff); @@ -1966,7 +1966,7 @@ void z8002_device::Z1C_ddN0_1001_0000_ssss_0000_nmin1() GET_DST(OP0,NIB2); GET_CNT(OP1,NIB3); GET_SRC(OP1,NIB1); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); while (cnt-- >= 0) { WRMEM_W(space, addr, RW(src)); @@ -1984,7 +1984,7 @@ void z8002_device::Z1C_ssN0_0001_0000_dddd_0000_nmin1() GET_SRC(OP0,NIB2); GET_CNT(OP1,NIB3); GET_DST(OP1,NIB1); - address_space &space = src == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = src == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(src); while (cnt-- >= 0) { RW(dst) = RDMEM_W(space, addr); @@ -2098,7 +2098,7 @@ void z8002_device::Z22_ddN0_imm4() { GET_BIT(OP0); GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_B(space, addr, RDMEM_B(space, addr) & ~bit); } @@ -2122,7 +2122,7 @@ void z8002_device::Z23_ddN0_imm4() { GET_BIT(OP0); GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_W(space, addr, RDMEM_W(space, addr) & ~bit); } @@ -2146,7 +2146,7 @@ void z8002_device::Z24_ddN0_imm4() { GET_BIT(OP0); GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_B(space, addr, RDMEM_B(space, addr) | bit); } @@ -2170,7 +2170,7 @@ void z8002_device::Z25_ddN0_imm4() { GET_BIT(OP0); GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_W(space, addr, RDMEM_W(space, addr) | bit); } @@ -2227,7 +2227,7 @@ void z8002_device::Z28_ddN0_imm4m1() { GET_I4M1(OP0,NIB3); GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_B(space, addr, INCB(RDMEM_B(space, addr), i4p1)); } @@ -2240,7 +2240,7 @@ void z8002_device::Z29_ddN0_imm4m1() { GET_I4M1(OP0,NIB3); GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_W(space, addr, INCW(RDMEM_W(space, addr), i4p1)); } @@ -2253,7 +2253,7 @@ void z8002_device::Z2A_ddN0_imm4m1() { GET_I4M1(OP0,NIB3); GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_B(space, addr, DECB(RDMEM_B(space, addr), i4p1)); } @@ -2266,7 +2266,7 @@ void z8002_device::Z2B_ddN0_imm4m1() { GET_I4M1(OP0,NIB3); GET_DST(OP0,NIB2); - address_space &space = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = dst == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(dst); WRMEM_W(space, addr, DECW(RDMEM_W(space, addr), i4p1)); } @@ -2279,7 +2279,7 @@ void z8002_device::Z2C_ssN0_dddd() { GET_DST(OP0,NIB3); GET_SRC(OP0,NIB2); - address_space &space = src == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = src == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(src); uint8_t tmp = RDMEM_B(space, addr); WRMEM_B(space, addr, RB(dst)); @@ -2294,7 +2294,7 @@ void z8002_device::Z2D_ssN0_dddd() { GET_DST(OP0,NIB3); GET_SRC(OP0,NIB2); - address_space &space = src == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = src == SP ? m_stack : m_data; uint32_t addr = addr_from_reg(src); uint16_t tmp = RDMEM_W(space, addr); WRMEM_W(space, addr, RW(dst)); @@ -2331,7 +2331,7 @@ void z8002_device::Z30_0000_dddd_dsp16() { GET_DST(OP0,NIB3); GET_DSP16; - RB(dst) = RDMEM_B(*m_program, dsp16); + RB(dst) = RDMEM_B(m_program, dsp16); } /****************************************** @@ -2354,7 +2354,7 @@ void z8002_device::Z31_0000_dddd_dsp16() { GET_DST(OP0,NIB3); GET_DSP16; - RW(dst) = RDMEM_W(*m_program, dsp16); + RW(dst) = RDMEM_W(m_program, dsp16); } /****************************************** @@ -2377,7 +2377,7 @@ void z8002_device::Z32_0000_ssss_dsp16() { GET_SRC(OP0,NIB3); GET_DSP16; - WRMEM_B(*m_program, dsp16, RB(src)); + WRMEM_B(m_program, dsp16, RB(src)); } /****************************************** @@ -2400,7 +2400,7 @@ void z8002_device::Z33_0000_ssss_dsp16() { GET_SRC(OP0,NIB3); GET_DSP16; - WRMEM_W(*m_program, dsp16, RW(src)); + WRMEM_W(m_program, dsp16, RW(src)); } /****************************************** @@ -2452,7 +2452,7 @@ void z8002_device::Z35_0000_dddd_dsp16() { GET_DST(OP0,NIB3); GET_DSP16; - RL(dst) = RDMEM_L(*m_program, dsp16); + RL(dst) = RDMEM_L(m_program, dsp16); } /****************************************** @@ -2499,7 +2499,7 @@ void z8002_device::Z37_0000_ssss_dsp16() { GET_SRC(OP0,NIB3); GET_DSP16; - WRMEM_L(*m_program, dsp16, RL(src)); + WRMEM_L(m_program, dsp16, RL(src)); } /****************************************** @@ -2537,7 +2537,7 @@ void z8002_device::Z39_ssN0_0000() CHECK_PRIVILEGED_INSTR(); GET_SRC(OP0,NIB2); uint16_t fcw; - address_space &space = src == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &space = src == SP ? m_stack : m_data; if (get_segmented_mode()) { uint32_t addr = addr_from_reg(src); fcw = RDMEM_W(space, addr + 2); @@ -2988,7 +2988,7 @@ void z8002_device::Z40_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RB(dst) = ADDB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = ADDB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3001,7 +3001,7 @@ void z8002_device::Z40_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RB(dst) = ADDB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = ADDB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3012,7 +3012,7 @@ void z8002_device::Z41_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RW(dst) = ADDW(RW(dst), RDMEM_W(*m_data, addr)); /* EHC */ + RW(dst) = ADDW(RW(dst), RDMEM_W(m_data, addr)); /* EHC */ } /****************************************** @@ -3025,7 +3025,7 @@ void z8002_device::Z41_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RW(dst) = ADDW(RW(dst), RDMEM_W(*m_data, addr)); /* ASG */ + RW(dst) = ADDW(RW(dst), RDMEM_W(m_data, addr)); /* ASG */ } /****************************************** @@ -3036,7 +3036,7 @@ void z8002_device::Z42_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RB(dst) = SUBB(RB(dst), RDMEM_B(*m_data, addr)); /* EHC */ + RB(dst) = SUBB(RB(dst), RDMEM_B(m_data, addr)); /* EHC */ } /****************************************** @@ -3049,7 +3049,7 @@ void z8002_device::Z42_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RB(dst) = SUBB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = SUBB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3060,7 +3060,7 @@ void z8002_device::Z43_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RW(dst) = SUBW(RW(dst), RDMEM_W(*m_data, addr)); + RW(dst) = SUBW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3073,7 +3073,7 @@ void z8002_device::Z43_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RW(dst) = SUBW(RW(dst), RDMEM_W(*m_data, addr)); + RW(dst) = SUBW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3084,7 +3084,7 @@ void z8002_device::Z44_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RB(dst) = ORB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = ORB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3097,7 +3097,7 @@ void z8002_device::Z44_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RB(dst) = ORB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = ORB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3108,7 +3108,7 @@ void z8002_device::Z45_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RW(dst) = ORW(RW(dst), RDMEM_W(*m_data, addr)); + RW(dst) = ORW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3121,7 +3121,7 @@ void z8002_device::Z45_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RW(dst) = ORW(RW(dst), RDMEM_W(*m_data, addr)); + RW(dst) = ORW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3132,7 +3132,7 @@ void z8002_device::Z46_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RB(dst) = ANDB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = ANDB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3145,7 +3145,7 @@ void z8002_device::Z46_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RB(dst) = ANDB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = ANDB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3156,7 +3156,7 @@ void z8002_device::Z47_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RW(dst) = ANDW(RW(dst), RDMEM_W(*m_data, addr)); + RW(dst) = ANDW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3169,7 +3169,7 @@ void z8002_device::Z47_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RW(dst) = ANDW(RW(dst), RDMEM_W(*m_data, addr)); + RW(dst) = ANDW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3180,7 +3180,7 @@ void z8002_device::Z48_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RB(dst) = XORB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = XORB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3193,7 +3193,7 @@ void z8002_device::Z48_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RB(dst) = XORB(RB(dst), RDMEM_B(*m_data, addr)); + RB(dst) = XORB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3204,7 +3204,7 @@ void z8002_device::Z49_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RW(dst) = XORW(RW(dst), RDMEM_W(*m_data, addr)); + RW(dst) = XORW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3217,7 +3217,7 @@ void z8002_device::Z49_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RW(dst) = XORW(RW(dst), RDMEM_W(*m_data, addr)); + RW(dst) = XORW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3228,7 +3228,7 @@ void z8002_device::Z4A_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - CPB(RB(dst), RDMEM_B(*m_data, addr)); + CPB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3241,7 +3241,7 @@ void z8002_device::Z4A_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - CPB(RB(dst), RDMEM_B(*m_data, addr)); + CPB(RB(dst), RDMEM_B(m_data, addr)); } /****************************************** @@ -3252,7 +3252,7 @@ void z8002_device::Z4B_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - CPW(RW(dst), RDMEM_W(*m_data, addr)); + CPW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3265,7 +3265,7 @@ void z8002_device::Z4B_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - CPW(RW(dst), RDMEM_W(*m_data, addr)); + CPW(RW(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3275,7 +3275,7 @@ void z8002_device::Z4B_ssN0_dddd_addr() void z8002_device::Z4C_0000_0000_addr() { GET_ADDR(OP1); - WRMEM_B(*m_data, addr, COMB(RDMEM_W(*m_data, addr))); + WRMEM_B(m_data, addr, COMB(RDMEM_W(m_data, addr))); } /****************************************** @@ -3286,7 +3286,7 @@ void z8002_device::Z4C_0000_0001_addr_imm8() { GET_ADDR(OP1); GET_IMM8(OP2); - CPB(RDMEM_B(*m_data, addr), imm8); + CPB(RDMEM_B(m_data, addr), imm8); } /****************************************** @@ -3296,7 +3296,7 @@ void z8002_device::Z4C_0000_0001_addr_imm8() void z8002_device::Z4C_0000_0010_addr() { GET_ADDR(OP1); - WRMEM_B(*m_data, addr, NEGB(RDMEM_B(*m_data, addr))); + WRMEM_B(m_data, addr, NEGB(RDMEM_B(m_data, addr))); } /****************************************** @@ -3306,7 +3306,7 @@ void z8002_device::Z4C_0000_0010_addr() void z8002_device::Z4C_0000_0100_addr() { GET_ADDR(OP1); - TESTB(RDMEM_B(*m_data, addr)); + TESTB(RDMEM_B(m_data, addr)); } /****************************************** @@ -3317,7 +3317,7 @@ void z8002_device::Z4C_0000_0101_addr_imm8() { GET_ADDR(OP1); GET_IMM8(OP2); - WRMEM_B(*m_data, addr, imm8); + WRMEM_B(m_data, addr, imm8); } /****************************************** @@ -3327,8 +3327,8 @@ void z8002_device::Z4C_0000_0101_addr_imm8() void z8002_device::Z4C_0000_0110_addr() { GET_ADDR(OP1); - if (RDMEM_B(*m_data, addr) & S08) SET_S; else CLR_S; - WRMEM_B(*m_data, addr, 0xff); + if (RDMEM_B(m_data, addr) & S08) SET_S; else CLR_S; + WRMEM_B(m_data, addr, 0xff); } /****************************************** @@ -3338,7 +3338,7 @@ void z8002_device::Z4C_0000_0110_addr() void z8002_device::Z4C_0000_1000_addr() { GET_ADDR(OP1); - WRMEM_B(*m_data, addr, 0); + WRMEM_B(m_data, addr, 0); } /****************************************** @@ -3350,7 +3350,7 @@ void z8002_device::Z4C_ddN0_0000_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, COMB(RDMEM_B(*m_data, addr))); + WRMEM_B(m_data, addr, COMB(RDMEM_B(m_data, addr))); } /****************************************** @@ -3363,7 +3363,7 @@ void z8002_device::Z4C_ddN0_0001_addr_imm8() GET_ADDR(OP1); GET_IMM8(OP2); addr = addr_add(addr, RW(dst)); - CPB(RDMEM_B(*m_data, addr), imm8); + CPB(RDMEM_B(m_data, addr), imm8); } /****************************************** @@ -3375,7 +3375,7 @@ void z8002_device::Z4C_ddN0_0010_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, NEGB(RDMEM_B(*m_data, addr))); + WRMEM_B(m_data, addr, NEGB(RDMEM_B(m_data, addr))); } /****************************************** @@ -3387,7 +3387,7 @@ void z8002_device::Z4C_ddN0_0100_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - TESTB(RDMEM_B(*m_data, addr)); + TESTB(RDMEM_B(m_data, addr)); } /****************************************** @@ -3400,7 +3400,7 @@ void z8002_device::Z4C_ddN0_0101_addr_imm8() GET_ADDR(OP1); GET_IMM8(OP2); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, imm8); + WRMEM_B(m_data, addr, imm8); } /****************************************** @@ -3412,8 +3412,8 @@ void z8002_device::Z4C_ddN0_0110_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - if (RDMEM_B(*m_data, addr) & S08) SET_S; else CLR_S; - WRMEM_B(*m_data, addr, 0xff); + if (RDMEM_B(m_data, addr) & S08) SET_S; else CLR_S; + WRMEM_B(m_data, addr, 0xff); } /****************************************** @@ -3425,7 +3425,7 @@ void z8002_device::Z4C_ddN0_1000_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, 0); + WRMEM_B(m_data, addr, 0); } /****************************************** @@ -3435,7 +3435,7 @@ void z8002_device::Z4C_ddN0_1000_addr() void z8002_device::Z4D_0000_0000_addr() { GET_ADDR(OP1); - WRMEM_W(*m_data, addr, COMW(RDMEM_W(*m_data, addr))); + WRMEM_W(m_data, addr, COMW(RDMEM_W(m_data, addr))); } /****************************************** @@ -3446,7 +3446,7 @@ void z8002_device::Z4D_0000_0001_addr_imm16() { GET_ADDR(OP1); GET_IMM16(OP2); - CPW(RDMEM_W(*m_data, addr), imm16); + CPW(RDMEM_W(m_data, addr), imm16); } /****************************************** @@ -3456,7 +3456,7 @@ void z8002_device::Z4D_0000_0001_addr_imm16() void z8002_device::Z4D_0000_0010_addr() { GET_ADDR(OP1); - WRMEM_W(*m_data, addr, NEGW(RDMEM_W(*m_data, addr))); + WRMEM_W(m_data, addr, NEGW(RDMEM_W(m_data, addr))); } /****************************************** @@ -3466,7 +3466,7 @@ void z8002_device::Z4D_0000_0010_addr() void z8002_device::Z4D_0000_0100_addr() { GET_ADDR(OP1); - TESTW(RDMEM_W(*m_data, addr)); + TESTW(RDMEM_W(m_data, addr)); } /****************************************** @@ -3477,7 +3477,7 @@ void z8002_device::Z4D_0000_0101_addr_imm16() { GET_ADDR(OP1); GET_IMM16(OP2); - WRMEM_W(*m_data, addr, imm16); + WRMEM_W(m_data, addr, imm16); } /****************************************** @@ -3487,8 +3487,8 @@ void z8002_device::Z4D_0000_0101_addr_imm16() void z8002_device::Z4D_0000_0110_addr() { GET_ADDR(OP1); - if (RDMEM_W(*m_data, addr) & S16) SET_S; else CLR_S; - WRMEM_W(*m_data, addr, 0xffff); + if (RDMEM_W(m_data, addr) & S16) SET_S; else CLR_S; + WRMEM_W(m_data, addr, 0xffff); } /****************************************** @@ -3498,7 +3498,7 @@ void z8002_device::Z4D_0000_0110_addr() void z8002_device::Z4D_0000_1000_addr() { GET_ADDR(OP1); - WRMEM_W(*m_data, addr, 0); + WRMEM_W(m_data, addr, 0); } /****************************************** @@ -3510,7 +3510,7 @@ void z8002_device::Z4D_ddN0_0000_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, COMW(RDMEM_W(*m_data, addr))); + WRMEM_W(m_data, addr, COMW(RDMEM_W(m_data, addr))); } /****************************************** @@ -3523,7 +3523,7 @@ void z8002_device::Z4D_ddN0_0001_addr_imm16() GET_ADDR(OP1); GET_IMM16(OP2); addr = addr_add(addr, RW(dst)); - CPW(RDMEM_W(*m_data, addr), imm16); + CPW(RDMEM_W(m_data, addr), imm16); } /****************************************** @@ -3535,7 +3535,7 @@ void z8002_device::Z4D_ddN0_0010_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, NEGW(RDMEM_W(*m_data, addr))); + WRMEM_W(m_data, addr, NEGW(RDMEM_W(m_data, addr))); } /****************************************** @@ -3547,7 +3547,7 @@ void z8002_device::Z4D_ddN0_0100_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - TESTW(RDMEM_W(*m_data, addr)); + TESTW(RDMEM_W(m_data, addr)); } /****************************************** @@ -3560,7 +3560,7 @@ void z8002_device::Z4D_ddN0_0101_addr_imm16() GET_ADDR(OP1); GET_IMM16(OP2); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, imm16); + WRMEM_W(m_data, addr, imm16); } /****************************************** @@ -3572,8 +3572,8 @@ void z8002_device::Z4D_ddN0_0110_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - if (RDMEM_W(*m_data, addr) & S16) SET_S; else CLR_S; - WRMEM_W(*m_data, addr, 0xffff); + if (RDMEM_W(m_data, addr) & S16) SET_S; else CLR_S; + WRMEM_W(m_data, addr, 0xffff); } /****************************************** @@ -3585,7 +3585,7 @@ void z8002_device::Z4D_ddN0_1000_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, 0); + WRMEM_W(m_data, addr, 0); } /****************************************** @@ -3598,7 +3598,7 @@ void z8002_device::Z4E_ddN0_ssN0_addr() GET_SRC(OP0,NIB3); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, RB(src)); + WRMEM_B(m_data, addr, RB(src)); } /****************************************** @@ -3609,7 +3609,7 @@ void z8002_device::Z50_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - CPL(RL(dst), RDMEM_L(*m_data, addr)); + CPL(RL(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3622,7 +3622,7 @@ void z8002_device::Z50_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - CPL(RL(dst), RDMEM_L(*m_data, addr)); + CPL(RL(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3633,7 +3633,7 @@ void z8002_device::Z51_ddN0_0000_addr() { GET_DST(OP0,NIB2); GET_ADDR(OP1); - PUSHL(dst, RDMEM_L(*m_data, addr)); + PUSHL(dst, RDMEM_L(m_data, addr)); } /****************************************** @@ -3646,7 +3646,7 @@ void z8002_device::Z51_ddN0_ssN0_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - PUSHL(dst, RDMEM_L(*m_data, addr)); + PUSHL(dst, RDMEM_L(m_data, addr)); } /****************************************** @@ -3657,7 +3657,7 @@ void z8002_device::Z52_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RL(dst) = SUBL(RL(dst), RDMEM_L(*m_data, addr)); + RL(dst) = SUBL(RL(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3670,7 +3670,7 @@ void z8002_device::Z52_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RL(dst) = SUBL(RL(dst), RDMEM_L(*m_data, addr)); + RL(dst) = SUBL(RL(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3681,7 +3681,7 @@ void z8002_device::Z53_ddN0_0000_addr() { GET_DST(OP0,NIB2); GET_ADDR(OP1); - PUSHW(dst, RDMEM_W(*m_data, addr)); + PUSHW(dst, RDMEM_W(m_data, addr)); } /****************************************** @@ -3694,7 +3694,7 @@ void z8002_device::Z53_ddN0_ssN0_addr() GET_SRC(OP0,NIB3); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - PUSHW(dst, RDMEM_W(*m_data, addr)); + PUSHW(dst, RDMEM_W(m_data, addr)); } /****************************************** @@ -3705,7 +3705,7 @@ void z8002_device::Z54_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RL(dst) = RDMEM_L(*m_data, addr); + RL(dst) = RDMEM_L(m_data, addr); } /****************************************** @@ -3718,7 +3718,7 @@ void z8002_device::Z54_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RL(dst) = RDMEM_L(*m_data, addr); + RL(dst) = RDMEM_L(m_data, addr); } /****************************************** @@ -3729,7 +3729,7 @@ void z8002_device::Z55_ssN0_0000_addr() { GET_SRC(OP0,NIB2); GET_ADDR(OP1); - WRMEM_L(*m_data, addr, POPL(src)); + WRMEM_L(m_data, addr, POPL(src)); } /****************************************** @@ -3742,7 +3742,7 @@ void z8002_device::Z55_ssN0_ddN0_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_L(*m_data, addr, POPL(src)); + WRMEM_L(m_data, addr, POPL(src)); } /****************************************** @@ -3753,7 +3753,7 @@ void z8002_device::Z56_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RL(dst) = ADDL(RL(dst), RDMEM_L(*m_data, addr)); + RL(dst) = ADDL(RL(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3766,7 +3766,7 @@ void z8002_device::Z56_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RL(dst) = ADDL(RL(dst), RDMEM_L(*m_data, addr)); + RL(dst) = ADDL(RL(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3777,7 +3777,7 @@ void z8002_device::Z57_ssN0_0000_addr() { GET_SRC(OP0,NIB2); GET_ADDR(OP1); - WRMEM_W(*m_data, addr, POPW(src)); + WRMEM_W(m_data, addr, POPW(src)); } /****************************************** @@ -3790,7 +3790,7 @@ void z8002_device::Z57_ssN0_ddN0_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, POPW(src)); + WRMEM_W(m_data, addr, POPW(src)); } /****************************************** @@ -3801,7 +3801,7 @@ void z8002_device::Z58_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RQ(dst) = MULTL(RQ(dst), RDMEM_L(*m_data, addr)); + RQ(dst) = MULTL(RQ(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3814,7 +3814,7 @@ void z8002_device::Z58_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RQ(dst) = MULTL(RQ(dst), RDMEM_L(*m_data, addr)); + RQ(dst) = MULTL(RQ(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3825,7 +3825,7 @@ void z8002_device::Z59_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RL(dst) = MULTW(RL(dst), RDMEM_W(*m_data, addr)); + RL(dst) = MULTW(RL(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3838,7 +3838,7 @@ void z8002_device::Z59_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RL(dst) = MULTW(RL(dst), RDMEM_W(*m_data, addr)); + RL(dst) = MULTW(RL(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3849,7 +3849,7 @@ void z8002_device::Z5A_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RQ(dst) = DIVL(RQ(dst), RDMEM_L(*m_data, addr)); + RQ(dst) = DIVL(RQ(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3862,7 +3862,7 @@ void z8002_device::Z5A_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RQ(dst) = DIVL(RQ(dst), RDMEM_L(*m_data, addr)); + RQ(dst) = DIVL(RQ(dst), RDMEM_L(m_data, addr)); } /****************************************** @@ -3873,7 +3873,7 @@ void z8002_device::Z5B_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RL(dst) = DIVW(RL(dst), RDMEM_W(*m_data, addr)); + RL(dst) = DIVW(RL(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3886,7 +3886,7 @@ void z8002_device::Z5B_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RL(dst) = DIVW(RL(dst), RDMEM_W(*m_data, addr)); + RL(dst) = DIVW(RL(dst), RDMEM_W(m_data, addr)); } /****************************************** @@ -3899,7 +3899,7 @@ void z8002_device::Z5C_0000_0001_0000_dddd_0000_nmin1_addr() GET_CNT(OP1,NIB3); GET_ADDR(OP2); while (cnt-- >= 0) { - RW(dst) = RDMEM_W(*m_data, addr); + RW(dst) = RDMEM_W(m_data, addr); dst = (dst+1) & 15; addr = addr_add (addr, 2); } @@ -3912,7 +3912,7 @@ void z8002_device::Z5C_0000_0001_0000_dddd_0000_nmin1_addr() void z8002_device::Z5C_0000_1000_addr() { GET_ADDR(OP1); - TESTL(RDMEM_L(*m_data, addr)); + TESTL(RDMEM_L(m_data, addr)); } /****************************************** @@ -3925,7 +3925,7 @@ void z8002_device::Z5C_0000_1001_0000_ssss_0000_nmin1_addr() GET_CNT(OP1,NIB3); GET_ADDR(OP2); while (cnt-- >= 0) { - WRMEM_W(*m_data, addr, RW(src)); + WRMEM_W(m_data, addr, RW(src)); src = (src+1) & 15; addr = addr_add (addr, 2); } @@ -3940,7 +3940,7 @@ void z8002_device::Z5C_ddN0_1000_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - TESTL(RDMEM_L(*m_data, addr)); + TESTL(RDMEM_L(m_data, addr)); } /****************************************** @@ -3955,7 +3955,7 @@ void z8002_device::Z5C_ddN0_1001_0000_ssN0_0000_nmin1_addr() GET_ADDR(OP2); addr = addr_add(addr, RW(dst)); while (cnt-- >= 0) { - WRMEM_W(*m_data, addr, RW(src)); + WRMEM_W(m_data, addr, RW(src)); src = (src+1) & 15; addr = addr_add(addr, 2); } @@ -3973,7 +3973,7 @@ void z8002_device::Z5C_ssN0_0001_0000_dddd_0000_nmin1_addr() GET_ADDR(OP2); addr = addr_add(addr, RW(src)); while (cnt-- >= 0) { - RW(dst) = RDMEM_W(*m_data, addr); + RW(dst) = RDMEM_W(m_data, addr); dst = (dst+1) & 15; addr = addr_add(addr, 2); } @@ -3987,7 +3987,7 @@ void z8002_device::Z5D_0000_ssss_addr() { GET_SRC(OP0,NIB3); GET_ADDR(OP1); - WRMEM_L(*m_data, addr, RL(src)); + WRMEM_L(m_data, addr, RL(src)); } /****************************************** @@ -4000,7 +4000,7 @@ void z8002_device::Z5D_ddN0_ssss_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_L(*m_data, addr, RL(src)); + WRMEM_L(m_data, addr, RL(src)); } /****************************************** @@ -4099,7 +4099,7 @@ void z8002_device::Z60_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RB(dst) = RDMEM_B(*m_data, addr); + RB(dst) = RDMEM_B(m_data, addr); } /****************************************** @@ -4112,7 +4112,7 @@ void z8002_device::Z60_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RB(dst) = RDMEM_B(*m_data, addr); + RB(dst) = RDMEM_B(m_data, addr); } /****************************************** @@ -4123,7 +4123,7 @@ void z8002_device::Z61_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - RW(dst) = RDMEM_W(*m_data, addr); + RW(dst) = RDMEM_W(m_data, addr); } /****************************************** @@ -4136,7 +4136,7 @@ void z8002_device::Z61_ssN0_dddd_addr() GET_SRC(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(src)); - RW(dst) = RDMEM_W(*m_data, addr); + RW(dst) = RDMEM_W(m_data, addr); } /****************************************** @@ -4147,7 +4147,7 @@ void z8002_device::Z62_0000_imm4_addr() { GET_BIT(OP0); GET_ADDR(OP1); - WRMEM_B(*m_data, addr, RDMEM_B(*m_data, addr) & ~bit); + WRMEM_B(m_data, addr, RDMEM_B(m_data, addr) & ~bit); } /****************************************** @@ -4160,7 +4160,7 @@ void z8002_device::Z62_ddN0_imm4_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, RDMEM_B(*m_data, addr) & ~bit); + WRMEM_B(m_data, addr, RDMEM_B(m_data, addr) & ~bit); } /****************************************** @@ -4171,7 +4171,7 @@ void z8002_device::Z63_0000_imm4_addr() { GET_BIT(OP0); GET_ADDR(OP1); - WRMEM_W(*m_data, addr, RDMEM_W(*m_data, addr) & ~bit); + WRMEM_W(m_data, addr, RDMEM_W(m_data, addr) & ~bit); } /****************************************** @@ -4184,7 +4184,7 @@ void z8002_device::Z63_ddN0_imm4_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, RDMEM_W(*m_data, addr) & ~bit); + WRMEM_W(m_data, addr, RDMEM_W(m_data, addr) & ~bit); } /****************************************** @@ -4195,7 +4195,7 @@ void z8002_device::Z64_0000_imm4_addr() { GET_BIT(OP0); GET_ADDR(OP1); - WRMEM_B(*m_data, addr, RDMEM_B(*m_data, addr) | bit); + WRMEM_B(m_data, addr, RDMEM_B(m_data, addr) | bit); } /****************************************** @@ -4208,7 +4208,7 @@ void z8002_device::Z64_ddN0_imm4_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, RDMEM_B(*m_data, addr) | bit); + WRMEM_B(m_data, addr, RDMEM_B(m_data, addr) | bit); } /****************************************** @@ -4219,7 +4219,7 @@ void z8002_device::Z65_0000_imm4_addr() { GET_BIT(OP0); GET_ADDR(OP1); - WRMEM_W(*m_data, addr, RDMEM_W(*m_data, addr) | bit); + WRMEM_W(m_data, addr, RDMEM_W(m_data, addr) | bit); } /****************************************** @@ -4232,7 +4232,7 @@ void z8002_device::Z65_ddN0_imm4_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, RDMEM_W(*m_data, addr) | bit); + WRMEM_W(m_data, addr, RDMEM_W(m_data, addr) | bit); } /****************************************** @@ -4243,7 +4243,7 @@ void z8002_device::Z66_0000_imm4_addr() { GET_BIT(OP0); GET_ADDR(OP1); - if (RDMEM_B(*m_data, addr) & bit) CLR_Z; else SET_Z; + if (RDMEM_B(m_data, addr) & bit) CLR_Z; else SET_Z; } /****************************************** @@ -4256,7 +4256,7 @@ void z8002_device::Z66_ddN0_imm4_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - if (RDMEM_B(*m_data, addr) & bit) CLR_Z; else SET_Z; + if (RDMEM_B(m_data, addr) & bit) CLR_Z; else SET_Z; } /****************************************** @@ -4267,7 +4267,7 @@ void z8002_device::Z67_0000_imm4_addr() { GET_BIT(OP0); GET_ADDR(OP1); - if (RDMEM_W(*m_data, addr) & bit) CLR_Z; else SET_Z; + if (RDMEM_W(m_data, addr) & bit) CLR_Z; else SET_Z; } /****************************************** @@ -4280,7 +4280,7 @@ void z8002_device::Z67_ddN0_imm4_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - if (RDMEM_W(*m_data, addr) & bit) CLR_Z; else SET_Z; + if (RDMEM_W(m_data, addr) & bit) CLR_Z; else SET_Z; } /****************************************** @@ -4291,7 +4291,7 @@ void z8002_device::Z68_0000_imm4m1_addr() { GET_I4M1(OP0,NIB3); GET_ADDR(OP1); - WRMEM_B(*m_data, addr, INCB(RDMEM_B(*m_data, addr), i4p1)); + WRMEM_B(m_data, addr, INCB(RDMEM_B(m_data, addr), i4p1)); } /****************************************** @@ -4304,7 +4304,7 @@ void z8002_device::Z68_ddN0_imm4m1_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, INCB(RDMEM_B(*m_data, addr), i4p1)); + WRMEM_B(m_data, addr, INCB(RDMEM_B(m_data, addr), i4p1)); } /****************************************** @@ -4315,7 +4315,7 @@ void z8002_device::Z69_0000_imm4m1_addr() { GET_I4M1(OP0,NIB3); GET_ADDR(OP1); - WRMEM_W(*m_data, addr, INCW(RDMEM_W(*m_data, addr), i4p1)); + WRMEM_W(m_data, addr, INCW(RDMEM_W(m_data, addr), i4p1)); } /****************************************** @@ -4328,7 +4328,7 @@ void z8002_device::Z69_ddN0_imm4m1_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, INCW(RDMEM_W(*m_data, addr), i4p1)); + WRMEM_W(m_data, addr, INCW(RDMEM_W(m_data, addr), i4p1)); } /****************************************** @@ -4339,7 +4339,7 @@ void z8002_device::Z6A_0000_imm4m1_addr() { GET_I4M1(OP0,NIB3); GET_ADDR(OP1); - WRMEM_B(*m_data, addr, DECB(RDMEM_B(*m_data, addr), i4p1)); + WRMEM_B(m_data, addr, DECB(RDMEM_B(m_data, addr), i4p1)); } /****************************************** @@ -4352,7 +4352,7 @@ void z8002_device::Z6A_ddN0_imm4m1_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, DECB(RDMEM_B(*m_data, addr), i4p1)); + WRMEM_B(m_data, addr, DECB(RDMEM_B(m_data, addr), i4p1)); } /****************************************** @@ -4363,7 +4363,7 @@ void z8002_device::Z6B_0000_imm4m1_addr() { GET_I4M1(OP0,NIB3); GET_ADDR(OP1); - WRMEM_W(*m_data, addr, DECW(RDMEM_W(*m_data, addr), i4p1)); + WRMEM_W(m_data, addr, DECW(RDMEM_W(m_data, addr), i4p1)); } /****************************************** @@ -4376,7 +4376,7 @@ void z8002_device::Z6B_ddN0_imm4m1_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, DECW(RDMEM_W(*m_data, addr), i4p1)); + WRMEM_W(m_data, addr, DECW(RDMEM_W(m_data, addr), i4p1)); } /****************************************** @@ -4387,8 +4387,8 @@ void z8002_device::Z6C_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - uint8_t tmp = RDMEM_B(*m_data, addr); - WRMEM_B(*m_data, addr, RB(dst)); + uint8_t tmp = RDMEM_B(m_data, addr); + WRMEM_B(m_data, addr, RB(dst)); RB(dst) = tmp; } @@ -4403,8 +4403,8 @@ void z8002_device::Z6C_ssN0_dddd_addr() GET_ADDR(OP1); uint8_t tmp; addr = addr_add(addr, RW(src)); - tmp = RDMEM_B(*m_data, addr); - WRMEM_B(*m_data, addr, RB(dst)); + tmp = RDMEM_B(m_data, addr); + WRMEM_B(m_data, addr, RB(dst)); RB(dst) = tmp; } @@ -4416,8 +4416,8 @@ void z8002_device::Z6D_0000_dddd_addr() { GET_DST(OP0,NIB3); GET_ADDR(OP1); - uint16_t tmp = RDMEM_W(*m_data, addr); - WRMEM_W(*m_data, addr, RW(dst)); + uint16_t tmp = RDMEM_W(m_data, addr); + WRMEM_W(m_data, addr, RW(dst)); RW(dst) = tmp; } @@ -4432,8 +4432,8 @@ void z8002_device::Z6D_ssN0_dddd_addr() GET_ADDR(OP1); uint16_t tmp; addr = addr_add(addr, RW(src)); - tmp = RDMEM_W(*m_data, addr); - WRMEM_W(*m_data, addr, RW(dst)); + tmp = RDMEM_W(m_data, addr); + WRMEM_W(m_data, addr, RW(dst)); RW(dst) = tmp; } @@ -4445,7 +4445,7 @@ void z8002_device::Z6E_0000_ssss_addr() { GET_SRC(OP0,NIB3); GET_ADDR(OP1); - WRMEM_B(*m_data, addr, RB(src)); + WRMEM_B(m_data, addr, RB(src)); } /****************************************** @@ -4458,7 +4458,7 @@ void z8002_device::Z6E_ddN0_ssss_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_B(*m_data, addr, RB(src)); + WRMEM_B(m_data, addr, RB(src)); } /****************************************** @@ -4469,7 +4469,7 @@ void z8002_device::Z6F_0000_ssss_addr() { GET_SRC(OP0,NIB3); GET_ADDR(OP1); - WRMEM_W(*m_data, addr, RW(src)); + WRMEM_W(m_data, addr, RW(src)); } /****************************************** @@ -4482,7 +4482,7 @@ void z8002_device::Z6F_ddN0_ssss_addr() GET_DST(OP0,NIB2); GET_ADDR(OP1); addr = addr_add(addr, RW(dst)); - WRMEM_W(*m_data, addr, RW(src)); + WRMEM_W(m_data, addr, RW(src)); } /****************************************** @@ -4634,12 +4634,12 @@ void z8002_device::Z79_0000_0000_addr() GET_ADDR(OP1); uint16_t fcw; if (get_segmented_mode()) { - fcw = RDMEM_W(*m_data, addr + 2); - set_pc(segmented_addr(RDMEM_L(*m_data, addr + 4))); + fcw = RDMEM_W(m_data, addr + 2); + set_pc(segmented_addr(RDMEM_L(m_data, addr + 4))); } else { - fcw = RDMEM_W(*m_data, addr); - set_pc(RDMEM_W(*m_data, (uint16_t)(addr + 2))); + fcw = RDMEM_W(m_data, addr); + set_pc(RDMEM_W(m_data, (uint16_t)(addr + 2))); } CHANGE_FCW(fcw); /* check for user/system mode change */ } @@ -4656,12 +4656,12 @@ void z8002_device::Z79_ssN0_0000_addr() uint16_t fcw; addr = addr_add(addr, RW(src)); if (get_segmented_mode()) { - fcw = RDMEM_W(*m_data, addr + 2); - set_pc(segmented_addr(RDMEM_L(*m_data, addr + 4))); + fcw = RDMEM_W(m_data, addr + 2); + set_pc(segmented_addr(RDMEM_L(m_data, addr + 4))); } else { - fcw = RDMEM_W(*m_data, addr); - m_pc = RDMEM_W(*m_data, (uint16_t)(addr + 2)); + fcw = RDMEM_W(m_data, addr); + m_pc = RDMEM_W(m_data, (uint16_t)(addr + 2)); } if ((fcw ^ m_fcw) & F_SEG) printf("ldps 3 (0x%05x): changing from %ssegmented mode to %ssegmented mode\n", m_pc, (fcw & F_SEG) ? "non-" : "", (fcw & F_SEG) ? "" : "non-"); CHANGE_FCW(fcw); /* check for user/system mode change */ @@ -6064,7 +6064,7 @@ void z8002_device::ZB8_ddN0_0000_0000_rrrr_ssN0_0000() GET_DST(OP0,NIB2); GET_SRC(OP1,NIB2); GET_CNT(OP1,NIB1); - address_space &dstspace = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &dstspace = dst == SP ? m_stack : m_data; uint32_t dstaddr = addr_from_reg(dst); uint8_t xlt = RDBX_B(src, RDMEM_B(dstspace, dstaddr)); WRMEM_B(dstspace, dstaddr, xlt); @@ -6082,7 +6082,7 @@ void z8002_device::ZB8_ddN0_0100_0000_rrrr_ssN0_0000() GET_DST(OP0,NIB2); GET_SRC(OP1,NIB2); GET_CNT(OP1,NIB1); - address_space &dstspace = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &dstspace = dst == SP ? m_stack : m_data; uint32_t dstaddr = addr_from_reg(dst); uint8_t xlt = RDBX_B(src, RDMEM_B(dstspace, dstaddr)); WRMEM_B(dstspace, dstaddr, xlt); @@ -6100,7 +6100,7 @@ void z8002_device::ZB8_ddN0_1000_0000_rrrr_ssN0_0000() GET_DST(OP0,NIB2); GET_SRC(OP1,NIB2); GET_CNT(OP1,NIB1); - address_space &dstspace = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &dstspace = dst == SP ? m_stack : m_data; uint32_t dstaddr = addr_from_reg(dst); uint8_t xlt = RDBX_B(src, RDMEM_B(dstspace, dstaddr)); WRMEM_B(dstspace, dstaddr, xlt); @@ -6118,7 +6118,7 @@ void z8002_device::ZB8_ddN0_1100_0000_rrrr_ssN0_0000() GET_DST(OP0,NIB2); GET_SRC(OP1,NIB2); GET_CNT(OP1,NIB1); - address_space &dstspace = dst == SP ? *m_stack : *m_data; + memory_access<23, 1, 0, ENDIANNESS_BIG>::specific &dstspace = dst == SP ? m_stack : m_data; uint32_t dstaddr = addr_from_reg(dst); uint8_t xlt = RDBX_B(src, RDMEM_B(dstspace, dstaddr)); WRMEM_B(dstspace, dstaddr, xlt); |