diff options
| author | 2026-03-04 10:51:38 +0100 | |
|---|---|---|
| committer | 2026-03-04 10:51:38 +0100 | |
| commit | 6e04a8591ee71f6508e082423f0fc5e8a0e69e67 (patch) | |
| tree | 3b835d299cb7011b56cc4b107599a80cdbd7d88d | |
| parent | 16c5ff55a4a63c45665d4ec6ef0ec68e2c09e1e2 (diff) | |
6502: m_ify
70 files changed, 7465 insertions, 7465 deletions
diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp index 0e160c9a0b9..b78f4f8888c 100644 --- a/src/devices/cpu/m6502/deco16.cpp +++ b/src/devices/cpu/m6502/deco16.cpp @@ -21,8 +21,8 @@ DEFINE_DEVICE_TYPE(DECO16, deco16_device, "deco16", "Data East DECO16") deco16_device::deco16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, DECO16, tag, owner, clock), - io(nullptr), - io_config("io", ENDIANNESS_LITTLE, 8, 16) + m_io(nullptr), + m_io_config("io", ENDIANNESS_LITTLE, 8, 16) { } @@ -33,25 +33,25 @@ std::unique_ptr<util::disasm_interface> deco16_device::create_disassembler() void deco16_device::device_start() { - mintf = std::make_unique<mi_default>(); + m_mintf = std::make_unique<mi_default>(); init(); - io = &space(AS_IO); + m_io = &space(AS_IO); } device_memory_interface::space_config_vector deco16_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), - std::make_pair(AS_OPCODES, &sprogram_config), - std::make_pair(AS_IO, &io_config) + std::make_pair(AS_PROGRAM, &m_program_config), + std::make_pair(AS_OPCODES, &m_sprogram_config), + std::make_pair(AS_IO, &m_io_config) }; else return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), - std::make_pair(AS_IO, &io_config) + std::make_pair(AS_PROGRAM, &m_program_config), + std::make_pair(AS_IO, &m_io_config) }; } diff --git a/src/devices/cpu/m6502/deco16.h b/src/devices/cpu/m6502/deco16.h index 60c0e2a4eaf..4418b0a3235 100644 --- a/src/devices/cpu/m6502/deco16.h +++ b/src/devices/cpu/m6502/deco16.h @@ -24,8 +24,8 @@ public: virtual void do_exec_partial() override; protected: - address_space *io; - address_space_config io_config; + address_space *m_io; + address_space_config m_io_config; virtual space_config_vector memory_space_config() const override; virtual void device_start() override ATTR_COLD; diff --git a/src/devices/cpu/m6502/gew12.cpp b/src/devices/cpu/m6502/gew12.cpp index 4d77abc7771..bef22ff7855 100644 --- a/src/devices/cpu/m6502/gew12.cpp +++ b/src/devices/cpu/m6502/gew12.cpp @@ -25,7 +25,7 @@ gew12_device::gew12_device(const machine_config &mconfig, const char *tag, devic , m_rom(*this, DEVICE_SELF) , m_bank(*this, "bank%u", 0U) { - program_config.m_internal_map = address_map_constructor(FUNC(gew12_device::internal_map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(gew12_device::internal_map), this); } diff --git a/src/devices/cpu/m6502/gew7.cpp b/src/devices/cpu/m6502/gew7.cpp index 76e1378d9e8..b501d4684cf 100644 --- a/src/devices/cpu/m6502/gew7.cpp +++ b/src/devices/cpu/m6502/gew7.cpp @@ -26,7 +26,7 @@ gew7_device::gew7_device(const machine_config &mconfig, const char *tag, device_ , m_bank(*this, "bank%u", 0U) , m_pcm(*this, "pcm") { - program_config.m_internal_map = address_map_constructor(FUNC(gew7_device::internal_map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(gew7_device::internal_map), this); std::fill(std::begin(m_port_force_bits), std::end(m_port_force_bits), 0); std::fill(std::begin(m_port_force_mask), std::end(m_port_force_mask), 0); diff --git a/src/devices/cpu/m6502/m3745x.cpp b/src/devices/cpu/m6502/m3745x.cpp index a8552e51d4b..7871f22d90d 100644 --- a/src/devices/cpu/m6502/m3745x.cpp +++ b/src/devices/cpu/m6502/m3745x.cpp @@ -98,7 +98,7 @@ void m3745x_device::device_reset() { m740_device::device_reset(); - SP = 0x01ff; // we have the "traditional" stack in page 1, not 0 like some M740 derivatives + m_SP = 0x01ff; // we have the "traditional" stack in page 1, not 0 like some M740 derivatives for (auto & elem : m_timers) { diff --git a/src/devices/cpu/m6502/m37640.cpp b/src/devices/cpu/m6502/m37640.cpp index 7341e283178..c614aef135a 100644 --- a/src/devices/cpu/m6502/m37640.cpp +++ b/src/devices/cpu/m6502/m37640.cpp @@ -12,7 +12,7 @@ m37640_device::m37640_device(const machine_config &mconfig, const char *tag, dev m740_device(mconfig, M37640, tag, owner, clock), m_mode(mode) { - program_config.m_internal_map = address_map_constructor(FUNC(m37640_device::map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(m37640_device::map), this); } void m37640_device::device_start() diff --git a/src/devices/cpu/m6502/m4510.cpp b/src/devices/cpu/m6502/m4510.cpp index 4e6f97b56e4..7f881067a50 100644 --- a/src/devices/cpu/m6502/m4510.cpp +++ b/src/devices/cpu/m6502/m4510.cpp @@ -19,26 +19,26 @@ DEFINE_DEVICE_TYPE(M4510, m4510_device, "m4510", "CSG 4510") m4510_device::m4510_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m65ce02_device(mconfig, M4510, tag, owner, clock), - map_enable(0), - nomap(false), - read_port(*this, 0), - write_port(*this), - dir(0), port(0), drive(0) -{ - program_config.m_addr_width = 20; - program_config.m_logaddr_width = 16; - program_config.m_page_shift = 13; - sprogram_config.m_addr_width = 20; - sprogram_config.m_logaddr_width = 16; - sprogram_config.m_page_shift = 13; - pullup = 0x00; - floating = 0x00; + m_map_enable(0), + m_nomap(false), + m_read_port(*this, 0), + m_write_port(*this), + m_dir(0), m_port(0), m_drive(0) +{ + m_program_config.m_addr_width = 20; + m_program_config.m_logaddr_width = 16; + m_program_config.m_page_shift = 13; + m_sprogram_config.m_addr_width = 20; + m_sprogram_config.m_logaddr_width = 16; + m_sprogram_config.m_page_shift = 13; + m_pullup = 0x00; + m_floating = 0x00; } void m4510_device::set_pulls(uint8_t _pullup, uint8_t _floating) { - pullup = _pullup; - floating = _floating; + m_pullup = _pullup; + m_floating = _floating; } std::unique_ptr<util::disasm_interface> m4510_device::create_disassembler() @@ -48,67 +48,67 @@ std::unique_ptr<util::disasm_interface> m4510_device::create_disassembler() void m4510_device::init_port() { - save_item(NAME(pullup)); - save_item(NAME(floating)); - save_item(NAME(dir)); - save_item(NAME(port)); - save_item(NAME(drive)); + save_item(NAME(m_pullup)); + save_item(NAME(m_floating)); + save_item(NAME(m_dir)); + save_item(NAME(m_port)); + save_item(NAME(m_drive)); } void m4510_device::device_start() { - mintf = std::make_unique<mi_4510>(this); + m_mintf = std::make_unique<mi_4510>(this); m65ce02_device::init(); init_port(); - save_item(NAME(map_offset)); - save_item(NAME(map_enable)); + save_item(NAME(m_map_offset)); + save_item(NAME(m_map_enable)); } void m4510_device::device_reset() { - map_offset[0] = map_offset[1] = 0; - map_enable = 0; - nomap = true; + m_map_offset[0] = m_map_offset[1] = 0; + m_map_enable = 0; + m_nomap = true; m65ce02_device::device_reset(); - dir = 0xff; - port = 0xff; - drive = 0xff; + m_dir = 0xff; + m_port = 0xff; + m_drive = 0xff; update_port(); } void m4510_device::update_port() { - drive = (port & dir) | (drive & ~dir); - write_port((port & dir) | (pullup & ~dir)); + m_drive = (m_port & m_dir) | (m_drive & ~m_dir); + m_write_port((m_port & m_dir) | (m_pullup & ~m_dir)); } uint8_t m4510_device::get_port() { - return (port & dir) | (pullup & ~dir); + return (m_port & m_dir) | (m_pullup & ~m_dir); } uint8_t m4510_device::dir_r() { - return dir; + return m_dir; } uint8_t m4510_device::port_r() { - return ((read_port() | (floating & drive)) & ~dir) | (port & dir); + return ((m_read_port() | (m_floating & m_drive)) & ~m_dir) | (m_port & m_dir); } void m4510_device::dir_w(uint8_t data) { - dir = data; + m_dir = data; update_port(); } void m4510_device::port_w(uint8_t data) { - port = data; + m_port = data; update_port(); } @@ -125,46 +125,46 @@ bool m4510_device::memory_translate(int spacenum, int intention, offs_t &address m4510_device::mi_4510::mi_4510(m4510_device *_base) { - base = _base; + m_base = _base; } uint8_t m4510_device::mi_4510::read(uint16_t adr) { - uint8_t res = program.read_byte(base->map(adr)); + uint8_t res = m_program.read_byte(m_base->map(adr)); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); return res; } uint8_t m4510_device::mi_4510::read_sync(uint16_t adr) { - uint8_t res = csprogram.read_byte(base->map(adr)); + uint8_t res = m_csprogram.read_byte(m_base->map(adr)); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); return res; } uint8_t m4510_device::mi_4510::read_arg(uint16_t adr) { - uint8_t res = cprogram.read_byte(base->map(adr)); + uint8_t res = m_cprogram.read_byte(m_base->map(adr)); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); return res; } void m4510_device::mi_4510::write(uint16_t adr, uint8_t val) { - program.write_byte(base->map(adr), val); + m_program.write_byte(m_base->map(adr), val); if(adr == 0x0000) - base->dir_w(val); + m_base->dir_w(val); else if(adr == 0x0001) - base->port_w(val); + m_base->port_w(val); } #include "cpu/m6502/m4510.hxx" diff --git a/src/devices/cpu/m6502/m4510.h b/src/devices/cpu/m6502/m4510.h index c0e21977c2b..9bd856a9130 100644 --- a/src/devices/cpu/m6502/m4510.h +++ b/src/devices/cpu/m6502/m4510.h @@ -24,22 +24,22 @@ public: virtual void do_exec_full() override; virtual void do_exec_partial() override; - bool get_nomap() const { return nomap; } + bool get_nomap() const { return m_nomap; } uint8_t get_port(); void set_pulls(uint8_t pullup, uint8_t pulldown); - auto read_callback() { return read_port.bind(); } - auto write_callback() { return write_port.bind(); } + auto read_callback() { return m_read_port.bind(); } + auto write_callback() { return m_write_port.bind(); } protected: - uint32_t map_offset[2]; - uint8_t map_enable; - bool nomap; + uint32_t m_map_offset[2]; + uint8_t m_map_enable; + bool m_nomap; class mi_4510 : public memory_interface { public: - m4510_device *base; + m4510_device *m_base; mi_4510(m4510_device *base); virtual ~mi_4510() {} @@ -49,21 +49,21 @@ protected: virtual void write(uint16_t adr, uint8_t val) override; }; - devcb_read8 read_port; - devcb_write8 write_port; + devcb_read8 m_read_port; + devcb_write8 m_write_port; - uint8_t pullup, floating, dir, port, drive; + uint8_t m_pullup, m_floating, m_dir, m_port, m_drive; virtual void device_start() override ATTR_COLD; virtual void device_reset() override ATTR_COLD; virtual bool memory_translate(int spacenum, int intention, offs_t &address, address_space *&target_space) override; inline uint32_t map(uint16_t adr) { - if(map_enable & (1 << (adr >> 13))) { - nomap = false; - return adr + map_offset[adr >> 15]; + if(m_map_enable & (1 << (adr >> 13))) { + m_nomap = false; + return adr + m_map_offset[adr >> 15]; } - nomap = true; + m_nomap = true; return adr; } diff --git a/src/devices/cpu/m6502/m50734.cpp b/src/devices/cpu/m6502/m50734.cpp index af58690aa29..98e6e99e541 100644 --- a/src/devices/cpu/m6502/m50734.cpp +++ b/src/devices/cpu/m6502/m50734.cpp @@ -42,7 +42,7 @@ m50734_device::m50734_device(const machine_config &mconfig, const char *tag, dev , m_tx_count(0) , m_tx_reload(0xffff) { - program_config.m_internal_map = address_map_constructor(FUNC(m50734_device::internal_map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(m50734_device::internal_map), this); } device_memory_interface::space_config_vector m50734_device::memory_space_config() const @@ -136,7 +136,7 @@ void m50734_device::device_start() void m50734_device::device_reset() { m740_device::device_reset(); - SP = 0x01ff; + m_SP = 0x01ff; // Reset port registers std::fill(std::begin(m_port_direction), std::end(m_port_direction), 0x00); diff --git a/src/devices/cpu/m6502/m6500_1.cpp b/src/devices/cpu/m6502/m6500_1.cpp index 8aa30f08c89..ce4a44e90d2 100644 --- a/src/devices/cpu/m6502/m6500_1.cpp +++ b/src/devices/cpu/m6502/m6500_1.cpp @@ -111,7 +111,7 @@ m6500_1_device::m6500_1_device(machine_config const &mconfig, char const *tag, d , m_uc{ 0U } , m_lc{ 0U } { - program_config.m_internal_map = address_map_constructor(FUNC(m6500_1_device::memory_map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(m6500_1_device::memory_map), this); } @@ -168,7 +168,7 @@ void m6500_1_device::device_reset() { m6502_mcu_device_base<m6502_device>::device_reset(); - SP = 0x003fU; + m_SP = 0x003fU; internal_update(); diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp index e72fd74459a..1fce493dc43 100644 --- a/src/devices/cpu/m6502/m6502.cpp +++ b/src/devices/cpu/m6502/m6502.cpp @@ -27,106 +27,106 @@ m6512_device::m6512_device(const machine_config &mconfig, const char *tag, devic m6502_device::m6502_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : cpu_device(mconfig, type, tag, owner, clock), - sync_w(*this), - program_config("program", ENDIANNESS_LITTLE, 8, 16), - sprogram_config("decrypted_opcodes", ENDIANNESS_LITTLE, 8, 16), - mintf(nullptr), - uses_custom_memory_interface(false) + m_sync_w(*this), + m_program_config("program", ENDIANNESS_LITTLE, 8, 16), + m_sprogram_config("decrypted_opcodes", ENDIANNESS_LITTLE, 8, 16), + m_mintf(nullptr), + m_uses_custom_memory_interface(false) { } void m6502_device::device_start() { - if(!uses_custom_memory_interface) - mintf = space(AS_PROGRAM).addr_width() > 14 ? std::make_unique<mi_default>() : std::make_unique<mi_default14>(); + if(!m_uses_custom_memory_interface) + m_mintf = space(AS_PROGRAM).addr_width() > 14 ? std::make_unique<mi_default>() : std::make_unique<mi_default14>(); init(); } void m6502_device::init() { - if(mintf) { - space(AS_PROGRAM).cache(mintf->cprogram); - space(has_space(AS_OPCODES) ? AS_OPCODES : AS_PROGRAM).cache(mintf->csprogram); + if(m_mintf) { + space(AS_PROGRAM).cache(m_mintf->m_cprogram); + space(has_space(AS_OPCODES) ? AS_OPCODES : AS_PROGRAM).cache(m_mintf->m_csprogram); // specific group 1-14 or 15-31 if(space(AS_PROGRAM).addr_width() > 14) - space(AS_PROGRAM).specific(mintf->program); + space(AS_PROGRAM).specific(m_mintf->m_program); else - space(AS_PROGRAM).specific(mintf->program14); + space(AS_PROGRAM).specific(m_mintf->m_program14); } - state_add(STATE_GENPC, "GENPC", XPC).callexport().noshow(); - state_add(STATE_GENPCBASE, "CURPC", XPC).callexport().noshow(); - state_add(STATE_GENFLAGS, "GENFLAGS", P).callimport().formatstr("%6s").noshow(); - state_add(M6502_PC, "PC", NPC).callimport(); - state_add(M6502_A, "A", A); - state_add(M6502_X, "X", X); - state_add(M6502_Y, "Y", Y); - state_add(M6502_P, "P", P).callimport(); - state_add(M6502_S, "SP", SP); - state_add(M6502_IR, "IR", IR); - - save_item(NAME(PC)); - save_item(NAME(NPC)); - save_item(NAME(PPC)); - save_item(NAME(A)); - save_item(NAME(X)); - save_item(NAME(Y)); - save_item(NAME(P)); - save_item(NAME(SP)); - save_item(NAME(TMP)); - save_item(NAME(TMP2)); - save_item(NAME(IR)); - save_item(NAME(nmi_state)); - save_item(NAME(irq_state)); - save_item(NAME(apu_irq_state)); - save_item(NAME(v_state)); - save_item(NAME(nmi_pending)); - save_item(NAME(irq_taken)); - save_item(NAME(inst_state)); - save_item(NAME(inst_substate)); - save_item(NAME(inst_state_base)); - save_item(NAME(inhibit_interrupts)); - - set_icountptr(icount); - - XPC = 0x0000; - PPC = 0x0000; - PC = 0x0000; - NPC = 0x0000; - A = 0x00; - X = 0x80; - Y = 0x00; - P = 0x36; - SP = 0x0100; - TMP = 0x0000; - TMP2 = 0x00; - IR = 0x00; - nmi_state = false; - irq_state = false; - apu_irq_state = false; - v_state = false; - nmi_pending = false; - irq_taken = false; - inst_state = STATE_RESET; - inst_substate = 0; - inst_state_base = 0; - sync = false; - inhibit_interrupts = false; - count_before_instruction_step = 0; + state_add(STATE_GENPC, "GENPC", m_XPC).callexport().noshow(); + state_add(STATE_GENPCBASE, "CURPC", m_XPC).callexport().noshow(); + state_add(STATE_GENFLAGS, "GENFLAGS", m_P).callimport().formatstr("%6s").noshow(); + state_add(M6502_PC, "PC", m_NPC).callimport(); + state_add(M6502_A, "A", m_A); + state_add(M6502_X, "X", m_X); + state_add(M6502_Y, "Y", m_Y); + state_add(M6502_P, "P", m_P).callimport(); + state_add(M6502_S, "SP", m_SP); + state_add(M6502_IR, "IR", m_IR); + + save_item(NAME(m_PC)); + save_item(NAME(m_NPC)); + save_item(NAME(m_PPC)); + save_item(NAME(m_A)); + save_item(NAME(m_X)); + save_item(NAME(m_Y)); + save_item(NAME(m_P)); + save_item(NAME(m_SP)); + save_item(NAME(m_TMP)); + save_item(NAME(m_TMP2)); + save_item(NAME(m_IR)); + save_item(NAME(m_nmi_state)); + save_item(NAME(m_irq_state)); + save_item(NAME(m_apu_irq_state)); + save_item(NAME(m_v_state)); + save_item(NAME(m_nmi_pending)); + save_item(NAME(m_irq_taken)); + save_item(NAME(m_inst_state)); + save_item(NAME(m_inst_substate)); + save_item(NAME(m_inst_state_base)); + save_item(NAME(m_inhibit_interrupts)); + + set_icountptr(m_icount); + + m_XPC = 0x0000; + m_PPC = 0x0000; + m_PC = 0x0000; + m_NPC = 0x0000; + m_A = 0x00; + m_X = 0x80; + m_Y = 0x00; + m_P = 0x36; + m_SP = 0x0100; + m_TMP = 0x0000; + m_TMP2 = 0x00; + m_IR = 0x00; + m_nmi_state = false; + m_irq_state = false; + m_apu_irq_state = false; + m_v_state = false; + m_nmi_pending = false; + m_irq_taken = false; + m_inst_state = STATE_RESET; + m_inst_substate = 0; + m_inst_state_base = 0; + m_sync = false; + m_inhibit_interrupts = false; + m_count_before_instruction_step = 0; } void m6502_device::device_reset() { - inst_state = STATE_RESET; - inst_substate = 0; - inst_state_base = 0; - nmi_pending = false; - irq_taken = false; - sync = false; - sync_w(CLEAR_LINE); - inhibit_interrupts = false; + m_inst_state = STATE_RESET; + m_inst_substate = 0; + m_inst_state_base = 0; + m_nmi_pending = false; + m_irq_taken = false; + m_sync = false; + m_sync_w(CLEAR_LINE); + m_inhibit_interrupts = false; } @@ -147,44 +147,44 @@ bool m6502_device::execute_input_edge_triggered(int inputnum) const noexcept void m6502_device::do_adc_d(uint8_t val) { - uint8_t c = P & F_C ? 1 : 0; - P &= ~(F_N|F_V|F_Z|F_C); - uint8_t al = (A & 15) + (val & 15) + c; + uint8_t c = m_P & F_C ? 1 : 0; + m_P &= ~(F_N|F_V|F_Z|F_C); + uint8_t al = (m_A & 15) + (val & 15) + c; if(al > 9) al += 6; - uint8_t ah = (A >> 4) + (val >> 4) + (al > 15); - if(!uint8_t(A + val + c)) - P |= F_Z; + uint8_t ah = (m_A >> 4) + (val >> 4) + (al > 15); + if(!uint8_t(m_A + val + c)) + m_P |= F_Z; else if(ah & 8) - P |= F_N; - if(~(A^val) & (A^(ah << 4)) & 0x80) - P |= F_V; + m_P |= F_N; + if(~(m_A^val) & (m_A^(ah << 4)) & 0x80) + m_P |= F_V; if(ah > 9) ah += 6; if(ah > 15) - P |= F_C; - A = (ah << 4) | (al & 15); + m_P |= F_C; + m_A = (ah << 4) | (al & 15); } void m6502_device::do_adc_nd(uint8_t val) { uint16_t sum; - sum = A + val + (P & F_C ? 1 : 0); - P &= ~(F_N|F_V|F_Z|F_C); + sum = m_A + val + (m_P & F_C ? 1 : 0); + m_P &= ~(F_N|F_V|F_Z|F_C); if(!uint8_t(sum)) - P |= F_Z; + m_P |= F_Z; else if(int8_t(sum) < 0) - P |= F_N; - if(~(A^val) & (A^sum) & 0x80) - P |= F_V; + m_P |= F_N; + if(~(m_A^val) & (m_A^sum) & 0x80) + m_P |= F_V; if(sum & 0xff00) - P |= F_C; - A = sum; + m_P |= F_C; + m_A = sum; } void m6502_device::do_adc(uint8_t val) { - if(P & F_D) + if(m_P & F_D) do_adc_d(val); else do_adc_nd(val); @@ -192,49 +192,49 @@ void m6502_device::do_adc(uint8_t val) void m6502_device::do_arr_nd() { - bool c = P & F_C; - P &= ~(F_N|F_Z|F_C|F_V); - A >>= 1; + bool c = m_P & F_C; + m_P &= ~(F_N|F_Z|F_C|F_V); + m_A >>= 1; if(c) - A |= 0x80; - if(!A) - P |= F_Z; - else if(int8_t(A)<0) - P |= F_N; - if(A & 0x40) - P |= F_V|F_C; - if(A & 0x20) - P ^= F_V; + m_A |= 0x80; + if(!m_A) + m_P |= F_Z; + else if(int8_t(m_A)<0) + m_P |= F_N; + if(m_A & 0x40) + m_P |= F_V|F_C; + if(m_A & 0x20) + m_P ^= F_V; } void m6502_device::do_arr_d() { // The adc/ror interaction gives an extremely weird result - bool c = P & F_C; - P &= ~(F_N|F_Z|F_C|F_V); - uint8_t a = A >> 1; + bool c = m_P & F_C; + m_P &= ~(F_N|F_Z|F_C|F_V); + uint8_t a = m_A >> 1; if(c) a |= 0x80; if(!a) - P |= F_Z; + m_P |= F_Z; else if(int8_t(a) < 0) - P |= F_N; - if((a ^ A) & 0x40) - P |= F_V; + m_P |= F_N; + if((a ^ m_A) & 0x40) + m_P |= F_V; - if((A & 0x0f) >= 0x05) + if((m_A & 0x0f) >= 0x05) a = ((a + 6) & 0x0f) | (a & 0xf0); - if((A & 0xf0) >= 0x50) { + if((m_A & 0xf0) >= 0x50) { a += 0x60; - P |= F_C; + m_P |= F_C; } - A = a; + m_A = a; } void m6502_device::do_arr() { - if(P & F_D) + if(m_P & F_D) do_arr_d(); else do_arr_nd(); @@ -242,56 +242,56 @@ void m6502_device::do_arr() void m6502_device::do_cmp(uint8_t val1, uint8_t val2) { - P &= ~(F_N|F_Z|F_C); + m_P &= ~(F_N|F_Z|F_C); uint16_t r = val1-val2; if(!r) - P |= F_Z; + m_P |= F_Z; else if(int8_t(r) < 0) - P |= F_N; + m_P |= F_N; if(!(r & 0xff00)) - P |= F_C; + m_P |= F_C; } void m6502_device::do_sbc_d(uint8_t val) { - uint8_t c = P & F_C ? 0 : 1; - P &= ~(F_N|F_V|F_Z|F_C); - uint16_t diff = A - val - c; - uint8_t al = (A & 15) - (val & 15) - c; + uint8_t c = m_P & F_C ? 0 : 1; + m_P &= ~(F_N|F_V|F_Z|F_C); + uint16_t diff = m_A - val - c; + uint8_t al = (m_A & 15) - (val & 15) - c; if(int8_t(al) < 0) al -= 6; - uint8_t ah = (A >> 4) - (val >> 4) - (int8_t(al) < 0); + uint8_t ah = (m_A >> 4) - (val >> 4) - (int8_t(al) < 0); if(!uint8_t(diff)) - P |= F_Z; + m_P |= F_Z; else if(diff & 0x80) - P |= F_N; - if((A^val) & (A^diff) & 0x80) - P |= F_V; + m_P |= F_N; + if((m_A^val) & (m_A^diff) & 0x80) + m_P |= F_V; if(!(diff & 0xff00)) - P |= F_C; + m_P |= F_C; if(int8_t(ah) < 0) ah -= 6; - A = (ah << 4) | (al & 15); + m_A = (ah << 4) | (al & 15); } void m6502_device::do_sbc_nd(uint8_t val) { - uint16_t diff = A - val - (P & F_C ? 0 : 1); - P &= ~(F_N|F_V|F_Z|F_C); + uint16_t diff = m_A - val - (m_P & F_C ? 0 : 1); + m_P &= ~(F_N|F_V|F_Z|F_C); if(!uint8_t(diff)) - P |= F_Z; + m_P |= F_Z; else if(int8_t(diff) < 0) - P |= F_N; - if((A^val) & (A^diff) & 0x80) - P |= F_V; + m_P |= F_N; + if((m_A^val) & (m_A^diff) & 0x80) + m_P |= F_V; if(!(diff & 0xff00)) - P |= F_C; - A = diff; + m_P |= F_C; + m_A = diff; } void m6502_device::do_sbc(uint8_t val) { - if(P & F_D) + if(m_P & F_D) do_sbc_d(val); else do_sbc_nd(val); @@ -299,82 +299,82 @@ void m6502_device::do_sbc(uint8_t val) void m6502_device::do_bit(uint8_t val) { - P &= ~(F_N|F_Z|F_V); - uint8_t r = A & val; + m_P &= ~(F_N|F_Z|F_V); + uint8_t r = m_A & val; if(!r) - P |= F_Z; + m_P |= F_Z; if(val & 0x80) - P |= F_N; + m_P |= F_N; if(val & 0x40) - P |= F_V; + m_P |= F_V; } uint8_t m6502_device::do_asl(uint8_t v) { - P &= ~(F_N|F_Z|F_C); + m_P &= ~(F_N|F_Z|F_C); uint8_t r = v<<1; if(!r) - P |= F_Z; + m_P |= F_Z; else if(int8_t(r) < 0) - P |= F_N; + m_P |= F_N; if(v & 0x80) - P |= F_C; + m_P |= F_C; return r; } uint8_t m6502_device::do_lsr(uint8_t v) { - P &= ~(F_N|F_Z|F_C); + m_P &= ~(F_N|F_Z|F_C); if(v & 1) - P |= F_C; + m_P |= F_C; v >>= 1; if(!v) - P |= F_Z; + m_P |= F_Z; return v; } uint8_t m6502_device::do_ror(uint8_t v) { - bool c = P & F_C; - P &= ~(F_N|F_Z|F_C); + bool c = m_P & F_C; + m_P &= ~(F_N|F_Z|F_C); if(v & 1) - P |= F_C; + m_P |= F_C; v >>= 1; if(c) v |= 0x80; if(!v) - P |= F_Z; + m_P |= F_Z; else if(int8_t(v)<0) - P |= F_N; + m_P |= F_N; return v; } uint8_t m6502_device::do_rol(uint8_t v) { - bool c = P & F_C; - P &= ~(F_N|F_Z|F_C); + bool c = m_P & F_C; + m_P &= ~(F_N|F_Z|F_C); if(v & 0x80) - P |= F_C; + m_P |= F_C; v <<= 1; if(c) v |= 0x01; if(!v) - P |= F_Z; + m_P |= F_Z; else if(int8_t(v)<0) - P |= F_N; + m_P |= F_N; return v; } uint8_t m6502_device::do_asr(uint8_t v) { - P &= ~(F_N|F_Z|F_C); + m_P &= ~(F_N|F_Z|F_C); if(v & 1) - P |= F_C; + m_P |= F_C; v >>= 1; if(!v) - P |= F_Z; + m_P |= F_Z; else if(v & 0x40) { - P |= F_N; + m_P |= F_N; v |= 0x80; } return v; @@ -387,15 +387,15 @@ offs_t m6502_device::pc_to_external(u16 pc) void m6502_device::execute_run() { - if(inst_substate) + if(m_inst_substate) do_exec_partial(); - while(icount > 0) { - if(inst_state < 0xff00) { - PPC = NPC; - inst_state = IR | inst_state_base; + while(m_icount > 0) { + if(m_inst_state < 0xff00) { + m_PPC = m_NPC; + m_inst_state = m_IR | m_inst_state_base; if(debugger_enabled()) - debugger_instruction_hook(pc_to_external(NPC)); + debugger_instruction_hook(pc_to_external(m_NPC)); } do_exec_full(); } @@ -404,17 +404,17 @@ void m6502_device::execute_run() void m6502_device::execute_set_input(int inputnum, int state) { switch(inputnum) { - case IRQ_LINE: irq_state = state == ASSERT_LINE; break; - case APU_IRQ_LINE: apu_irq_state = state == ASSERT_LINE; break; + case IRQ_LINE: m_irq_state = state == ASSERT_LINE; break; + case APU_IRQ_LINE: m_apu_irq_state = state == ASSERT_LINE; break; case NMI_LINE: - if(machine().time() > attotime::zero && !nmi_state && state == ASSERT_LINE) - nmi_pending = true; - nmi_state = state == ASSERT_LINE; + if(machine().time() > attotime::zero && !m_nmi_state && state == ASSERT_LINE) + m_nmi_pending = true; + m_nmi_state = state == ASSERT_LINE; break; case V_LINE: - if(machine().time() > attotime::zero && !v_state && state == ASSERT_LINE) - P |= F_V; - v_state = state == ASSERT_LINE; + if(machine().time() > attotime::zero && !m_v_state && state == ASSERT_LINE) + m_P |= F_V; + m_v_state = state == ASSERT_LINE; break; } } @@ -424,12 +424,12 @@ device_memory_interface::space_config_vector m6502_device::memory_space_config() { if(has_configured_map(AS_OPCODES)) return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), - std::make_pair(AS_OPCODES, &sprogram_config) + std::make_pair(AS_PROGRAM, &m_program_config), + std::make_pair(AS_OPCODES, &m_sprogram_config) }; else return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config) + std::make_pair(AS_PROGRAM, &m_program_config) }; } @@ -439,16 +439,16 @@ void m6502_device::state_import(const device_state_entry &entry) switch(entry.index()) { case STATE_GENFLAGS: case M6502_P: - P = P | (F_B|F_E); + m_P = m_P | (F_B|F_E); break; case M6502_PC: - PC = NPC; - irq_taken = false; + m_PC = m_NPC; + m_irq_taken = false; prefetch_start(); - IR = mintf->read_sync(PC); + m_IR = m_mintf->read_sync(m_PC); prefetch_end(); - PPC = NPC; - inst_state = IR | inst_state_base; + m_PPC = m_NPC; + m_inst_state = m_IR | m_inst_state_base; break; } } @@ -456,8 +456,8 @@ void m6502_device::state_import(const device_state_entry &entry) void m6502_device::state_export(const device_state_entry &entry) { switch(entry.index()) { - case STATE_GENPC: XPC = pc_to_external(PPC); break; - case STATE_GENPCBASE: XPC = pc_to_external(NPC); break; + case STATE_GENPC: m_XPC = pc_to_external(m_PPC); break; + case STATE_GENPCBASE: m_XPC = pc_to_external(m_NPC); break; } } @@ -467,52 +467,52 @@ void m6502_device::state_string_export(const device_state_entry &entry, std::str case STATE_GENFLAGS: case M6502_P: str = string_format("%c%c%c%c%c%c", - P & F_N ? 'N' : '.', - P & F_V ? 'V' : '.', - P & F_D ? 'D' : '.', - P & F_I ? 'I' : '.', - P & F_Z ? 'Z' : '.', - P & F_C ? 'C' : '.'); + m_P & F_N ? 'N' : '.', + m_P & F_V ? 'V' : '.', + m_P & F_D ? 'D' : '.', + m_P & F_I ? 'I' : '.', + m_P & F_Z ? 'Z' : '.', + m_P & F_C ? 'C' : '.'); break; } } void m6502_device::prefetch_start() { - sync = true; - if(!sync_w.isunset()) - sync_w(ASSERT_LINE); - NPC = PC; + m_sync = true; + if(!m_sync_w.isunset()) + m_sync_w(ASSERT_LINE); + m_NPC = m_PC; } void m6502_device::prefetch_end() { - sync = false; - if(!sync_w.isunset()) - sync_w(CLEAR_LINE); + m_sync = false; + if(!m_sync_w.isunset()) + m_sync_w(CLEAR_LINE); - if((nmi_pending || ((irq_state || apu_irq_state) && !(P & F_I))) && !inhibit_interrupts) { - irq_taken = true; - IR = 0x00; + if((m_nmi_pending || ((m_irq_state || m_apu_irq_state) && !(m_P & F_I))) && !m_inhibit_interrupts) { + m_irq_taken = true; + m_IR = 0x00; } else - PC++; + m_PC++; } void m6502_device::prefetch_end_noirq() { - sync = false; - if(!sync_w.isunset()) - sync_w(CLEAR_LINE); - PC++; + m_sync = false; + if(!m_sync_w.isunset()) + m_sync_w(CLEAR_LINE); + m_PC++; } void m6502_device::set_nz(uint8_t v) { - P &= ~(F_Z|F_N); + m_P &= ~(F_Z|F_N); if(v & 0x80) - P |= F_N; + m_P |= F_N; if(!v) - P |= F_Z; + m_P |= F_Z; } std::unique_ptr<util::disasm_interface> m6502_device::create_disassembler() @@ -533,32 +533,32 @@ void m6502_device::memory_interface::write_9(uint16_t adr, uint8_t val) uint8_t m6502_device::mi_default::read(uint16_t adr) { - return program.read_byte(adr); + return m_program.read_byte(adr); } uint8_t m6502_device::mi_default::read_sync(uint16_t adr) { - return csprogram.read_byte(adr); + return m_csprogram.read_byte(adr); } uint8_t m6502_device::mi_default::read_arg(uint16_t adr) { - return cprogram.read_byte(adr); + return m_cprogram.read_byte(adr); } void m6502_device::mi_default::write(uint16_t adr, uint8_t val) { - program.write_byte(adr, val); + m_program.write_byte(adr, val); } uint8_t m6502_device::mi_default14::read(uint16_t adr) { - return program14.read_byte(adr); + return m_program14.read_byte(adr); } void m6502_device::mi_default14::write(uint16_t adr, uint8_t val) { - program14.write_byte(adr, val); + m_program14.write_byte(adr, val); } diff --git a/src/devices/cpu/m6502/m6502.h b/src/devices/cpu/m6502/m6502.h index 112630dfd50..5ac1d0dc47b 100644 --- a/src/devices/cpu/m6502/m6502.h +++ b/src/devices/cpu/m6502/m6502.h @@ -25,9 +25,9 @@ public: class memory_interface { public: - memory_access<16, 0, 0, ENDIANNESS_LITTLE>::cache cprogram, csprogram; - memory_access<16, 0, 0, ENDIANNESS_LITTLE>::specific program; - memory_access<14, 0, 0, ENDIANNESS_LITTLE>::specific program14; + memory_access<16, 0, 0, ENDIANNESS_LITTLE>::cache m_cprogram, m_csprogram; + memory_access<16, 0, 0, ENDIANNESS_LITTLE>::specific m_program; + memory_access<14, 0, 0, ENDIANNESS_LITTLE>::specific m_program14; virtual ~memory_interface() = default; virtual uint8_t read(uint16_t adr) = 0; @@ -41,22 +41,22 @@ public: m6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void set_address_width(int width, bool custom_interface) { - program_config.m_addr_width = width; - sprogram_config.m_addr_width = width; - uses_custom_memory_interface = custom_interface; + m_program_config.m_addr_width = width; + m_sprogram_config.m_addr_width = width; + m_uses_custom_memory_interface = custom_interface; } void set_custom_memory_interface(std::unique_ptr<memory_interface> interface) { - mintf = std::move(interface); + m_mintf = std::move(interface); } - bool get_sync() const { return sync; } + bool get_sync() const { return m_sync; } - auto sync_cb() { return sync_w.bind(); } - - devcb_write_line sync_w; + auto sync_cb() { return m_sync_w.bind(); } protected: + devcb_write_line m_sync_w; + m6502_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); class mi_default : public memory_interface { @@ -116,40 +116,40 @@ protected: // device_disasm_interface overrides virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - address_space_config program_config, sprogram_config; - - uint16_t PPC; /* previous program counter */ - uint16_t NPC; /* next start-of-instruction program counter */ - uint16_t PC; /* program counter */ - uint16_t SP; /* stack pointer (always 100 - 1FF) */ - uint16_t TMP; /* temporary internal values */ - uint8_t TMP2; /* another temporary internal value, 8 bits this time */ - uint8_t A; /* Accumulator */ - uint8_t X; /* X index register */ - uint8_t Y; /* Y index register */ - uint8_t P; /* Processor status */ - uint8_t IR; /* Prefetched instruction register */ - int inst_state_base; /* Current instruction bank */ - - std::unique_ptr<memory_interface> mintf; - int inst_state, inst_substate; - int icount, bcount, count_before_instruction_step; - bool nmi_state, irq_state, apu_irq_state, v_state; - bool nmi_pending, irq_taken, sync, inhibit_interrupts; - bool uses_custom_memory_interface; - - uint8_t read(uint16_t adr) { return mintf->read(adr); } - uint8_t read_9(uint16_t adr) { return mintf->read_9(adr); } - void write(uint16_t adr, uint8_t val) { mintf->write(adr, val); } - void write_9(uint16_t adr, uint8_t val) { mintf->write_9(adr, val); } - uint8_t read_arg(uint16_t adr) { return mintf->read_arg(adr); } - uint8_t read_pc() { return mintf->read_arg(PC); } + address_space_config m_program_config, m_sprogram_config; + + uint16_t m_PPC; /* previous program counter */ + uint16_t m_NPC; /* next start-of-instruction program counter */ + uint16_t m_PC; /* program counter */ + uint16_t m_SP; /* stack pointer (always 100 - 1FF) */ + uint16_t m_TMP; /* temporary internal values */ + uint8_t m_TMP2; /* another temporary internal value, 8 bits this time */ + uint8_t m_A; /* Accumulator */ + uint8_t m_X; /* X index register */ + uint8_t m_Y; /* Y index register */ + uint8_t m_P; /* Processor status */ + uint8_t m_IR; /* Prefetched instruction register */ + int m_inst_state_base; /* Current instruction bank */ + + std::unique_ptr<memory_interface> m_mintf; + int m_inst_state, m_inst_substate; + int m_icount, m_bcount, m_count_before_instruction_step; + bool m_nmi_state, m_irq_state, m_apu_irq_state, m_v_state; + bool m_nmi_pending, m_irq_taken, m_sync, m_inhibit_interrupts; + bool m_uses_custom_memory_interface; + + uint8_t read(uint16_t adr) { return m_mintf->read(adr); } + uint8_t read_9(uint16_t adr) { return m_mintf->read_9(adr); } + void write(uint16_t adr, uint8_t val) { m_mintf->write(adr, val); } + void write_9(uint16_t adr, uint8_t val) { m_mintf->write_9(adr, val); } + uint8_t read_arg(uint16_t adr) { return m_mintf->read_arg(adr); } + uint8_t read_pc() { return m_mintf->read_arg(m_PC); } void prefetch_start(); void prefetch_end(); void prefetch_end_noirq(); void set_nz(uint8_t v); - u32 XPC; + u32 m_XPC; virtual offs_t pc_to_external(u16 pc); // For paged PCs virtual void do_exec_full(); virtual void do_exec_partial(); @@ -159,8 +159,8 @@ protected: static inline uint16_t set_l(uint16_t base, uint8_t val) { return (base & 0xff00) | val; } static inline uint16_t set_h(uint16_t base, uint8_t val) { return (base & 0x00ff) | (val << 8); } - inline void dec_SP() { SP = set_l(SP, SP-1); } - inline void inc_SP() { SP = set_l(SP, SP+1); } + inline void dec_SP() { m_SP = set_l(m_SP, m_SP-1); } + inline void inc_SP() { m_SP = set_l(m_SP, m_SP+1); } void do_adc_d(uint8_t val); void do_adc_nd(uint8_t val); diff --git a/src/devices/cpu/m6502/m6502d.cpp b/src/devices/cpu/m6502/m6502d.cpp index f299f77cfc6..afae76eeff5 100644 --- a/src/devices/cpu/m6502/m6502d.cpp +++ b/src/devices/cpu/m6502/m6502d.cpp @@ -12,7 +12,7 @@ #include "m6502d.h" #include "cpu/m6502/m6502d.hxx" -m6502_base_disassembler::m6502_base_disassembler(const disasm_entry *_table) : table(_table) +m6502_base_disassembler::m6502_base_disassembler(const disasm_entry *_table) : m_table(_table) { } @@ -28,11 +28,11 @@ u32 m6502_base_disassembler::opcode_alignment() const offs_t m6502_base_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) { - const disasm_entry &e = table[opcodes.r8(pc) | get_instruction_bank()]; - uint32_t flags = e.flags | SUPPORTED; - util::stream_format(stream, "%s", e.opcode); + const disasm_entry &e = m_table[opcodes.r8(pc) | get_instruction_bank()]; + uint32_t flags = e.m_flags | SUPPORTED; + util::stream_format(stream, "%s", e.m_opcode); - switch(e.mode) { + switch(e.m_mode) { case DASM_non: flags |= 1; break; @@ -207,7 +207,7 @@ offs_t m6502_base_disassembler::disassemble(std::ostream &stream, offs_t pc, con break; default: - fprintf(stderr, "Unhandled dasm mode %d\n", e.mode); + fprintf(stderr, "Unhandled dasm mode %d\n", e.m_mode); abort(); } return flags; diff --git a/src/devices/cpu/m6502/m6502d.h b/src/devices/cpu/m6502/m6502d.h index d975afab7c7..81093820d7f 100644 --- a/src/devices/cpu/m6502/m6502d.h +++ b/src/devices/cpu/m6502/m6502d.h @@ -17,9 +17,9 @@ class m6502_base_disassembler : public util::disasm_interface { public: struct disasm_entry { - const char *opcode; - int mode; - offs_t flags; + const char *m_opcode; + int m_mode; + offs_t m_flags; }; m6502_base_disassembler(const disasm_entry *table); @@ -70,7 +70,7 @@ protected: virtual u32 get_instruction_bank() const; private: - const disasm_entry *table; + const disasm_entry *m_table; }; class m6502_disassembler : public m6502_base_disassembler diff --git a/src/devices/cpu/m6502/m6502make.py b/src/devices/cpu/m6502/m6502make.py index 99b4320cc11..bbe540b3566 100755 --- a/src/devices/cpu/m6502/m6502make.py +++ b/src/devices/cpu/m6502/m6502make.py @@ -33,11 +33,11 @@ def load_opcodes(fname): # append instruction to last opcode if line == '\tprefetch();': opcodes[-1][1].append("\tprefetch_start();") - opcodes[-1][1].append("\tIR = mintf->read_sync(PC);") + opcodes[-1][1].append("\tm_IR = m_mintf->read_sync(m_PC);") opcodes[-1][1].append("\tprefetch_end();") elif line == '\tprefetch_noirq();': opcodes[-1][1].append("\tprefetch_start();") - opcodes[-1][1].append("\tIR = mintf->read_sync(PC);") + opcodes[-1][1].append("\tm_IR = m_mintf->read_sync(m_PC);") opcodes[-1][1].append("\tprefetch_end_noirq();") else: opcodes[-1][1].append(line) @@ -86,19 +86,19 @@ def save_opcodes(f, device, opcodes): line_type = identify_line_type(ins) if line_type == "EAT": emit(f, "\tdebugger_wait_hook();") - emit(f, "\ticount = 0;") - emit(f, "\tinst_substate = %d;" % substate) + emit(f, "\tm_icount = 0;") + emit(f, "\tm_inst_substate = %d;" % substate) emit(f, "\treturn;") substate += 1 elif line_type == "MEMORY": emit(f, ins) - emit(f, "\ticount--;") - emit(f, "\tif(icount <= 0) {") + emit(f, "\tm_icount--;") + emit(f, "\tif(m_icount <= 0) {") emit(f, "\t\tif(access_to_be_redone()) {") - emit(f, "\t\t\ticount++;") - emit(f, "\t\t\tinst_substate = %d;" % substate) + emit(f, "\t\t\tm_icount++;") + emit(f, "\t\t\tm_inst_substate = %d;" % substate) emit(f, "\t\t} else") - emit(f, "\t\t\tinst_substate = %d;" % (substate+1)) + emit(f, "\t\t\tm_inst_substate = %d;" % (substate+1)) emit(f, "\t\treturn;") emit(f, "\t}") substate += 2 @@ -109,15 +109,15 @@ def save_opcodes(f, device, opcodes): emit(f, "void %s_device::%s_partial()" % (device, name)) emit(f, "{") - emit(f, "\tswitch(inst_substate) {") + emit(f, "\tswitch(m_inst_substate) {") emit(f, "case 0:") substate = 1 for ins in instructions: line_type = identify_line_type(ins) if line_type == "EAT": emit(f, "\tdebugger_wait_hook();") - emit(f, "\ticount = 0;") - emit(f, "\tinst_substate = %d;" % substate) + emit(f, "\tm_icount = 0;") + emit(f, "\tm_inst_substate = %d;" % substate) emit(f, "\treturn;") emit(f, "\tcase %d:;" % substate) substate += 1 @@ -125,13 +125,13 @@ def save_opcodes(f, device, opcodes): emit(f, "\t[[fallthrough]];") emit(f, "case %d:" % substate) emit(f, ins) - emit(f, "\ticount--;") - emit(f, "\tif(icount <= 0) {") + emit(f, "\tm_icount--;") + emit(f, "\tif(m_icount <= 0) {") emit(f, "\t\tif(access_to_be_redone()) {") - emit(f, "\t\t\ticount++;") - emit(f, "\t\t\tinst_substate = %d;" % substate) + emit(f, "\t\t\tm_icount++;") + emit(f, "\t\t\tm_inst_substate = %d;" % substate) emit(f, "\t\t} else") - emit(f, "\t\t\tinst_substate = %d;" % (substate+1)) + emit(f, "\t\t\tm_inst_substate = %d;" % (substate+1)) emit(f, "\t\treturn;") emit(f, "\t}") emit(f, "\t[[fallthrough]];") @@ -141,7 +141,7 @@ def save_opcodes(f, device, opcodes): emit(f, ins) emit(f, "\tbreak;") emit(f, "}") - emit(f, "\tinst_substate = 0;") + emit(f, "\tm_inst_substate = 0;") emit(f, "}") emit(f, "") @@ -149,7 +149,7 @@ def save_opcodes(f, device, opcodes): DO_EXEC_FULL_PROLOG="""\ void %(device)s_device::do_exec_full() { -\tswitch(inst_state) { +\tswitch(m_inst_state) { """ DO_EXEC_FULL_EPILOG="""\ @@ -160,7 +160,7 @@ DO_EXEC_FULL_EPILOG="""\ DO_EXEC_PARTIAL_PROLOG="""\ void %(device)s_device::do_exec_partial() { -\tswitch(inst_state) { +\tswitch(m_inst_state) { """ DO_EXEC_PARTIAL_EPILOG="""\ diff --git a/src/devices/cpu/m6502/m6502mcu.ipp b/src/devices/cpu/m6502/m6502mcu.ipp index d4fd6833f54..2ebd60ff961 100644 --- a/src/devices/cpu/m6502/m6502mcu.ipp +++ b/src/devices/cpu/m6502/m6502mcu.ipp @@ -26,10 +26,10 @@ m6502_mcu_device_base<Base>::m6502_mcu_device_base(const machine_config &mconfig template <typename Base> void m6502_mcu_device_base<Base>::recompute_bcount(uint64_t event_time) { - if(!event_time || event_time >= this->total_cycles() + this->icount) - this->bcount = 0; + if(!event_time || event_time >= this->total_cycles() + this->m_icount) + this->m_bcount = 0; else - this->bcount = this->total_cycles() + this->icount - event_time; + this->m_bcount = this->total_cycles() + this->m_icount - event_time; } template <typename Base> @@ -37,38 +37,38 @@ void m6502_mcu_device_base<Base>::execute_run() { internal_update(this->total_cycles()); - this->icount -= this->count_before_instruction_step; - if(this->icount < 0) { - this->count_before_instruction_step = -this->icount; - this->icount = 0; + this->m_icount -= this->m_count_before_instruction_step; + if(this->m_icount < 0) { + this->m_count_before_instruction_step = -this->m_icount; + this->m_icount = 0; } else - this->count_before_instruction_step = 0; + this->m_count_before_instruction_step = 0; - while(this->bcount && this->icount <= this->bcount) - internal_update(this->total_cycles() + this->icount - this->bcount); + while(this->m_bcount && this->m_icount <= this->m_bcount) + internal_update(this->total_cycles() + this->m_icount - this->m_bcount); - if(this->icount > 0 && this->inst_substate) + if(this->m_icount > 0 && this->m_inst_substate) this->do_exec_partial(); - while(this->icount > 0) { - while(this->icount > this->bcount) { - if(this->inst_state < 0xff00) { - this->PPC = this->NPC; - this->inst_state = this->IR | this->inst_state_base; + while(this->m_icount > 0) { + while(this->m_icount > this->m_bcount) { + if(this->m_inst_state < 0xff00) { + this->m_PPC = this->m_NPC; + this->m_inst_state = this->m_IR | this->m_inst_state_base; if(this->debugger_enabled()) - this->debugger_instruction_hook(this->NPC); + this->debugger_instruction_hook(this->m_NPC); } this->do_exec_full(); } - if(this->icount > 0) - while(this->bcount && this->icount <= this->bcount) - internal_update(this->total_cycles() + this->icount - this->bcount); - if(this->icount > 0 && this->inst_substate) + if(this->m_icount > 0) + while(this->m_bcount && this->m_icount <= this->m_bcount) + internal_update(this->total_cycles() + this->m_icount - this->m_bcount); + if(this->m_icount > 0 && this->m_inst_substate) this->do_exec_partial(); } - if(this->icount < 0) { - this->count_before_instruction_step = -this->icount; - this->icount = 0; + if(this->m_icount < 0) { + this->m_count_before_instruction_step = -this->m_icount; + this->m_icount = 0; } } diff --git a/src/devices/cpu/m6502/m6503.cpp b/src/devices/cpu/m6502/m6503.cpp index efaeca3b5a2..613326766e1 100644 --- a/src/devices/cpu/m6502/m6503.cpp +++ b/src/devices/cpu/m6502/m6503.cpp @@ -18,8 +18,8 @@ DEFINE_DEVICE_TYPE(M6503, m6503_device, "m6503", "MOS Technology 6503") m6503_device::m6503_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M6503, tag, owner, clock) { - program_config.m_addr_width = 12; - program_config.m_logaddr_width = 12; - sprogram_config.m_addr_width = 12; - sprogram_config.m_logaddr_width = 12; + m_program_config.m_addr_width = 12; + m_program_config.m_logaddr_width = 12; + m_sprogram_config.m_addr_width = 12; + m_sprogram_config.m_logaddr_width = 12; } diff --git a/src/devices/cpu/m6502/m6504.cpp b/src/devices/cpu/m6502/m6504.cpp index 3a859621917..5d4b389db1b 100644 --- a/src/devices/cpu/m6502/m6504.cpp +++ b/src/devices/cpu/m6502/m6504.cpp @@ -18,8 +18,8 @@ DEFINE_DEVICE_TYPE(M6504, m6504_device, "m6504", "MOS Technology 6504") m6504_device::m6504_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M6504, tag, owner, clock) { - program_config.m_addr_width = 13; - program_config.m_logaddr_width = 13; - sprogram_config.m_addr_width = 13; - sprogram_config.m_logaddr_width = 13; + m_program_config.m_addr_width = 13; + m_program_config.m_logaddr_width = 13; + m_sprogram_config.m_addr_width = 13; + m_sprogram_config.m_logaddr_width = 13; } diff --git a/src/devices/cpu/m6502/m6507.cpp b/src/devices/cpu/m6502/m6507.cpp index ae1c984f1d1..0a30487c9bd 100644 --- a/src/devices/cpu/m6502/m6507.cpp +++ b/src/devices/cpu/m6502/m6507.cpp @@ -18,8 +18,8 @@ DEFINE_DEVICE_TYPE(M6507, m6507_device, "m6507", "MOS Technology 6507") m6507_device::m6507_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, M6507, tag, owner, clock) { - program_config.m_addr_width = 13; - program_config.m_logaddr_width = 13; - sprogram_config.m_addr_width = 13; - sprogram_config.m_logaddr_width = 13; + m_program_config.m_addr_width = 13; + m_program_config.m_logaddr_width = 13; + m_sprogram_config.m_addr_width = 13; + m_sprogram_config.m_logaddr_width = 13; } diff --git a/src/devices/cpu/m6502/m6509.cpp b/src/devices/cpu/m6502/m6509.cpp index dd4eca50c83..bb6fa45b5d0 100644 --- a/src/devices/cpu/m6502/m6509.cpp +++ b/src/devices/cpu/m6502/m6509.cpp @@ -15,31 +15,31 @@ DEFINE_DEVICE_TYPE(M6509, m6509_device, "m6509", "MOS Technology 6509") m6509_device::m6509_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - m6502_device(mconfig, M6509, tag, owner, clock), bank_i(0), bank_y(0) + m6502_device(mconfig, M6509, tag, owner, clock), m_bank_i(0), m_bank_y(0) { - program_config.m_addr_width = 20; - program_config.m_logaddr_width = 20; - sprogram_config.m_addr_width = 20; - sprogram_config.m_logaddr_width = 20; + m_program_config.m_addr_width = 20; + m_program_config.m_logaddr_width = 20; + m_sprogram_config.m_addr_width = 20; + m_sprogram_config.m_logaddr_width = 20; } void m6509_device::device_start() { - mintf = std::make_unique<mi_6509>(this); + m_mintf = std::make_unique<mi_6509>(this); init(); - state_add(STATE_GENPC, "GENPC", XPC).callexport().noshow(); - state_add(STATE_GENPCBASE, "CURPC", XPC).callexport().noshow(); - state_add(M6509_BI, "BI", bank_i); - state_add(M6509_BY, "BY", bank_y); + state_add(STATE_GENPC, "GENPC", m_XPC).callexport().noshow(); + state_add(STATE_GENPCBASE, "CURPC", m_XPC).callexport().noshow(); + state_add(M6509_BI, "BI", m_bank_i); + state_add(M6509_BY, "BY", m_bank_y); } void m6509_device::device_reset() { m6502_device::device_reset(); - bank_i = 0x0f; - bank_y = 0x0f; + m_bank_i = 0x0f; + m_bank_y = 0x0f; } offs_t m6509_device::pc_to_external(u16 pc) @@ -54,65 +54,65 @@ std::unique_ptr<util::disasm_interface> m6509_device::create_disassembler() m6509_device::mi_6509::mi_6509(m6509_device *_base) { - base = _base; + m_base = _base; } uint8_t m6509_device::mi_6509::read(uint16_t adr) { - uint8_t res = program.read_byte(base->adr_in_bank_i(adr)); + uint8_t res = m_program.read_byte(m_base->adr_in_bank_i(adr)); if(adr == 0x0000) - res = base->bank_i_r(); + res = m_base->bank_i_r(); else if(adr == 0x0001) - res = base->bank_y_r(); + res = m_base->bank_y_r(); return res; } uint8_t m6509_device::mi_6509::read_sync(uint16_t adr) { - uint8_t res = csprogram.read_byte(base->adr_in_bank_i(adr)); + uint8_t res = m_csprogram.read_byte(m_base->adr_in_bank_i(adr)); if(adr == 0x0000) - res = base->bank_i_r(); + res = m_base->bank_i_r(); else if(adr == 0x0001) - res = base->bank_y_r(); + res = m_base->bank_y_r(); return res; } uint8_t m6509_device::mi_6509::read_arg(uint16_t adr) { - uint8_t res = cprogram.read_byte(base->adr_in_bank_i(adr)); + uint8_t res = m_cprogram.read_byte(m_base->adr_in_bank_i(adr)); if(adr == 0x0000) - res = base->bank_i_r(); + res = m_base->bank_i_r(); else if(adr == 0x0001) - res = base->bank_y_r(); + res = m_base->bank_y_r(); return res; } uint8_t m6509_device::mi_6509::read_9(uint16_t adr) { - uint8_t res = program.read_byte(base->adr_in_bank_y(adr)); + uint8_t res = m_program.read_byte(m_base->adr_in_bank_y(adr)); if(adr == 0x0000) - res = base->bank_i_r(); + res = m_base->bank_i_r(); else if(adr == 0x0001) - res = base->bank_y_r(); + res = m_base->bank_y_r(); return res; } void m6509_device::mi_6509::write(uint16_t adr, uint8_t val) { - program.write_byte(base->adr_in_bank_i(adr), val); + m_program.write_byte(m_base->adr_in_bank_i(adr), val); if(adr == 0x0000) - base->bank_i_w(val); + m_base->bank_i_w(val); else if(adr == 0x0001) - base->bank_y_w(val); + m_base->bank_y_w(val); } void m6509_device::mi_6509::write_9(uint16_t adr, uint8_t val) { - program.write_byte(base->adr_in_bank_y(adr), val); + m_program.write_byte(m_base->adr_in_bank_y(adr), val); if(adr == 0x0000) - base->bank_i_w(val); + m_base->bank_i_w(val); else if(adr == 0x0001) - base->bank_y_w(val); + m_base->bank_y_w(val); } #include "cpu/m6502/m6509.hxx" diff --git a/src/devices/cpu/m6502/m6509.h b/src/devices/cpu/m6502/m6509.h index 383bfcc178a..d805df802cf 100644 --- a/src/devices/cpu/m6502/m6509.h +++ b/src/devices/cpu/m6502/m6509.h @@ -24,7 +24,7 @@ public: protected: class mi_6509 : public memory_interface { public: - m6509_device *base; + m6509_device *m_base; mi_6509(m6509_device *base); virtual ~mi_6509() {} @@ -40,15 +40,15 @@ protected: virtual void device_reset() override ATTR_COLD; virtual offs_t pc_to_external(u16 pc) override; - uint8_t bank_i, bank_y; + uint8_t m_bank_i, m_bank_y; - uint8_t bank_i_r() { return bank_i; } - uint8_t bank_y_r() { return bank_y; } - void bank_i_w(uint8_t data) { bank_i = data; } - void bank_y_w(uint8_t data) { bank_y = data; } + uint8_t bank_i_r() { return m_bank_i; } + uint8_t bank_y_r() { return m_bank_y; } + void bank_i_w(uint8_t data) { m_bank_i = data; } + void bank_y_w(uint8_t data) { m_bank_y = data; } - uint32_t adr_in_bank_i(uint16_t adr) { return adr | ((bank_i & 0xf) << 16); } - uint32_t adr_in_bank_y(uint16_t adr) { return adr | ((bank_y & 0xf) << 16); } + uint32_t adr_in_bank_i(uint16_t adr) { return adr | ((m_bank_i & 0xf) << 16); } + uint32_t adr_in_bank_y(uint16_t adr) { return adr | ((m_bank_y & 0xf) << 16); } #define O(o) void o ## _full(); void o ## _partial() diff --git a/src/devices/cpu/m6502/m6510.cpp b/src/devices/cpu/m6502/m6510.cpp index c54965a2f04..a5ba07f3743 100644 --- a/src/devices/cpu/m6502/m6510.cpp +++ b/src/devices/cpu/m6502/m6510.cpp @@ -25,18 +25,18 @@ m6510_device::m6510_device(const machine_config &mconfig, const char *tag, devic m6510_device::m6510_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, type, tag, owner, clock), - read_port(*this, 0), - write_port(*this), - dir(0), port(0), drive(0) + m_read_port(*this, 0), + m_write_port(*this), + m_dir(0), m_port(0), m_drive(0) { - pullup = 0x00; - floating = 0x00; + m_pullup = 0x00; + m_floating = 0x00; } void m6510_device::set_pulls(uint8_t _pullup, uint8_t _floating) { - pullup = _pullup; - floating = _floating; + m_pullup = _pullup; + m_floating = _floating; } std::unique_ptr<util::disasm_interface> m6510_device::create_disassembler() @@ -46,16 +46,16 @@ std::unique_ptr<util::disasm_interface> m6510_device::create_disassembler() void m6510_device::init_port() { - save_item(NAME(pullup)); - save_item(NAME(floating)); - save_item(NAME(dir)); - save_item(NAME(port)); - save_item(NAME(drive)); + save_item(NAME(m_pullup)); + save_item(NAME(m_floating)); + save_item(NAME(m_dir)); + save_item(NAME(m_port)); + save_item(NAME(m_drive)); } void m6510_device::device_start() { - mintf = std::make_unique<mi_6510>(this); + m_mintf = std::make_unique<mi_6510>(this); init(); init_port(); @@ -64,88 +64,88 @@ void m6510_device::device_start() void m6510_device::device_reset() { m6502_device::device_reset(); - dir = 0xff; - port = 0xff; - drive = 0xff; + m_dir = 0xff; + m_port = 0xff; + m_drive = 0xff; update_port(); } void m6510_device::update_port() { - drive = (port & dir) | (drive & ~dir); - write_port((port & dir) | (pullup & ~dir)); + m_drive = (m_port & m_dir) | (m_drive & ~m_dir); + m_write_port((m_port & m_dir) | (m_pullup & ~m_dir)); } uint8_t m6510_device::get_port() { - return (port & dir) | (pullup & ~dir); + return (m_port & m_dir) | (m_pullup & ~m_dir); } uint8_t m6510_device::dir_r() { - return dir; + return m_dir; } uint8_t m6510_device::port_r() { - return ((read_port() | (floating & drive)) & ~dir) | (port & dir); + return ((m_read_port() | (m_floating & m_drive)) & ~m_dir) | (m_port & m_dir); } void m6510_device::dir_w(uint8_t data) { - dir = data; + m_dir = data; update_port(); } void m6510_device::port_w(uint8_t data) { - port = data; + m_port = data; update_port(); } m6510_device::mi_6510::mi_6510(m6510_device *_base) { - base = _base; + m_base = _base; } uint8_t m6510_device::mi_6510::read(uint16_t adr) { - uint8_t res = program.read_byte(adr); + uint8_t res = m_program.read_byte(adr); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); return res; } uint8_t m6510_device::mi_6510::read_sync(uint16_t adr) { - uint8_t res = csprogram.read_byte(adr); + uint8_t res = m_csprogram.read_byte(adr); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); return res; } uint8_t m6510_device::mi_6510::read_arg(uint16_t adr) { - uint8_t res = cprogram.read_byte(adr); + uint8_t res = m_cprogram.read_byte(adr); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); return res; } void m6510_device::mi_6510::write(uint16_t adr, uint8_t val) { - program.write_byte(adr, val); + m_program.write_byte(adr, val); if(adr == 0x0000) - base->dir_w(val); + m_base->dir_w(val); else if(adr == 0x0001) - base->port_w(val); + m_base->port_w(val); } @@ -156,66 +156,66 @@ m6508_device::m6508_device(const machine_config &mconfig, const char *tag, devic void m6508_device::device_start() { - mintf = std::make_unique<mi_6508>(this); + m_mintf = std::make_unique<mi_6508>(this); init(); init_port(); - ram_page = make_unique_clear<uint8_t[]>(256); - save_pointer(NAME(ram_page), 256); + m_ram_page = make_unique_clear<uint8_t[]>(256); + save_pointer(NAME(m_ram_page), 256); } m6508_device::mi_6508::mi_6508(m6508_device *_base) { - base = _base; + m_base = _base; } uint8_t m6508_device::mi_6508::read(uint16_t adr) { - uint8_t res = program.read_byte(adr); + uint8_t res = m_program.read_byte(adr); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); else if(adr < 0x0200) - res = base->ram_page[adr & 0x00ff]; + res = m_base->m_ram_page[adr & 0x00ff]; return res; } uint8_t m6508_device::mi_6508::read_sync(uint16_t adr) { - uint8_t res = csprogram.read_byte(adr); + uint8_t res = m_csprogram.read_byte(adr); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); else if(adr < 0x0200) - res = base->ram_page[adr & 0x00ff]; + res = m_base->m_ram_page[adr & 0x00ff]; return res; } uint8_t m6508_device::mi_6508::read_arg(uint16_t adr) { - uint8_t res = cprogram.read_byte(adr); + uint8_t res = m_cprogram.read_byte(adr); if(adr == 0x0000) - res = base->dir_r(); + res = m_base->dir_r(); else if(adr == 0x0001) - res = base->port_r(); + res = m_base->port_r(); else if(adr < 0x0200) - res = base->ram_page[adr & 0x00ff]; + res = m_base->m_ram_page[adr & 0x00ff]; return res; } void m6508_device::mi_6508::write(uint16_t adr, uint8_t val) { - program.write_byte(adr, val); + m_program.write_byte(adr, val); if(adr == 0x0000) - base->dir_w(val); + m_base->dir_w(val); else if(adr == 0x0001) - base->port_w(val); + m_base->port_w(val); else if(adr < 0x0200) - base->ram_page[adr & 0x00ff] = val; + m_base->m_ram_page[adr & 0x00ff] = val; } diff --git a/src/devices/cpu/m6502/m6510.h b/src/devices/cpu/m6502/m6510.h index b7d4e585b86..04f8680b3ad 100644 --- a/src/devices/cpu/m6502/m6510.h +++ b/src/devices/cpu/m6502/m6510.h @@ -22,8 +22,8 @@ public: uint8_t get_port(); void set_pulls(uint8_t pullup, uint8_t pulldown); - auto read_callback() { return read_port.bind(); } - auto write_callback() { return write_port.bind(); } + auto read_callback() { return m_read_port.bind(); } + auto write_callback() { return m_write_port.bind(); } virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; virtual void do_exec_full() override; @@ -34,7 +34,7 @@ protected: class mi_6510 : public memory_interface { public: - m6510_device *base; + m6510_device *m_base; mi_6510(m6510_device *base); virtual ~mi_6510() {} @@ -44,10 +44,10 @@ protected: virtual void write(uint16_t adr, uint8_t val) override; }; - devcb_read8 read_port; - devcb_write8 write_port; + devcb_read8 m_read_port; + devcb_write8 m_write_port; - uint8_t pullup, floating, dir, port, drive; + uint8_t m_pullup, m_floating, m_dir, m_port, m_drive; virtual void device_start() override ATTR_COLD; virtual void device_reset() override ATTR_COLD; @@ -83,7 +83,7 @@ protected: class mi_6508 : public memory_interface { public: - m6508_device *base; + m6508_device *m_base; mi_6508(m6508_device *base); virtual ~mi_6508() {} @@ -93,7 +93,7 @@ protected: virtual void write(uint16_t adr, uint8_t val) override; }; - std::unique_ptr<uint8_t[]> ram_page; + std::unique_ptr<uint8_t[]> m_ram_page; }; enum { diff --git a/src/devices/cpu/m6502/m65ce02.cpp b/src/devices/cpu/m6502/m65ce02.cpp index 22e6bd5f3c5..a87cd0706fc 100644 --- a/src/devices/cpu/m6502/m65ce02.cpp +++ b/src/devices/cpu/m6502/m65ce02.cpp @@ -20,7 +20,7 @@ m65ce02_device::m65ce02_device(const machine_config &mconfig, const char *tag, d } m65ce02_device::m65ce02_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : - w65c02_device(mconfig, type, tag, owner, clock), TMP3(0), Z(0), B(0) + w65c02_device(mconfig, type, tag, owner, clock), m_TMP3(0), m_Z(0), m_B(0) { } @@ -32,19 +32,19 @@ std::unique_ptr<util::disasm_interface> m65ce02_device::create_disassembler() void m65ce02_device::init() { w65c02_device::init(); - state_add(M65CE02_Z, "Z", Z); - state_add(M65CE02_B, "B", B).callimport().formatstr("%2s"); - save_item(NAME(B)); - save_item(NAME(Z)); - save_item(NAME(TMP3)); - Z = 0x00; - B = 0x0000; - TMP3 = 0x0000; + state_add(M65CE02_Z, "Z", m_Z); + state_add(M65CE02_B, "B", m_B).callimport().formatstr("%2s"); + save_item(NAME(m_B)); + save_item(NAME(m_Z)); + save_item(NAME(m_TMP3)); + m_Z = 0x00; + m_B = 0x0000; + m_TMP3 = 0x0000; } void m65ce02_device::device_start() { - mintf = std::make_unique<mi_default>(); + m_mintf = std::make_unique<mi_default>(); init(); } @@ -52,8 +52,8 @@ void m65ce02_device::device_start() void m65ce02_device::device_reset() { w65c02_device::device_reset(); - Z = 0x00; - B = 0x0000; + m_Z = 0x00; + m_B = 0x0000; } void m65ce02_device::state_import(const device_state_entry &entry) @@ -61,10 +61,10 @@ void m65ce02_device::state_import(const device_state_entry &entry) switch(entry.index()) { case STATE_GENFLAGS: case M6502_P: - P = P | F_B; + m_P = m_P | F_B; break; case M65CE02_B: - B <<= 8; + m_B <<= 8; break; } } @@ -75,16 +75,16 @@ void m65ce02_device::state_string_export(const device_state_entry &entry, std::s case STATE_GENFLAGS: case M6502_P: str = string_format("%c%c%c%c%c%c%c", - P & F_N ? 'N' : '.', - P & F_V ? 'V' : '.', - P & F_E ? 'E' : '.', - P & F_D ? 'D' : '.', - P & F_I ? 'I' : '.', - P & F_Z ? 'Z' : '.', - P & F_C ? 'C' : '.'); + m_P & F_N ? 'N' : '.', + m_P & F_V ? 'V' : '.', + m_P & F_E ? 'E' : '.', + m_P & F_D ? 'D' : '.', + m_P & F_I ? 'I' : '.', + m_P & F_Z ? 'Z' : '.', + m_P & F_C ? 'C' : '.'); break; case M65CE02_B: - str = string_format("%02x", B >> 8); + str = string_format("%02x", m_B >> 8); break; } } diff --git a/src/devices/cpu/m6502/m65ce02.h b/src/devices/cpu/m6502/m65ce02.h index cf0a48e9a5b..ca9b34be6f9 100644 --- a/src/devices/cpu/m6502/m65ce02.h +++ b/src/devices/cpu/m6502/m65ce02.h @@ -25,9 +25,9 @@ public: protected: m65ce02_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - uint16_t TMP3; /* temporary internal values */ - uint8_t Z; /* Z index register */ - uint16_t B; /* Zero page base address (always xx00) */ + uint16_t m_TMP3; /* temporary internal values */ + uint8_t m_Z; /* Z index register */ + uint16_t m_B; /* Zero page base address (always xx00) */ virtual void init() override; virtual void device_start() override ATTR_COLD; @@ -35,8 +35,8 @@ protected: virtual void state_import(const device_state_entry &entry) override; virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; - inline void dec_SP_ce() { if(P & F_E) SP = set_l(SP, SP-1); else SP--; } - inline void inc_SP_ce() { if(P & F_E) SP = set_l(SP, SP+1); else SP++; } + inline void dec_SP_ce() { if(m_P & F_E) m_SP = set_l(m_SP, m_SP-1); else m_SP--; } + inline void inc_SP_ce() { if(m_P & F_E) m_SP = set_l(m_SP, m_SP+1); else m_SP++; } #define O(o) void o ## _full(); void o ## _partial() diff --git a/src/devices/cpu/m6502/m740.cpp b/src/devices/cpu/m6502/m740.cpp index 4e42db0cb67..0be79307895 100644 --- a/src/devices/cpu/m6502/m740.cpp +++ b/src/devices/cpu/m6502/m740.cpp @@ -18,7 +18,7 @@ m740_device::m740_device(const machine_config &mconfig, device_type type, const u32 m740_device::get_state_base() const { - return inst_state_base; + return m_inst_state_base; } std::unique_ptr<util::disasm_interface> m740_device::create_disassembler() @@ -38,10 +38,10 @@ void m740_device::device_reset() { m6502_device::device_reset(); - irq_state = false; + m_irq_state = false; m_irq_multiplex = 0; m_irq_vector = 0xfffc; - SP = 0x00ff; + m_SP = 0x00ff; } void m740_device::state_string_export(const device_state_entry &entry, std::string &str) const @@ -50,13 +50,13 @@ void m740_device::state_string_export(const device_state_entry &entry, std::stri case STATE_GENFLAGS: case M6502_P: str = string_format("%c%c%c%c%c%c%c", - P & F_N ? 'N' : '.', - P & F_V ? 'V' : '.', - P & F_T ? 'T' : '.', - P & F_D ? 'D' : '.', - P & F_I ? 'I' : '.', - P & F_Z ? 'Z' : '.', - P & F_C ? 'C' : '.'); + m_P & F_N ? 'N' : '.', + m_P & F_V ? 'V' : '.', + m_P & F_T ? 'T' : '.', + m_P & F_D ? 'D' : '.', + m_P & F_I ? 'I' : '.', + m_P & F_Z ? 'Z' : '.', + m_P & F_C ? 'C' : '.'); break; } } @@ -80,44 +80,44 @@ uint8_t m740_device::do_rrf(uint8_t in) void m740_device::do_sbc_dt(uint8_t val) { - uint8_t c = P & F_C ? 0 : 1; - P &= ~(F_N|F_V|F_Z|F_C); - uint16_t diff = TMP - val - c; - uint8_t al = (TMP & 15) - (val & 15) - c; + uint8_t c = m_P & F_C ? 0 : 1; + m_P &= ~(F_N|F_V|F_Z|F_C); + uint16_t diff = m_TMP - val - c; + uint8_t al = (m_TMP & 15) - (val & 15) - c; if(int8_t(al) < 0) al -= 6; - uint8_t ah = (TMP >> 4) - (val >> 4) - (int8_t(al) < 0); + uint8_t ah = (m_TMP >> 4) - (val >> 4) - (int8_t(al) < 0); if(!uint8_t(diff)) - P |= F_Z; + m_P |= F_Z; else if(diff & 0x80) - P |= F_N; - if((TMP^val) & (TMP^diff) & 0x80) - P |= F_V; + m_P |= F_N; + if((m_TMP^val) & (m_TMP^diff) & 0x80) + m_P |= F_V; if(!(diff & 0xff00)) - P |= F_C; + m_P |= F_C; if(int8_t(ah) < 0) ah -= 6; - TMP = (ah << 4) | (al & 15); + m_TMP = (ah << 4) | (al & 15); } void m740_device::do_sbc_ndt(uint8_t val) { - uint16_t diff = TMP - val - (P & F_C ? 0 : 1); - P &= ~(F_N|F_V|F_Z|F_C); + uint16_t diff = m_TMP - val - (m_P & F_C ? 0 : 1); + m_P &= ~(F_N|F_V|F_Z|F_C); if(!uint8_t(diff)) - P |= F_Z; + m_P |= F_Z; else if(int8_t(diff) < 0) - P |= F_N; - if((TMP^val) & (TMP^diff) & 0x80) - P |= F_V; + m_P |= F_N; + if((m_TMP^val) & (m_TMP^diff) & 0x80) + m_P |= F_V; if(!(diff & 0xff00)) - P |= F_C; - TMP = diff; + m_P |= F_C; + m_TMP = diff; } void m740_device::do_sbct(uint8_t val) { - if(P & F_D) + if(m_P & F_D) do_sbc_dt(val); else do_sbc_ndt(val); @@ -125,44 +125,44 @@ void m740_device::do_sbct(uint8_t val) void m740_device::do_adc_dt(uint8_t val) { - uint8_t c = P & F_C ? 1 : 0; - P &= ~(F_N|F_V|F_Z|F_C); - uint8_t al = (TMP & 15) + (val & 15) + c; + uint8_t c = m_P & F_C ? 1 : 0; + m_P &= ~(F_N|F_V|F_Z|F_C); + uint8_t al = (m_TMP & 15) + (val & 15) + c; if(al > 9) al += 6; - uint8_t ah = (TMP >> 4) + (val >> 4) + (al > 15); - if(!uint8_t(TMP + val + c)) - P |= F_Z; + uint8_t ah = (m_TMP >> 4) + (val >> 4) + (al > 15); + if(!uint8_t(m_TMP + val + c)) + m_P |= F_Z; else if(ah & 8) - P |= F_N; - if(~(TMP^val) & (TMP^(ah << 4)) & 0x80) - P |= F_V; + m_P |= F_N; + if(~(m_TMP^val) & (m_TMP^(ah << 4)) & 0x80) + m_P |= F_V; if(ah > 9) ah += 6; if(ah > 15) - P |= F_C; - TMP = (ah << 4) | (al & 15); + m_P |= F_C; + m_TMP = (ah << 4) | (al & 15); } void m740_device::do_adc_ndt(uint8_t val) { uint16_t sum; - sum = TMP + val + (P & F_C ? 1 : 0); - P &= ~(F_N|F_V|F_Z|F_C); + sum = m_TMP + val + (m_P & F_C ? 1 : 0); + m_P &= ~(F_N|F_V|F_Z|F_C); if(!uint8_t(sum)) - P |= F_Z; + m_P |= F_Z; else if(int8_t(sum) < 0) - P |= F_N; - if(~(TMP^val) & (TMP^sum) & 0x80) - P |= F_V; + m_P |= F_N; + if(~(m_TMP^val) & (m_TMP^sum) & 0x80) + m_P |= F_V; if(sum & 0xff00) - P |= F_C; - TMP = sum; + m_P |= F_C; + m_TMP = sum; } void m740_device::do_adct(uint8_t val) { - if(P & F_D) + if(m_P & F_D) do_adc_dt(val); else do_adc_ndt(val); @@ -191,11 +191,11 @@ void m740_device::execute_set_input(int inputnum, int state) break; case V_LINE: - if(!v_state && state == ASSERT_LINE) + if(!m_v_state && state == ASSERT_LINE) { - P |= F_V; + m_P |= F_V; } - v_state = state == ASSERT_LINE; + m_v_state = state == ASSERT_LINE; break; } } @@ -214,9 +214,9 @@ void m740_device::set_irq_line(int line, int state) m_irq_multiplex &= ~(1<<line); } - irq_state = (m_irq_multiplex != 0); + m_irq_state = (m_irq_multiplex != 0); - if (irq_state) + if (m_irq_state) { for (int i = 0; i < M740_MAX_INT_LINE; i++) { diff --git a/src/devices/cpu/m6502/m740.h b/src/devices/cpu/m6502/m740.h index 6c64c0af79c..1e0f39191b6 100644 --- a/src/devices/cpu/m6502/m740.h +++ b/src/devices/cpu/m6502/m740.h @@ -42,9 +42,9 @@ protected: virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; - virtual void read_dummy(uint16_t adr) { (void)mintf->read(adr); } - virtual uint8_t read_data(uint16_t adr) { return mintf->read(adr); } - virtual void write_data(uint16_t adr, uint8_t val) { mintf->write(adr, val); } + virtual void read_dummy(uint16_t adr) { (void)m_mintf->read(adr); } + virtual uint8_t read_data(uint16_t adr) { return m_mintf->read(adr); } + virtual void write_data(uint16_t adr, uint8_t val) { m_mintf->write(adr, val); } virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; virtual void do_exec_full() override; diff --git a/src/devices/cpu/m6502/m740d.cpp b/src/devices/cpu/m6502/m740d.cpp index 5da5ef53020..02d6a91daea 100644 --- a/src/devices/cpu/m6502/m740d.cpp +++ b/src/devices/cpu/m6502/m740d.cpp @@ -12,11 +12,11 @@ #include "m740d.h" #include "cpu/m6502/m740d.hxx" -m740_disassembler::m740_disassembler(config *_conf) : m6502_base_disassembler(disasm_entries), conf(_conf) +m740_disassembler::m740_disassembler(config *_conf) : m6502_base_disassembler(disasm_entries), m_conf(_conf) { } u32 m740_disassembler::get_instruction_bank() const { - return conf->get_state_base(); + return m_conf->get_state_base(); } diff --git a/src/devices/cpu/m6502/m740d.h b/src/devices/cpu/m6502/m740d.h index 80029cc56a8..d701fca7d18 100644 --- a/src/devices/cpu/m6502/m740d.h +++ b/src/devices/cpu/m6502/m740d.h @@ -31,7 +31,7 @@ protected: private: static const disasm_entry disasm_entries[0x200]; - config *conf; + config *m_conf; }; #endif diff --git a/src/devices/cpu/m6502/odeco16.lst b/src/devices/cpu/m6502/odeco16.lst index 1f25b6b3be6..54f5e4a3bff 100644 --- a/src/devices/cpu/m6502/odeco16.lst +++ b/src/devices/cpu/m6502/odeco16.lst @@ -3,113 +3,113 @@ # deco 16 opcodes brk_16_imp // The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_pending) - if(irq_taken) { + if(m_irq_taken) { read_pc(); } else { read_pc(); - PC++; + m_PC++; } - write(SP, PC >> 8); + write(m_SP, m_PC >> 8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - write(SP, irq_taken ? P & ~F_B : P); + write(m_SP, m_irq_taken ? m_P & ~F_B : m_P); dec_SP(); - if(nmi_pending) { - standard_irq_callback(NMI_LINE, PC); - PC = read_arg(0xfff7); - PC = set_h(PC, read_arg(0xfff6)); - nmi_pending = false; + if(m_nmi_pending) { + standard_irq_callback(NMI_LINE, m_PC); + m_PC = read_arg(0xfff7); + m_PC = set_h(m_PC, read_arg(0xfff6)); + m_nmi_pending = false; } else { - if(irq_taken) - standard_irq_callback(IRQ_LINE, PC); - PC = read_arg(0xfff3); - PC = set_h(PC, read_arg(0xfff2)); + if(m_irq_taken) + standard_irq_callback(IRQ_LINE, m_PC); + m_PC = read_arg(0xfff3); + m_PC = set_h(m_PC, read_arg(0xfff2)); } - irq_taken = false; - P |= F_I; // Do *not* move after the prefetch + m_irq_taken = false; + m_P |= F_I; // Do *not* move after the prefetch prefetch(); - inst_state = -1; + m_inst_state = -1; ill_non - logerror("%s: Unimplemented instruction %02x\n", tag(), inst_state); + logerror("%s: Unimplemented instruction %02x\n", tag(), m_inst_state); prefetch(); u0B_zpg - TMP2 = read_pc(); - PC++; + m_TMP2 = read_pc(); + m_PC++; if(DECO16_VERBOSE) - logerror("%s: OP0B %02x (%04x)\n", tag(), NPC, TMP2); + logerror("%s: OP0B %02x (%04x)\n", tag(), m_NPC, m_TMP2); prefetch(); u13_zpg - TMP2 = read_pc(); - PC++; + m_TMP2 = read_pc(); + m_PC++; if(DECO16_VERBOSE) - logerror("%s: OP13 %02x (%04x)\n", tag(), NPC, TMP2); + logerror("%s: OP13 %02x (%04x)\n", tag(), m_NPC, m_TMP2); prefetch(); u23_zpg - TMP2 = read_pc(); - PC++; + m_TMP2 = read_pc(); + m_PC++; if(DECO16_VERBOSE) - logerror("%s: OP23 %02x (%04x)\n", tag(), NPC, TMP2); + logerror("%s: OP23 %02x (%04x)\n", tag(), m_NPC, m_TMP2); prefetch(); u3F_zpg - TMP2 = read_pc(); - PC++; + m_TMP2 = read_pc(); + m_PC++; if(DECO16_VERBOSE) - logerror("%s: OPBB %02x (%04x)\n", tag(), NPC, TMP2); + logerror("%s: OPBB %02x (%04x)\n", tag(), m_NPC, m_TMP2); prefetch(); u4B_zpg - TMP2 = read_pc(); - PC++; - A = io->read_byte(1); + m_TMP2 = read_pc(); + m_PC++; + m_A = m_io->read_byte(1); prefetch(); u87_zpg - TMP2 = read_pc(); - PC++; + m_TMP2 = read_pc(); + m_PC++; if(DECO16_VERBOSE) - logerror("%s: OP87 %02x (%04x)\n", tag(), NPC, TMP2); + logerror("%s: OP87 %02x (%04x)\n", tag(), m_NPC, m_TMP2); prefetch(); u8F_zpg - TMP2 = read_pc(); - PC++; + m_TMP2 = read_pc(); + m_PC++; if(DECO16_VERBOSE) - logerror("%s: OP8F (BANK) %02x (%04x)\n", tag(), NPC, TMP2); - io->write_byte(0, TMP2); + logerror("%s: OP8F (BANK) %02x (%04x)\n", tag(), m_NPC, m_TMP2); + m_io->write_byte(0, m_TMP2); prefetch(); uA3_zpg - TMP2 = read_pc(); - PC++; + m_TMP2 = read_pc(); + m_PC++; if(DECO16_VERBOSE) - logerror("%s: OPA3 %02x (%04x)\n", tag(), NPC, TMP2); + logerror("%s: OPA3 %02x (%04x)\n", tag(), m_NPC, m_TMP2); prefetch(); uBB_zpg - TMP2 = read_pc(); - PC++; + m_TMP2 = read_pc(); + m_PC++; if(DECO16_VERBOSE) - logerror("%s: OPBB %02x (%04x)\n", tag(), NPC, TMP2); + logerror("%s: OPBB %02x (%04x)\n", tag(), m_NPC, m_TMP2); prefetch(); vbl_zpg - TMP2 = read_pc(); - PC++; - A = io->read_byte(0); + m_TMP2 = read_pc(); + m_PC++; + m_A = m_io->read_byte(0); //if(DECO16_VERBOSE) - // logerror("%s: VBL %02x (%04x)\n", tag(), NPC, TMP2); + // logerror("%s: VBL %02x (%04x)\n", tag(), m_NPC, m_TMP2); prefetch(); # exceptions reset_16 - P |= F_I; - PC = read_arg(0xfff1); - PC = set_h(PC, read_arg(0xfff0)); + m_P |= F_I; + m_PC = read_arg(0xfff1); + m_PC = set_h(m_PC, read_arg(0xfff0)); prefetch(); - inst_state = -1; + m_inst_state = -1; diff --git a/src/devices/cpu/m6502/om4510.lst b/src/devices/cpu/m6502/om4510.lst index ade37a82db6..96f24d96a71 100644 --- a/src/devices/cpu/m6502/om4510.lst +++ b/src/devices/cpu/m6502/om4510.lst @@ -3,21 +3,21 @@ # 4510 opcodes eom_imp - inhibit_interrupts = false; // before or after prefetch? + m_inhibit_interrupts = false; // before or after prefetch? prefetch(); map_imp - inhibit_interrupts = true; - map_offset[0] = (A<<8) | ((X & 0xf) << 16); - map_offset[1] = (Y<<8) | ((Z & 0xf) << 16); - map_enable = ((X & 0xf0) >> 4) | (Z & 0xf0); + m_inhibit_interrupts = true; + m_map_offset[0] = (m_A<<8) | ((m_X & 0xf) << 16); + m_map_offset[1] = (m_Y<<8) | ((m_Z & 0xf) << 16); + m_map_enable = ((m_X & 0xf0) >> 4) | (m_Z & 0xf0); logerror("MAP execute\n"); - logerror("0x0000 - 0x1fff = %08x\n",map_enable & 1 ? map_offset[0]+0x0000 : 0x0000); - logerror("0x2000 - 0x3fff = %08x\n",map_enable & 2 ? map_offset[0]+0x2000 : 0x2000); - logerror("0x4000 - 0x5fff = %08x\n",map_enable & 4 ? map_offset[0]+0x4000 : 0x4000); - logerror("0x6000 - 0x7fff = %08x\n",map_enable & 8 ? map_offset[0]+0x6000 : 0x6000); - logerror("0x8000 - 0x9fff = %08x\n",map_enable & 16 ? map_offset[1]+0x8000 : 0x8000); - logerror("0xa000 - 0xbfff = %08x\n",map_enable & 32 ? map_offset[1]+0xa000 : 0xa000); - logerror("0xc000 - 0xdfff = %08x\n",map_enable & 64 ? map_offset[1]+0xc000 : 0xc000); - logerror("0xe000 - 0xffff = %08x\n",map_enable & 128 ? map_offset[1]+0xe000 : 0xe000); + logerror("0x0000 - 0x1fff = %08x\n",m_map_enable & 1 ? m_map_offset[0]+0x0000 : 0x0000); + logerror("0x2000 - 0x3fff = %08x\n",m_map_enable & 2 ? m_map_offset[0]+0x2000 : 0x2000); + logerror("0x4000 - 0x5fff = %08x\n",m_map_enable & 4 ? m_map_offset[0]+0x4000 : 0x4000); + logerror("0x6000 - 0x7fff = %08x\n",m_map_enable & 8 ? m_map_offset[0]+0x6000 : 0x6000); + logerror("0x8000 - 0x9fff = %08x\n",m_map_enable & 16 ? m_map_offset[1]+0x8000 : 0x8000); + logerror("0xa000 - 0xbfff = %08x\n",m_map_enable & 32 ? m_map_offset[1]+0xa000 : 0xa000); + logerror("0xc000 - 0xdfff = %08x\n",m_map_enable & 64 ? m_map_offset[1]+0xc000 : 0xc000); + logerror("0xe000 - 0xffff = %08x\n",m_map_enable & 128 ? m_map_offset[1]+0xe000 : 0xe000); prefetch(); diff --git a/src/devices/cpu/m6502/om6502.lst b/src/devices/cpu/m6502/om6502.lst index 1dca3d918a8..94aeea27c6b 100644 --- a/src/devices/cpu/m6502/om6502.lst +++ b/src/devices/cpu/m6502/om6502.lst @@ -5,949 +5,949 @@ # documented opcodes adc_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); prefetch(); adc_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - do_adc(TMP2); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); prefetch(); adc_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP += Y; - TMP2 = read(TMP); - do_adc(TMP2); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); prefetch(); adc_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_adc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); prefetch(); adc_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - do_adc(TMP2); + m_TMP2 = read(m_TMP+m_Y); + do_adc(m_TMP2); prefetch(); adc_imm - TMP = read_pc(); - PC++; - do_adc(TMP); + m_TMP = read_pc(); + m_PC++; + do_adc(m_TMP); prefetch(); adc_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); prefetch(); adc_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_adc(m_TMP2); prefetch(); and_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP += Y; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_imm - TMP = read_pc(); - PC++; - A &= TMP; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A &= m_TMP; + set_nz(m_A); prefetch(); and_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - A &= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_Y); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); asl_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_acc read_pc(); - A = do_asl(A); + m_A = do_asl(m_A); prefetch(); asl_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); bcc_rel - TMP = read_pc(); - PC++; - if(!(P & F_C)) { + m_TMP = read_pc(); + m_PC++; + if(!(m_P & F_C)) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); bcs_rel - TMP = read_pc(); - PC++; - if(P & F_C) { + m_TMP = read_pc(); + m_PC++; + if(m_P & F_C) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); beq_rel - TMP = read_pc(); - PC++; - if(P & F_Z) { + m_TMP = read_pc(); + m_PC++; + if(m_P & F_Z) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); bit_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_bit(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_bit(m_TMP2); prefetch(); bit_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_bit(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_bit(m_TMP2); prefetch(); bmi_rel - TMP = read_pc(); - PC++; - if(P & F_N) { + m_TMP = read_pc(); + m_PC++; + if(m_P & F_N) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); bne_rel - TMP = read_pc(); - PC++; - if(!(P & F_Z)) { + m_TMP = read_pc(); + m_PC++; + if(!(m_P & F_Z)) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); bpl_rel - TMP = read_pc(); - PC++; - if(!(P & F_N)) { + m_TMP = read_pc(); + m_PC++; + if(!(m_P & F_N)) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); brk_imp // The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_pending) - if(irq_taken) { + if(m_irq_taken) { read_pc(); } else { read_pc(); - PC++; + m_PC++; } - write(SP, PC >> 8); + write(m_SP, m_PC >> 8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - write(SP, irq_taken ? P & ~F_B : P); + write(m_SP, m_irq_taken ? m_P & ~F_B : m_P); dec_SP(); - if(nmi_pending) { - standard_irq_callback(NMI_LINE, PC); - PC = read_arg(0xfffa); - PC = set_h(PC, read_arg(0xfffb)); - nmi_pending = false; + if(m_nmi_pending) { + standard_irq_callback(NMI_LINE, m_PC); + m_PC = read_arg(0xfffa); + m_PC = set_h(m_PC, read_arg(0xfffb)); + m_nmi_pending = false; } else { - if(irq_taken) - standard_irq_callback(IRQ_LINE, PC); - PC = read_arg(0xfffe); - PC = set_h(PC, read_arg(0xffff)); + if(m_irq_taken) + standard_irq_callback(IRQ_LINE, m_PC); + m_PC = read_arg(0xfffe); + m_PC = set_h(m_PC, read_arg(0xffff)); } - irq_taken = false; - P |= F_I; // Do *not* move after the prefetch + m_irq_taken = false; + m_P |= F_I; // Do *not* move after the prefetch prefetch(); - inst_state = -1; + m_inst_state = -1; bvc_rel - TMP = read_pc(); - PC++; - if(!(P & F_V)) { + m_TMP = read_pc(); + m_PC++; + if(!(m_P & F_V)) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); bvs_rel - TMP = read_pc(); - PC++; - if(P & F_V) { + m_TMP = read_pc(); + m_PC++; + if(m_P & F_V) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); clc_imp read_pc(); - P &= ~F_C; + m_P &= ~F_C; prefetch(); cld_imp read_pc(); - P &= ~F_D; + m_P &= ~F_D; prefetch(); cli_imp read_pc(); prefetch(); - P &= ~F_I; // Do *not* move it before the prefetch + m_P &= ~F_I; // Do *not* move it before the prefetch clv_imp read_pc(); - P &= ~F_V; + m_P &= ~F_V; prefetch(); cmp_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP += Y; - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - do_cmp(A, TMP2); + m_TMP2 = read(m_TMP+m_Y); + do_cmp(m_A, m_TMP2); prefetch(); cmp_imm - TMP = read_pc(); - PC++; - do_cmp(A, TMP); + m_TMP = read_pc(); + m_PC++; + do_cmp(m_A, m_TMP); prefetch(); cmp_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_cmp(m_A, m_TMP2); prefetch(); cpx_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_cmp(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_cmp(m_X, m_TMP2); prefetch(); cpx_imm - TMP = read_pc(); - PC++; - do_cmp(X, TMP); + m_TMP = read_pc(); + m_PC++; + do_cmp(m_X, m_TMP); prefetch(); cpx_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_cmp(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_cmp(m_X, m_TMP2); prefetch(); cpy_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_cmp(Y, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_cmp(m_Y, m_TMP2); prefetch(); cpy_imm - TMP = read_pc(); - PC++; - do_cmp(Y, TMP); + m_TMP = read_pc(); + m_PC++; + do_cmp(m_Y, m_TMP); prefetch(); cpy_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_cmp(Y, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_cmp(m_Y, m_TMP2); prefetch(); dec_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dex_imp read_pc(); - X--; - set_nz(X); + m_X--; + set_nz(m_X); prefetch(); dey_imp read_pc(); - Y--; - set_nz(Y); + m_Y--; + set_nz(m_Y); prefetch(); eor_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP += Y; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - A ^= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_Y); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_imm - TMP = read_pc(); - PC++; - A ^= TMP; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A ^= m_TMP; + set_nz(m_A); prefetch(); eor_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); inc_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inx_imp read_pc(); - X++; - set_nz(X); + m_X++; + set_nz(m_X); prefetch(); iny_imp read_pc(); - Y++; - set_nz(Y); + m_Y++; + set_nz(m_Y); prefetch(); jmp_adr - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC = TMP; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC = m_TMP; prefetch(); jmp_ind - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - PC = read(TMP); - PC = set_h(PC, read(set_l(TMP, TMP+1))); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(set_l(m_TMP, m_TMP+1))); prefetch(); jsr_adr - TMP = read_pc(); - PC++; - read(SP); - write(SP, PC>>8); + m_TMP = read_pc(); + m_PC++; + read(m_SP); + write(m_SP, m_PC>>8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - TMP = set_h(TMP, read_pc()); - PC = TMP; + m_TMP = set_h(m_TMP, read_pc()); + m_PC = m_TMP; prefetch(); lda_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - A = read(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_A = read(m_TMP); + set_nz(m_A); prefetch(); lda_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - A = read(TMP + X); - set_nz(A); + m_A = read(m_TMP + m_X); + set_nz(m_A); prefetch(); lda_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - A = read(TMP + Y); - set_nz(A); + m_A = read(m_TMP + m_Y); + set_nz(m_A); prefetch(); lda_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - A = read(TMP); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_A = read(m_TMP); + set_nz(m_A); prefetch(); lda_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - A = read(TMP+Y); - set_nz(A); + m_A = read(m_TMP+m_Y); + set_nz(m_A); prefetch(); lda_imm - A = read_pc(); - PC++; - set_nz(A); + m_A = read_pc(); + m_PC++; + set_nz(m_A); prefetch(); lda_zpg - TMP = read_pc(); - PC++; - A = read(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A = read(m_TMP); + set_nz(m_A); prefetch(); lda_zpx - TMP = read_pc(); - PC++; - read(TMP); - A = read(uint8_t(TMP+X)); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_A = read(uint8_t(m_TMP+m_X)); + set_nz(m_A); prefetch(); ldx_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - X = read(TMP); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_X = read(m_TMP); + set_nz(m_X); prefetch(); ldx_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - X = read(TMP + Y); - set_nz(X); + m_X = read(m_TMP + m_Y); + set_nz(m_X); prefetch(); ldx_imm - X = read_pc(); - PC++; - set_nz(X); + m_X = read_pc(); + m_PC++; + set_nz(m_X); prefetch(); ldx_zpg - TMP = read_pc(); - PC++; - X = read(TMP); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + m_X = read(m_TMP); + set_nz(m_X); prefetch(); ldx_zpy - TMP = read_pc(); - PC++; - read(TMP); - X = read(uint8_t(TMP+Y)); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_X = read(uint8_t(m_TMP+m_Y)); + set_nz(m_X); prefetch(); ldy_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - Y = read(TMP); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_Y = read(m_TMP); + set_nz(m_Y); prefetch(); ldy_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - Y = read(TMP); - set_nz(Y); + m_TMP += m_X; + m_Y = read(m_TMP); + set_nz(m_Y); prefetch(); ldy_imm - Y = read_pc(); - PC++; - set_nz(Y); + m_Y = read_pc(); + m_PC++; + set_nz(m_Y); prefetch(); ldy_zpg - TMP = read_pc(); - PC++; - Y = read(TMP); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + m_Y = read(m_TMP); + set_nz(m_Y); prefetch(); ldy_zpx - TMP = read_pc(); - PC++; - read(TMP); - Y = read(uint8_t(TMP+X)); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_Y = read(uint8_t(m_TMP+m_X)); + set_nz(m_Y); prefetch(); lsr_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_acc read_pc(); - A = do_lsr(A); + m_A = do_lsr(m_A); prefetch(); lsr_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); nop_imp @@ -955,1321 +955,1321 @@ nop_imp prefetch(); ora_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP += Y; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_imm - TMP = read_pc(); - PC++; - A |= TMP; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A |= m_TMP; + set_nz(m_A); prefetch(); ora_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - A |= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_Y); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); pha_imp read_pc(); - write(SP, A); + write(m_SP, m_A); dec_SP(); prefetch(); php_imp read_pc(); - write(SP, P); + write(m_SP, m_P); dec_SP(); prefetch(); pla_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - A = read(SP); - set_nz(A); + m_A = read(m_SP); + set_nz(m_A); prefetch(); plp_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - TMP = read(SP) | (F_B|F_E); + m_TMP = read(m_SP) | (F_B|F_E); prefetch(); - P = TMP; // Do *not* move it before the prefetch + m_P = m_TMP; // Do *not* move it before the prefetch rol_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_acc read_pc(); - A = do_rol(A); + m_A = do_rol(m_A); prefetch(); rol_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_acc read_pc(); - A = do_ror(A); + m_A = do_ror(m_A); prefetch(); ror_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rti_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - P = read(SP) | (F_B|F_E); + m_P = read(m_SP) | (F_B|F_E); inc_SP(); - PC = read(SP); + m_PC = read(m_SP); inc_SP(); - PC = set_h(PC, read(SP)); + m_PC = set_h(m_PC, read(m_SP)); prefetch(); rts_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - PC = read(SP); + m_PC = read(m_SP); inc_SP(); - PC = set_h(PC, read(SP)); + m_PC = set_h(m_PC, read(m_SP)); read_pc(); - PC++; + m_PC++; prefetch(); sbc_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); prefetch(); sbc_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - do_sbc(TMP2); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); prefetch(); sbc_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP += Y; - TMP2 = read(TMP); - do_sbc(TMP2); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); prefetch(); sbc_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_sbc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); prefetch(); sbc_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - do_sbc(TMP2); + m_TMP2 = read(m_TMP+m_Y); + do_sbc(m_TMP2); prefetch(); sbc_imm - TMP = read_pc(); - PC++; - do_sbc(TMP); + m_TMP = read_pc(); + m_PC++; + do_sbc(m_TMP); prefetch(); sbc_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); prefetch(); sbc_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_sbc(m_TMP2); prefetch(); sec_imp read_pc(); - P |= F_C; + m_P |= F_C; prefetch(); sed_imp read_pc(); - P |= F_D; + m_P |= F_D; prefetch(); sei_imp read_pc(); prefetch(); - P |= F_I; // Do *not* move it before the prefetch + m_P |= F_I; // Do *not* move it before the prefetch sta_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP, A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP, m_A); prefetch(); sta_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - write(TMP+X, A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + write(m_TMP+m_X, m_A); prefetch(); sta_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - write(TMP+Y, A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + write(m_TMP+m_Y, m_A); prefetch(); sta_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - write(TMP, A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + write(m_TMP, m_A); prefetch(); sta_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - write(TMP+Y, A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + write(m_TMP+m_Y, m_A); prefetch(); sta_zpg - TMP = read_pc(); - PC++; - write(TMP, A); + m_TMP = read_pc(); + m_PC++; + write(m_TMP, m_A); prefetch(); sta_zpx - TMP = read_pc(); - PC++; - read(TMP); - write(uint8_t(TMP+X), A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + write(uint8_t(m_TMP+m_X), m_A); prefetch(); stx_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP, X); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP, m_X); prefetch(); stx_zpg - TMP = read_pc(); - PC++; - write(TMP, X); + m_TMP = read_pc(); + m_PC++; + write(m_TMP, m_X); prefetch(); stx_zpy - TMP = read_pc(); - PC++; - read(TMP); - write(uint8_t(TMP+Y), X); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + write(uint8_t(m_TMP+m_Y), m_X); prefetch(); sty_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP, Y); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP, m_Y); prefetch(); sty_zpg - TMP = read_pc(); - PC++; - write(TMP, Y); + m_TMP = read_pc(); + m_PC++; + write(m_TMP, m_Y); prefetch(); sty_zpx - TMP = read_pc(); - PC++; - read(TMP); - write(uint8_t(TMP+X), Y); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + write(uint8_t(m_TMP+m_X), m_Y); prefetch(); tax_imp read_pc(); - X = A; - set_nz(X); + m_X = m_A; + set_nz(m_X); prefetch(); tay_imp read_pc(); - Y = A; - set_nz(Y); + m_Y = m_A; + set_nz(m_Y); prefetch(); tsx_imp read_pc(); - X = SP; - set_nz(X); + m_X = m_SP; + set_nz(m_X); prefetch(); txa_imp read_pc(); - A = X; - set_nz(A); + m_A = m_X; + set_nz(m_A); prefetch(); txs_imp read_pc(); - SP = set_l(SP, X); + m_SP = set_l(m_SP, m_X); prefetch(); tya_imp read_pc(); - A = Y; - set_nz(A); + m_A = m_Y; + set_nz(m_A); prefetch(); # exceptions reset read_pc(); read_pc(); - read(SP); + read(m_SP); dec_SP(); - read(SP); + read(m_SP); dec_SP(); - read(SP); + read(m_SP); dec_SP(); - P |= F_I; - PC = read_arg(0xfffc); - PC = set_h(PC, read_arg(0xfffd)); + m_P |= F_I; + m_PC = read_arg(0xfffc); + m_PC = set_h(m_PC, read_arg(0xfffd)); prefetch(); - inst_state = -1; + m_inst_state = -1; # undocumented reliable instructions dcp_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); dcp_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); dcp_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); dcp_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); dcp_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); dcp_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); dcp_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); isb_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); isb_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); isb_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); isb_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); isb_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); isb_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); isb_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); lax_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - A = X = read(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_A = m_X = read(m_TMP); + set_nz(m_A); prefetch(); lax_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - A = X = read(TMP+Y); - set_nz(A); + m_A = m_X = read(m_TMP+m_Y); + set_nz(m_A); prefetch(); lax_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - A = X = read(TMP); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_A = m_X = read(m_TMP); + set_nz(m_A); prefetch(); lax_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - A = X = read(TMP+Y); - set_nz(A); + m_A = m_X = read(m_TMP+m_Y); + set_nz(m_A); prefetch(); lax_zpg - TMP = read_pc(); - PC++; - A = X = read(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A = m_X = read(m_TMP); + set_nz(m_A); prefetch(); lax_zpy - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+Y); - A = X = read(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_Y); + m_A = m_X = read(m_TMP); + set_nz(m_A); prefetch(); rla_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rla_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rla_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rla_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rla_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rla_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rla_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rra_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); rra_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); rra_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); rra_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); rra_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); rra_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); rra_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); sax_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = A & X; - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = m_A & m_X; + write(m_TMP, m_TMP2); prefetch(); sax_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = A & X; - write(TMP, TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = m_A & m_X; + write(m_TMP, m_TMP2); prefetch(); sax_zpg - TMP = read_pc(); - PC++; - TMP2 = A & X; - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = m_A & m_X; + write(m_TMP, m_TMP2); prefetch(); sax_zpy - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+Y); - TMP2 = A & X; - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_Y); + m_TMP2 = m_A & m_X; + write(m_TMP, m_TMP2); prefetch(); sbx_imm - TMP2 = read_pc(); - PC++; - X &= A; - if(X < TMP2) - P &= ~F_C; + m_TMP2 = read_pc(); + m_PC++; + m_X &= m_A; + if(m_X < m_TMP2) + m_P &= ~F_C; else - P |= F_C; - X -= TMP2; - set_nz(X); + m_P |= F_C; + m_X -= m_TMP2; + set_nz(m_X); prefetch(); sha_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP2 = A & X & ((TMP >> 8)+1); - if(page_changing(TMP, Y)) - TMP = set_h(TMP+Y, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = m_A & m_X & ((m_TMP >> 8)+1); + if(page_changing(m_TMP, m_Y)) + m_TMP = set_h(m_TMP+m_Y, m_TMP2); else - TMP += Y; - write(TMP, TMP2); + m_TMP += m_Y; + write(m_TMP, m_TMP2); prefetch(); sha_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP2 = A & X & ((TMP >> 8)+1); - if(page_changing(TMP, Y)) - TMP = set_h(TMP+Y, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = m_A & m_X & ((m_TMP >> 8)+1); + if(page_changing(m_TMP, m_Y)) + m_TMP = set_h(m_TMP+m_Y, m_TMP2); else - TMP += Y; - write(TMP, TMP2); + m_TMP += m_Y; + write(m_TMP, m_TMP2); prefetch(); shs_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - SP = set_l(SP, A & X); - TMP2 = A & X & ((TMP >> 8)+1); - if(page_changing(TMP, Y)) - TMP = set_h(TMP+Y, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_SP = set_l(m_SP, m_A & m_X); + m_TMP2 = m_A & m_X & ((m_TMP >> 8)+1); + if(page_changing(m_TMP, m_Y)) + m_TMP = set_h(m_TMP+m_Y, m_TMP2); else - TMP += Y; - write(TMP, TMP2); + m_TMP += m_Y; + write(m_TMP, m_TMP2); prefetch(); shx_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP2 = X & ((TMP >> 8)+1); - if(page_changing(TMP, Y)) - TMP = set_h(TMP+Y, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = m_X & ((m_TMP >> 8)+1); + if(page_changing(m_TMP, m_Y)) + m_TMP = set_h(m_TMP+m_Y, m_TMP2); else - TMP += Y; - write(TMP, TMP2); + m_TMP += m_Y; + write(m_TMP, m_TMP2); prefetch(); shy_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP2 = Y & ((TMP >> 8)+1); - if(page_changing(TMP, X)) - TMP = set_h(TMP+X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP2 = m_Y & ((m_TMP >> 8)+1); + if(page_changing(m_TMP, m_X)) + m_TMP = set_h(m_TMP+m_X, m_TMP2); else - TMP += X; - write(TMP, TMP2); + m_TMP += m_X; + write(m_TMP, m_TMP2); prefetch(); slo_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); slo_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); slo_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); slo_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); slo_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); slo_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); slo_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); sre_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); sre_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); sre_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); sre_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); sre_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); sre_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); sre_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); # undocumented unreliable instructions anc_imm - TMP = read_pc(); - PC++; - A &= TMP; - set_nz(A); - if(A & 0x80) - P |= F_C; + m_TMP = read_pc(); + m_PC++; + m_A &= m_TMP; + set_nz(m_A); + if(m_A & 0x80) + m_P |= F_C; else - P &= ~F_C; + m_P &= ~F_C; prefetch(); ane_imm - TMP = read_pc(); - PC++; - A &= TMP & X; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A &= m_TMP & m_X; + set_nz(m_A); prefetch(); asr_imm - TMP = read_pc(); - PC++; - A = do_lsr(A & TMP); + m_TMP = read_pc(); + m_PC++; + m_A = do_lsr(m_A & m_TMP); prefetch(); arr_imm - TMP = read_pc(); - PC++; - A &= TMP; + m_TMP = read_pc(); + m_PC++; + m_A &= m_TMP; do_arr(); prefetch(); las_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - A = TMP2 | 0x51; - X = 0xff; - set_nz(TMP2); + m_TMP2 = read(m_TMP+m_Y); + m_A = m_TMP2 | 0x51; + m_X = 0xff; + set_nz(m_TMP2); prefetch(); lxa_imm - A = X = read_pc(); - PC++; - set_nz(A); + m_A = m_X = read_pc(); + m_PC++; + set_nz(m_A); prefetch(); # nop variants nop_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(m_TMP); prefetch(); nop_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - read(TMP + X); + read(m_TMP + m_X); prefetch(); nop_imm read_pc(); - PC++; + m_PC++; prefetch(); nop_zpg - TMP = read_pc(); - PC++; - read(TMP); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); prefetch(); nop_zpx - TMP = read_pc(); - PC++; - read(TMP); - read(uint8_t(TMP+X)); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + read(uint8_t(m_TMP+m_X)); prefetch(); # system killers kil_non read_pc(); - PC++; + m_PC++; read(0xffff); read(0xfffe); read(0xfffe); diff --git a/src/devices/cpu/m6502/om6509.lst b/src/devices/cpu/m6502/om6509.lst index b2f116716e8..ad2c2a0fc3c 100644 --- a/src/devices/cpu/m6502/om6509.lst +++ b/src/devices/cpu/m6502/om6509.lst @@ -3,22 +3,22 @@ # 6509 opcodes lda_9_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read_9(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read_9(set_l(m_TMP, m_TMP+m_Y)); } - A = read_9(TMP+Y); - set_nz(A); + m_A = read_9(m_TMP+m_Y); + set_nz(m_A); prefetch(); sta_9_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_9(set_l(TMP, TMP+Y)); - write_9(TMP+Y, A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_9(set_l(m_TMP, m_TMP+m_Y)); + write_9(m_TMP+m_Y, m_A); prefetch(); diff --git a/src/devices/cpu/m6502/om6510.lst b/src/devices/cpu/m6502/om6510.lst index 1554e83de95..6a13d3ffe01 100644 --- a/src/devices/cpu/m6502/om6510.lst +++ b/src/devices/cpu/m6502/om6510.lst @@ -2,54 +2,54 @@ # copyright-holders:Olivier Galibert # 6510 undocumented instructions in a C64 context anc_10_imm - TMP2 = read_pc(); - PC++; - A &= TMP2; - set_nz(A); - if(A & 0x80) - P |= F_C; + m_TMP2 = read_pc(); + m_PC++; + m_A &= m_TMP2; + set_nz(m_A); + if(m_A & 0x80) + m_P |= F_C; else - P &= ~F_C; + m_P &= ~F_C; prefetch(); ane_10_imm - TMP2 = read_pc(); - PC++; - A = (A | 0xee) & TMP2 & X; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_A = (m_A | 0xee) & m_TMP2 & m_X; + set_nz(m_A); prefetch(); asr_10_imm - TMP2 = read_pc(); - PC++; - A = do_lsr(A & TMP2); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_A = do_lsr(m_A & m_TMP2); + set_nz(m_A); prefetch(); arr_10_imm - TMP2 = read_pc(); - PC++; - A &= TMP2; + m_TMP2 = read_pc(); + m_PC++; + m_A &= m_TMP2; do_arr(); prefetch(); las_10_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - A = X = TMP2 & SP; - SP = set_l(SP, A); - set_nz(A); + m_TMP2 = read(m_TMP+m_Y); + m_A = m_X = m_TMP2 & m_SP; + m_SP = set_l(m_SP, m_A); + set_nz(m_A); prefetch(); lxa_10_imm - TMP2 = read_pc(); - PC++; - A = X = (A | 0xee) & TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_A = m_X = (m_A | 0xee) & m_TMP2; + set_nz(m_A); prefetch(); diff --git a/src/devices/cpu/m6502/om65ce02.lst b/src/devices/cpu/m6502/om65ce02.lst index 800ce84488d..8d10c6bd991 100644 --- a/src/devices/cpu/m6502/om65ce02.lst +++ b/src/devices/cpu/m6502/om65ce02.lst @@ -1,1790 +1,1790 @@ -# license:BSD-3-Clause +# license:m_BSD-3-Clause # copyright-holders:Olivier Galibert -# 65ce02 opcodes, a lot only remove dummy read/write cycles, some are new, some use the B register +# 65ce02 opcodes, a lot only remove dummy read/write cycles, some are new, some use the m_B register adc_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); adc_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); adc_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += Y; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); adc_ce_idx - TMP2 = read_pc(); - PC++; - TMP2 += X; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); adc_ce_idy - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Y); - do_adc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Y); + do_adc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); adc_idz - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Z); - do_adc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Z); + do_adc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); adc_ce_imm - TMP = read_pc(); - PC++; - do_adc(TMP); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + do_adc(m_TMP); + if(m_P & F_D) + set_nz(m_A); prefetch(); adc_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - do_adc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); adc_ce_zpx - TMP = read_pc(); - PC++; - TMP2 = read(B|uint8_t(TMP+X)); - do_adc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|uint8_t(m_TMP+m_X)); + do_adc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); and_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += Y; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_ce_idx - TMP2 = read_pc(); - PC++; - TMP2 += X; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_ce_idy - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Y); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Y); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_idz - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Z); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Z); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_ce_zpx - TMP = read_pc(); - PC++; - TMP2 = read(B|uint8_t(TMP+X)); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|uint8_t(m_TMP+m_X)); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); asl_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_ce_acc - A = do_asl(A); + m_A = do_asl(m_A); prefetch(); asl_ce_zpg - TMP = B|read_pc(); - PC++; - TMP2 = read(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = m_B|read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_ce_zpx - TMP = read_pc(); - PC++; - TMP = B|uint8_t(TMP+X); - TMP2 = read(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = m_B|uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asr_acc - A = do_asr(A); + m_A = do_asr(m_A); prefetch(); asr_zpg - TMP = B|read_pc(); - PC++; - TMP2 = read(TMP); - TMP2 = do_asr(TMP2); - write(TMP, TMP2); + m_TMP = m_B|read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_asr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asr_zpx - TMP = read_pc(); - PC++; - TMP = B|uint8_t(TMP+X); - TMP2 = read(TMP); - TMP2 = do_asr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = m_B|uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + m_TMP2 = do_asr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asw_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP3 = read(TMP); - TMP3 = set_h(TMP3, read(TMP+1)); - P &= ~(F_C|F_N|F_Z); - if(TMP3 & 0x8000) - P |= F_C; - TMP3 <<= 1; - if(!TMP3) - P |= F_Z; - else if(TMP3 & 0x8000) - P |= F_N; - write(TMP, TMP3); - write(TMP, TMP3 >> 8); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP3 = read(m_TMP); + m_TMP3 = set_h(m_TMP3, read(m_TMP+1)); + m_P &= ~(F_C|F_N|F_Z); + if(m_TMP3 & 0x8000) + m_P |= F_C; + m_TMP3 <<= 1; + if(!m_TMP3) + m_P |= F_Z; + else if(m_TMP3 & 0x8000) + m_P |= F_N; + write(m_TMP, m_TMP3); + write(m_TMP, m_TMP3 >> 8); prefetch(); aug_iw3 read_pc(); - PC++; + m_PC++; read_pc(); - PC++; + m_PC++; read_pc(); - PC++; + m_PC++; prefetch(); bbr_ce_zpb // Access pattern uncertain - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP = read_pc(); - PC++; - if(!(TMP2 & (1 << ((inst_state >> 4) & 7)))) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read_pc(); + m_PC++; + if(!(m_TMP2 & (1 << ((m_inst_state >> 4) & 7)))) + m_PC += int8_t(m_TMP); prefetch(); bbs_ce_zpb // Access pattern uncertain - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP = read_pc(); - PC++; - if(TMP2 & (1 << ((inst_state >> 4) & 7))) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read_pc(); + m_PC++; + if(m_TMP2 & (1 << ((m_inst_state >> 4) & 7))) + m_PC += int8_t(m_TMP); prefetch(); bcc_ce_rel - TMP = read_pc(); - PC++; - if(!(P & F_C)) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + if(!(m_P & F_C)) + m_PC += int8_t(m_TMP); prefetch(); bcc_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(!(P & F_C)) - PC += TMP-1; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(!(m_P & F_C)) + m_PC += m_TMP-1; prefetch(); bcs_ce_rel - TMP = read_pc(); - PC++; - if(P & F_C) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + if(m_P & F_C) + m_PC += int8_t(m_TMP); prefetch(); bcs_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(P & F_C) - PC += TMP-1; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(m_P & F_C) + m_PC += m_TMP-1; prefetch(); beq_ce_rel - TMP = read_pc(); - PC++; - if(P & F_Z) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + if(m_P & F_Z) + m_PC += int8_t(m_TMP); prefetch(); beq_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(P & F_Z) - PC += TMP-1; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(m_P & F_Z) + m_PC += m_TMP-1; prefetch(); bit_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - do_bit(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_bit(m_TMP2); prefetch(); bit_ce_imm - TMP = read_pc(); - PC++; - do_bit(TMP); + m_TMP = read_pc(); + m_PC++; + do_bit(m_TMP); prefetch(); bit_ce_zpg - TMP = B|read_pc(); - PC++; - TMP2 = read(TMP); - do_bit(TMP2); + m_TMP = m_B|read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_bit(m_TMP2); prefetch(); bit_ce_zpx - TMP = read_pc(); - PC++; - TMP2 = read(B|uint8_t(TMP+X)); - do_bit(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|uint8_t(m_TMP+m_X)); + do_bit(m_TMP2); prefetch(); bmi_ce_rel - TMP = read_pc(); - PC++; - if(P & F_N) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + if(m_P & F_N) + m_PC += int8_t(m_TMP); prefetch(); bmi_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(P & F_N) - PC += TMP-1; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(m_P & F_N) + m_PC += m_TMP-1; prefetch(); bne_ce_rel - TMP = read_pc(); - PC++; - if(!(P & F_Z)) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + if(!(m_P & F_Z)) + m_PC += int8_t(m_TMP); prefetch(); bne_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(!(P & F_Z)) - PC += TMP-1; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(!(m_P & F_Z)) + m_PC += m_TMP-1; prefetch(); bpl_ce_rel - TMP = read_pc(); - PC++; - if(!(P & F_N)) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + if(!(m_P & F_N)) + m_PC += int8_t(m_TMP); prefetch(); bpl_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(!(P & F_N)) - PC += TMP-1; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(!(m_P & F_N)) + m_PC += m_TMP-1; prefetch(); bra_ce_rel - TMP = read_pc(); - PC++; - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + m_PC += int8_t(m_TMP); prefetch(); bra_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC += TMP; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC += m_TMP; prefetch(); brk_ce_imp - if(irq_taken) { + if(m_irq_taken) { read_pc(); } else { read_pc(); - PC++; + m_PC++; } - write(SP, PC >> 8); + write(m_SP, m_PC >> 8); dec_SP_ce(); - write(SP, PC); + write(m_SP, m_PC); dec_SP_ce(); - write(SP, irq_taken || nmi_pending ? P & ~F_B : P); + write(m_SP, m_irq_taken || m_nmi_pending ? m_P & ~F_B : m_P); dec_SP_ce(); - if(nmi_pending) { - PC = read_arg(0xfffa); - PC = set_h(PC, read_arg(0xfffb)); - nmi_pending = false; + if(m_nmi_pending) { + m_PC = read_arg(0xfffa); + m_PC = set_h(m_PC, read_arg(0xfffb)); + m_nmi_pending = false; } else { - PC = read_arg(0xfffe); - PC = set_h(PC, read_arg(0xffff)); + m_PC = read_arg(0xfffe); + m_PC = set_h(m_PC, read_arg(0xffff)); } - irq_taken = false; - P = (P | F_I) & ~F_D; // Do *not* move after the prefetch + m_irq_taken = false; + m_P = (m_P | F_I) & ~F_D; // Do *not* move after the prefetch prefetch(); - inst_state = -1; + m_inst_state = -1; bsr_rw2 - TMP = read_pc(); - PC++; - write(SP, PC>>8); + m_TMP = read_pc(); + m_PC++; + write(m_SP, m_PC>>8); dec_SP_ce(); - write(SP, PC); + write(m_SP, m_PC); dec_SP_ce(); - TMP = set_h(TMP, read_pc()); - PC++; - PC += TMP-1; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC += m_TMP-1; prefetch(); bvc_ce_rel - TMP = read_pc(); - PC++; - if(!(P & F_V)) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + if(!(m_P & F_V)) + m_PC += int8_t(m_TMP); prefetch(); bvc_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(!(P & F_V)) - PC += TMP-1; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(!(m_P & F_V)) + m_PC += m_TMP-1; prefetch(); bvs_ce_rel - TMP = read_pc(); - PC++; - if(P & F_V) - PC += int8_t(TMP); + m_TMP = read_pc(); + m_PC++; + if(m_P & F_V) + m_PC += int8_t(m_TMP); prefetch(); bvs_rw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(P & F_V) - PC += TMP-1; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(m_P & F_V) + m_PC += m_TMP-1; prefetch(); clc_ce_imp - P &= ~F_C; + m_P &= ~F_C; prefetch(); cld_ce_imp - P &= ~F_D; + m_P &= ~F_D; prefetch(); cle_imp read_pc(); - P &= ~F_E; + m_P &= ~F_E; logerror("CLE\n"); prefetch(); cli_ce_imp prefetch(); - P &= ~F_I; // Do *not* move it before the prefetch + m_P &= ~F_I; // Do *not* move it before the prefetch clv_ce_imp - P &= ~F_V; + m_P &= ~F_V; prefetch(); cmp_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += Y; - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_ce_idx - TMP2 = read_pc(); - PC++; - TMP2 += X; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_ce_idy - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Y); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Y); + do_cmp(m_A, m_TMP2); prefetch(); cmp_idz - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Z); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Z); + do_cmp(m_A, m_TMP2); prefetch(); cmp_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_ce_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(B|uint8_t(TMP+X)); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(m_B|uint8_t(m_TMP+m_X)); + do_cmp(m_A, m_TMP2); prefetch(); cpx_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - do_cmp(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + do_cmp(m_X, m_TMP2); prefetch(); cpy_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - do_cmp(Y, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + do_cmp(m_Y, m_TMP2); prefetch(); cpz_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_cmp(Z, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_cmp(m_Z, m_TMP2); prefetch(); cpz_imm - TMP = read_pc(); - PC++; - do_cmp(Z, TMP); + m_TMP = read_pc(); + m_PC++; + do_cmp(m_Z, m_TMP); prefetch(); cpz_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - do_cmp(Z, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + do_cmp(m_Z, m_TMP2); prefetch(); dec_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_ce_acc - A--; - set_nz(A); + m_A--; + set_nz(m_A); prefetch(); dec_ce_zpg - TMP = B|read_pc(); - PC++; - TMP2 = read(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = m_B|read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_ce_zpx - TMP = read_pc(); - PC++; - TMP = B|uint8_t(TMP+X); - TMP2 = read(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = m_B|uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dew_zpg - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - P &= ~(F_N|F_Z); - TMP--; - if(!TMP) - P |= F_Z; - else if(TMP & 0x8000) - P |= F_N; - TMP2--; - write(B|TMP2, TMP); - TMP2++; - write(B|TMP2, TMP >> 8); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_P &= ~(F_N|F_Z); + m_TMP--; + if(!m_TMP) + m_P |= F_Z; + else if(m_TMP & 0x8000) + m_P |= F_N; + m_TMP2--; + write(m_B|m_TMP2, m_TMP); + m_TMP2++; + write(m_B|m_TMP2, m_TMP >> 8); prefetch(); dex_ce_imp - X--; - set_nz(X); + m_X--; + set_nz(m_X); prefetch(); dey_ce_imp - Y--; - set_nz(Y); + m_Y--; + set_nz(m_Y); prefetch(); dez_imp - Z--; - set_nz(Z); + m_Z--; + set_nz(m_Z); prefetch(); eor_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += Y; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_ce_idx - TMP2 = read_pc(); - PC++; - TMP2 += X; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_ce_idy - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Y); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Y); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_idz - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Z); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Z); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_ce_zpx - TMP = read_pc(); - PC++; - TMP2 = read(B|uint8_t(TMP+X)); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|uint8_t(m_TMP+m_X)); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); inc_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_ce_acc - A++; - set_nz(A); + m_A++; + set_nz(m_A); prefetch(); inc_ce_zpg - TMP = B|read_pc(); - PC++; - TMP2 = read(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = m_B|read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_ce_zpx - TMP = read_pc(); - PC++; - TMP = B|uint8_t(TMP+X); - TMP2 = read(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = m_B|uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inw_zpg - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - P &= ~(F_N|F_Z); - TMP++; - if(!TMP) - P |= F_Z; - else if(TMP & 0x8000) - P |= F_N; - TMP2--; - write(B|TMP2, TMP); - TMP2++; - write(B|TMP2, TMP >> 8); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_P &= ~(F_N|F_Z); + m_TMP++; + if(!m_TMP) + m_P |= F_Z; + else if(m_TMP & 0x8000) + m_P |= F_N; + m_TMP2--; + write(m_B|m_TMP2, m_TMP); + m_TMP2++; + write(m_B|m_TMP2, m_TMP >> 8); prefetch(); inx_ce_imp - X++; - set_nz(X); + m_X++; + set_nz(m_X); prefetch(); iny_ce_imp - Y++; - set_nz(Y); + m_Y++; + set_nz(m_Y); prefetch(); inz_imp - Z++; - set_nz(Z); + m_Z++; + set_nz(m_Z); prefetch(); jmp_ce_iax - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); jmp_ce_ind - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); jsr_ce_adr - TMP = read_pc(); - PC++; - write(SP, PC>>8); + m_TMP = read_pc(); + m_PC++; + write(m_SP, m_PC>>8); dec_SP_ce(); - write(SP, PC); + write(m_SP, m_PC); dec_SP_ce(); - TMP = set_h(TMP, read_pc()); - PC++; - PC = TMP; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = m_TMP; prefetch(); jsr_iax - TMP = read_pc(); - PC++; - write(SP, PC>>8); + m_TMP = read_pc(); + m_PC++; + write(m_SP, m_PC>>8); dec_SP_ce(); - write(SP, PC); + write(m_SP, m_PC); dec_SP_ce(); - TMP = set_h(TMP, read_pc()); - PC++; - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); - PC += X; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); + m_PC += m_X; prefetch(); jsr_ind - TMP = read_pc(); - PC++; - write(SP, PC>>8); + m_TMP = read_pc(); + m_PC++; + write(m_SP, m_PC>>8); dec_SP_ce(); - write(SP, PC); + write(m_SP, m_PC); dec_SP_ce(); - TMP = set_h(TMP, read_pc()); - PC++; - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); lda_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - A = read(TMP + X); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_A = read(m_TMP + m_X); + set_nz(m_A); prefetch(); lda_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - A = read(TMP + Y); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_A = read(m_TMP + m_Y); + set_nz(m_A); prefetch(); lda_ce_idx - TMP2 = read_pc(); - PC++; - TMP2 += X; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - A = read(TMP); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_A = read(m_TMP); + set_nz(m_A); prefetch(); lda_ce_idy - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - A = read(TMP+Y); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_A = read(m_TMP+m_Y); + set_nz(m_A); prefetch(); lda_idz - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - A = read(TMP+Z); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_A = read(m_TMP+m_Z); + set_nz(m_A); prefetch(); lda_isy read_pc(); - TMP = read_pc(); - PC++; - if(P & F_E) - TMP = set_l(SP, SP+TMP); + m_TMP = read_pc(); + m_PC++; + if(m_P & F_E) + m_TMP = set_l(m_SP, m_SP+m_TMP); else - TMP = SP + TMP; - TMP2 = read(TMP); - TMP++; - TMP = TMP2 | (read(TMP) << 8); - A = read(TMP+Y); - set_nz(A); + m_TMP = m_SP + m_TMP; + m_TMP2 = read(m_TMP); + m_TMP++; + m_TMP = m_TMP2 | (read(m_TMP) << 8); + m_A = read(m_TMP+m_Y); + set_nz(m_A); prefetch(); lda_ce_zpg - TMP = read_pc(); - PC++; - A = read(B|TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A = read(m_B|m_TMP); + set_nz(m_A); prefetch(); lda_ce_zpx - TMP = read_pc(); - PC++; - A = read(B|uint8_t(TMP+X)); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A = read(m_B|uint8_t(m_TMP+m_X)); + set_nz(m_A); prefetch(); ldx_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - X = read(TMP + Y); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_X = read(m_TMP + m_Y); + set_nz(m_X); prefetch(); ldx_ce_zpg - TMP = read_pc(); - PC++; - X = read(B|TMP); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + m_X = read(m_B|m_TMP); + set_nz(m_X); prefetch(); ldx_ce_zpy - TMP = read_pc(); - PC++; - X = read(B|uint8_t(TMP+Y)); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + m_X = read(m_B|uint8_t(m_TMP+m_Y)); + set_nz(m_X); prefetch(); ldy_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - Y = read(TMP); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_Y = read(m_TMP); + set_nz(m_Y); prefetch(); ldy_ce_zpg - TMP = read_pc(); - PC++; - Y = read(B|TMP); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + m_Y = read(m_B|m_TMP); + set_nz(m_Y); prefetch(); ldy_ce_zpx - TMP = read_pc(); - PC++; - Y = read(B|uint8_t(TMP+X)); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + m_Y = read(m_B|uint8_t(m_TMP+m_X)); + set_nz(m_Y); prefetch(); ldz_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - Z = read(TMP); - set_nz(Z); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_Z = read(m_TMP); + set_nz(m_Z); prefetch(); ldz_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - Z = read(TMP + X); - set_nz(Z); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_Z = read(m_TMP + m_X); + set_nz(m_Z); prefetch(); ldz_imm - Z = read_pc(); - PC++; - set_nz(Z); + m_Z = read_pc(); + m_PC++; + set_nz(m_Z); prefetch(); lsr_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_ce_acc - A = do_lsr(A); + m_A = do_lsr(m_A); prefetch(); lsr_ce_zpg - TMP = B|read_pc(); - PC++; - TMP2 = read(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = m_B|read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_ce_zpx - TMP = read_pc(); - PC++; - TMP = B|uint8_t(TMP+X); - TMP2 = read(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = m_B|uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); neg_acc read_pc(); - A = -A; - set_nz(A); + m_A = -m_A; + set_nz(m_A); prefetch(); ora_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += Y; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_ce_idx - TMP2 = read_pc(); - PC++; - TMP2 += X; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_ce_idy - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Y); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Y); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_idz - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Z); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Z); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_ce_zpx - TMP = read_pc(); - PC++; - TMP2 = read(B|uint8_t(TMP+X)); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|uint8_t(m_TMP+m_X)); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); # push/pop instructions and rti/rtn/rts are not fully streamlined pha_ce_imp read_pc(); - write(SP, A); + write(m_SP, m_A); dec_SP_ce(); prefetch(); php_ce_imp read_pc(); - write(SP, P); + write(m_SP, m_P); dec_SP_ce(); prefetch(); phw_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP3 = read(TMP); - TMP3 = set_h(TMP3, read(TMP+1)); - write(SP, TMP3); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP3 = read(m_TMP); + m_TMP3 = set_h(m_TMP3, read(m_TMP+1)); + write(m_SP, m_TMP3); dec_SP_ce(); - write(SP, TMP3 >> 8); + write(m_SP, m_TMP3 >> 8); dec_SP_ce(); prefetch(); phw_iw2 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(SP, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_SP, m_TMP); dec_SP_ce(); - write(SP, TMP >> 8); + write(m_SP, m_TMP >> 8); dec_SP_ce(); prefetch(); phx_ce_imp read_pc(); - write(SP, X); + write(m_SP, m_X); dec_SP_ce(); prefetch(); phy_ce_imp read_pc(); - write(SP, Y); + write(m_SP, m_Y); dec_SP_ce(); prefetch(); phz_imp read_pc(); - write(SP, Z); + write(m_SP, m_Z); dec_SP_ce(); prefetch(); pla_ce_imp read_pc(); inc_SP_ce(); - A = read(SP); - set_nz(A); + m_A = read(m_SP); + set_nz(m_A); prefetch(); plp_ce_imp read_pc(); inc_SP_ce(); - TMP = read(SP) | F_B; + m_TMP = read(m_SP) | F_B; prefetch(); - P = TMP; // Do *not* move it before the prefetch + m_P = m_TMP; // Do *not* move it before the prefetch plx_ce_imp read_pc(); inc_SP_ce(); - X = read(SP); - set_nz(X); + m_X = read(m_SP); + set_nz(m_X); prefetch(); ply_ce_imp read_pc(); inc_SP_ce(); - Y = read(SP); - set_nz(Y); + m_Y = read(m_SP); + set_nz(m_Y); prefetch(); plz_imp read_pc(); inc_SP_ce(); - Z = read(SP); - set_nz(Z); + m_Z = read(m_SP); + set_nz(m_Z); prefetch(); rmb_ce_bzp - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP2 &= ~(1 << ((inst_state >> 4) & 7)); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 &= ~(1 << ((m_inst_state >> 4) & 7)); + write(m_TMP, m_TMP2); prefetch(); rol_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_ce_acc - A = do_rol(A); + m_A = do_rol(m_A); prefetch(); rol_ce_zpg - TMP = B|read_pc(); - PC++; - TMP2 = read(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = m_B|read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_ce_zpx - TMP = read_pc(); - PC++; - TMP = B|uint8_t(TMP+X); - TMP2 = read(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = m_B|uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_ce_acc - A = do_ror(A); + m_A = do_ror(m_A); prefetch(); ror_ce_zpg - TMP = B|read_pc(); - PC++; - TMP2 = read(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = m_B|read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_ce_zpx - TMP = read_pc(); - PC++; - TMP = B|uint8_t(TMP+X); - TMP2 = read(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = m_B|uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); row_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP3 = read(TMP); - TMP3 = set_h(TMP3, read(TMP+1)); - TMP2 = P; - P &= ~(F_C|F_N|F_Z); - if(TMP3 & 0x8000) - P |= F_C; - TMP3 <<= 1; - if(TMP2 & F_C) - TMP3 |= 0x0001; - if(!TMP3) - P |= F_Z; - else if(TMP3 & 0x8000) - P |= F_N; - write(TMP, TMP3); - write(TMP, TMP3 >> 8); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP3 = read(m_TMP); + m_TMP3 = set_h(m_TMP3, read(m_TMP+1)); + m_TMP2 = m_P; + m_P &= ~(F_C|F_N|F_Z); + if(m_TMP3 & 0x8000) + m_P |= F_C; + m_TMP3 <<= 1; + if(m_TMP2 & F_C) + m_TMP3 |= 0x0001; + if(!m_TMP3) + m_P |= F_Z; + else if(m_TMP3 & 0x8000) + m_P |= F_N; + write(m_TMP, m_TMP3); + write(m_TMP, m_TMP3 >> 8); prefetch(); rti_ce_imp read_pc(); inc_SP_ce(); - P = read(SP) | F_B; + m_P = read(m_SP) | F_B; inc_SP_ce(); - PC = read(SP); + m_PC = read(m_SP); inc_SP_ce(); - PC = set_h(PC, read(SP)); + m_PC = set_h(m_PC, read(m_SP)); prefetch(); rtn_imm - TMP = read_pc(); - PC++; - if(P & F_E) - SP = set_l(SP, SP+TMP); + m_TMP = read_pc(); + m_PC++; + if(m_P & F_E) + m_SP = set_l(m_SP, m_SP+m_TMP); else - SP += TMP; + m_SP += m_TMP; read_pc(); - read(SP); + read(m_SP); inc_SP(); - PC = read(SP); + m_PC = read(m_SP); inc_SP(); - PC = set_h(PC, read(SP)); + m_PC = set_h(m_PC, read(m_SP)); read_pc(); - PC++; + m_PC++; prefetch(); rts_ce_imp inc_SP_ce(); - PC = read(SP); + m_PC = read(m_SP); inc_SP_ce(); - PC = set_h(PC, read(SP)); + m_PC = set_h(m_PC, read(m_SP)); read_pc(); - PC++; + m_PC++; prefetch(); sbc_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); sbc_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); sbc_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += Y; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); sbc_ce_idx - TMP2 = read_pc(); - PC++; - TMP2 += X; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); sbc_ce_idy - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Y); - do_sbc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Y); + do_sbc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); sbc_idz - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - TMP2 = read(TMP+Z); - do_sbc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + m_TMP2 = read(m_TMP+m_Z); + do_sbc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); sbc_ce_imm - TMP = read_pc(); - PC++; - do_sbc(TMP); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + do_sbc(m_TMP); + if(m_P & F_D) + set_nz(m_A); prefetch(); sbc_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(B|TMP); - do_sbc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_B|m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); sbc_ce_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(B|uint8_t(TMP+X)); - do_sbc(TMP2); - if(P & F_D) - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(m_B|uint8_t(m_TMP+m_X)); + do_sbc(m_TMP2); + if(m_P & F_D) + set_nz(m_A); prefetch(); sec_ce_imp - P |= F_C; + m_P |= F_C; prefetch(); sed_ce_imp - P |= F_D; + m_P |= F_D; prefetch(); see_imp read_pc(); - P |= F_E; + m_P |= F_E; prefetch(); sei_ce_imp prefetch(); - P |= F_I; // Do *not* move it before the prefetch + m_P |= F_I; // Do *not* move it before the prefetch smb_ce_bzp - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP2 |= 1 << ((inst_state >> 4) & 7); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP2 |= 1 << ((m_inst_state >> 4) & 7); + write(m_TMP, m_TMP2); prefetch(); sta_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP+X, A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP+m_X, m_A); prefetch(); sta_ce_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP+Y, A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP+m_Y, m_A); prefetch(); sta_ce_idx - TMP2 = read_pc(); - PC++; - TMP2 += X; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - write(TMP, A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + write(m_TMP, m_A); prefetch(); sta_ce_idy - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - write(TMP+Y, A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + write(m_TMP+m_Y, m_A); prefetch(); sta_idz - TMP2 = read_pc(); - PC++; - TMP = read(B|TMP2); - TMP2++; - TMP = set_h(TMP, read(B|TMP2)); - write(TMP+Z, A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_B|m_TMP2); + m_TMP2++; + m_TMP = set_h(m_TMP, read(m_B|m_TMP2)); + write(m_TMP+m_Z, m_A); prefetch(); sta_isy read_pc(); - TMP = read_pc(); - PC++; - if(P & F_E) - TMP = set_l(SP, SP+TMP); + m_TMP = read_pc(); + m_PC++; + if(m_P & F_E) + m_TMP = set_l(m_SP, m_SP+m_TMP); else - TMP = SP + TMP; - TMP2 = read(TMP); - TMP++; - TMP = TMP2 | (read(TMP) << 8); - write(TMP+Y, A); + m_TMP = m_SP + m_TMP; + m_TMP2 = read(m_TMP); + m_TMP++; + m_TMP = m_TMP2 | (read(m_TMP) << 8); + write(m_TMP+m_Y, m_A); prefetch(); sta_ce_zpg - TMP = read_pc(); - PC++; - write(B|TMP, A); + m_TMP = read_pc(); + m_PC++; + write(m_B|m_TMP, m_A); prefetch(); sta_ce_zpx - TMP = read_pc(); - PC++; - write(B|uint8_t(TMP+X), A); + m_TMP = read_pc(); + m_PC++; + write(m_B|uint8_t(m_TMP+m_X), m_A); prefetch(); stx_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP+Y, X); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP+m_Y, m_X); prefetch(); stx_ce_zpg - TMP = read_pc(); - PC++; - write(B|TMP, X); + m_TMP = read_pc(); + m_PC++; + write(m_B|m_TMP, m_X); prefetch(); stx_ce_zpy - TMP = read_pc(); - PC++; - write(B|uint8_t(TMP+Y), X); + m_TMP = read_pc(); + m_PC++; + write(m_B|uint8_t(m_TMP+m_Y), m_X); prefetch(); sty_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP+X, Y); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP+m_X, m_Y); prefetch(); sty_ce_zpg - TMP = read_pc(); - PC++; - write(B|TMP, Y); + m_TMP = read_pc(); + m_PC++; + write(m_B|m_TMP, m_Y); prefetch(); sty_ce_zpx - TMP = read_pc(); - PC++; - write(B|uint8_t(TMP+X), Y); + m_TMP = read_pc(); + m_PC++; + write(m_B|uint8_t(m_TMP+m_X), m_Y); prefetch(); stz_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP, Z); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP, m_Z); prefetch(); stz_ce_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP+X, Z); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP+m_X, m_Z); prefetch(); stz_ce_zpg - TMP = read_pc(); - PC++; - write(B|TMP, Z); + m_TMP = read_pc(); + m_PC++; + write(m_B|m_TMP, m_Z); prefetch(); stz_ce_zpx - TMP = read_pc(); - PC++; - write(B|uint8_t(TMP+X), Z); + m_TMP = read_pc(); + m_PC++; + write(m_B|uint8_t(m_TMP+m_X), m_Z); prefetch(); tab_imp - B = A << 8; + m_B = m_A << 8; prefetch(); tax_ce_imp - X = A; - set_nz(X); + m_X = m_A; + set_nz(m_X); prefetch(); tay_ce_imp - Y = A; - set_nz(Y); + m_Y = m_A; + set_nz(m_Y); prefetch(); taz_imp - Z = A; - set_nz(Z); + m_Z = m_A; + set_nz(m_Z); prefetch(); tba_imp - A = B >> 8; - set_nz(A); + m_A = m_B >> 8; + set_nz(m_A); prefetch(); trb_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 &= ~A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 &= ~m_A; + write(m_TMP, m_TMP2); prefetch(); trb_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 &= ~A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 &= ~m_A; + write(m_TMP, m_TMP2); prefetch(); tsb_ce_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 |= A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 |= m_A; + write(m_TMP, m_TMP2); prefetch(); tsb_ce_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 |= A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 |= m_A; + write(m_TMP, m_TMP2); prefetch(); tsx_ce_imp - X = SP; - set_nz(X); + m_X = m_SP; + set_nz(m_X); prefetch(); tsy_imp - Y = SP >> 8; - set_nz(Y); + m_Y = m_SP >> 8; + set_nz(m_Y); prefetch(); txa_ce_imp - A = X; - set_nz(A); + m_A = m_X; + set_nz(m_A); prefetch(); txs_ce_imp - SP = set_l(SP, X); + m_SP = set_l(m_SP, m_X); prefetch_noirq(); tys_imp - SP = set_h(SP, Y); + m_SP = set_h(m_SP, m_Y); prefetch(); tya_ce_imp - A = Y; - set_nz(A); + m_A = m_Y; + set_nz(m_A); prefetch(); tza_imp - A = Z; - set_nz(A); + m_A = m_Z; + set_nz(m_A); prefetch(); diff --git a/src/devices/cpu/m6502/om740.lst b/src/devices/cpu/m6502/om740.lst index e37506ae164..4d706731718 100644 --- a/src/devices/cpu/m6502/om740.lst +++ b/src/devices/cpu/m6502/om740.lst @@ -3,1885 +3,1885 @@ # m740 opcodes set_imp read_pc(); - P |= F_T; - inst_state_base = 0x100; + m_P |= F_T; + m_inst_state_base = 0x100; prefetch(); clt_imp read_pc(); - P &= ~F_T; - inst_state_base = 0; + m_P &= ~F_T; + m_inst_state_base = 0; prefetch(); ldm_imz - TMP = read_pc(); - PC++; - TMP2 = read_pc(); - PC++; - write(TMP2, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_pc(); + m_PC++; + write(m_TMP2, m_TMP); prefetch(); dec_acc read_pc(); - A--; - set_nz(A); + m_A--; + set_nz(m_A); prefetch(); inc_acc read_pc(); - A++; - set_nz(A); + m_A++; + set_nz(m_A); prefetch(); jsr_spg - TMP = read_pc(); - read_dummy(SP); - write(SP, PC>>8); + m_TMP = read_pc(); + read_dummy(m_SP); + write(m_SP, m_PC>>8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - TMP = set_h(TMP, 0xff); - PC = TMP; + m_TMP = set_h(m_TMP, 0xff); + m_PC = m_TMP; prefetch(); clb_bac read_pc(); - A = do_clb(A, (IR>>5) & 7); + m_A = do_clb(m_A, (m_IR>>5) & 7); prefetch(); seb_bac read_pc(); - A = do_seb(A, (IR>>5) & 7); + m_A = do_seb(m_A, (m_IR>>5) & 7); prefetch(); clb_biz - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_clb(TMP2, (IR>>5) & 7); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_clb(m_TMP2, (m_IR>>5) & 7); + write(m_TMP, m_TMP2); prefetch(); seb_biz - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_seb(TMP2, (IR>>5) & 7); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_seb(m_TMP2, (m_IR>>5) & 7); + write(m_TMP, m_TMP2); prefetch(); bbc_bzr - TMP = read_pc(); - PC++; - TMP2 = read(TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); read_pc(); - if(!(TMP2 & (1 << ((IR>>5) & 7)))) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(!(m_TMP2 & (1 << ((m_IR>>5) & 7)))) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bbs_bzr - TMP = read_pc(); - PC++; - TMP2 = read(TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); read_pc(); - if(TMP2 & (1 << ((IR>>5) & 7))) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(m_TMP2 & (1 << ((m_IR>>5) & 7))) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bbc_bar read_pc(); read_pc(); - if(!(A & (1 << ((IR>>5) & 7)))) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(!(m_A & (1 << ((m_IR>>5) & 7)))) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bbs_bar read_pc(); read_pc(); - if(A & (1 << ((IR>>5) & 7))) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(m_A & (1 << ((m_IR>>5) & 7))) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); com_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 ^= 0xff; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 ^= 0xff; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rrf_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - read_dummy(TMP); - read_dummy(TMP); - read_dummy(TMP); - TMP2 = do_rrf(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + read_dummy(m_TMP); + read_dummy(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_rrf(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); tst_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - set_nz(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + set_nz(m_TMP2); prefetch(); bra_rel - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); prefetch(); jmp_zpi - TMP2 = read_pc(); - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - PC = TMP; + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_PC = m_TMP; prefetch(); jsr_zpi - TMP2 = read_pc(); - read_dummy(SP); - write(SP, PC>>8); + m_TMP2 = read_pc(); + read_dummy(m_SP); + write(m_SP, m_PC>>8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - PC = TMP; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_PC = m_TMP; prefetch(); stp_imp read_pc(); - logerror("STP at $%04x\n", PC); - while(!irq_state) { + logerror("STP at $%04x\n", m_PC); + while(!m_irq_state) { eat-all-cycles; } prefetch(); wit_imp read_pc(); - logerror("WIT at $%04x\n", PC); - while(!irq_state) { + logerror("WIT at $%04x\n", m_PC); + while(!m_irq_state) { eat-all-cycles; } prefetch(); reset_m - P |= F_I; - read_dummy(SP); + m_P |= F_I; + read_dummy(m_SP); dec_SP(); - read_dummy(SP); + read_dummy(m_SP); dec_SP(); - read_dummy(SP); + read_dummy(m_SP); dec_SP(); - PC = read_arg(0xfffe); - PC = set_h(PC, read_arg(0xffff)); + m_PC = read_arg(0xfffe); + m_PC = set_h(m_PC, read_arg(0xffff)); prefetch(); - inst_state = -1; + m_inst_state = -1; brk_m_imp - if(irq_taken) { + if(m_irq_taken) { read_pc(); } else { read_pc(); - PC++; + m_PC++; } - write(SP, PC >> 8); + write(m_SP, m_PC >> 8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - write(SP, irq_taken ? P & ~F_B : P); + write(m_SP, m_irq_taken ? m_P & ~F_B : m_P); dec_SP(); // BRK uses the vector of the interrupt with the highest priority if any are enabled and pending - if(irq_taken) - standard_irq_callback(IRQ_LINE, PC); - PC = read_arg(m_irq_vector); - PC = set_h(PC, read_arg(m_irq_vector+1)); - irq_taken = false; - P |= F_I; // Do *not* move after the prefetch + if(m_irq_taken) + standard_irq_callback(IRQ_LINE, m_PC); + m_PC = read_arg(m_irq_vector); + m_PC = set_h(m_PC, read_arg(m_irq_vector+1)); + m_irq_taken = false; + m_P |= F_I; // Do *not* move after the prefetch prefetch(); - inst_state = -1; + m_inst_state = -1; # 6502 opcodes with modified access patterns adc_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); prefetch(); adc_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); prefetch(); adc_m_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - do_adc(TMP2); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + do_adc(m_TMP2); prefetch(); adc_m_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - do_adc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + do_adc(m_TMP2); prefetch(); adc_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - do_adc(TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_adc(m_TMP2); prefetch(); and_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_m_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_m_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); asl_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_m_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); bcc_m_rel - if(!(P & F_C)) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(!(m_P & F_C)) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bcs_m_rel - if(P & F_C) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(m_P & F_C) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); beq_m_rel - if(P & F_Z) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(m_P & F_Z) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bmi_m_rel - if(P & F_N) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(m_P & F_N) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bne_m_rel - if(!(P & F_Z)) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(!(m_P & F_Z)) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bpl_m_rel - if(!(P & F_N)) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(!(m_P & F_N)) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bvc_m_rel - if(!(P & F_V)) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(!(m_P & F_V)) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); bvs_m_rel - if(P & F_V) { - TMP = read_pc(); - read_dummy(set_l(PC, PC+1)); - PC++; - read_dummy(set_l(PC, PC+int8_t(TMP))); - PC += int8_t(TMP); + if(m_P & F_V) { + m_TMP = read_pc(); + read_dummy(set_l(m_PC, m_PC+1)); + m_PC++; + read_dummy(set_l(m_PC, m_PC+int8_t(m_TMP))); + m_PC += int8_t(m_TMP); } else { read_pc(); - PC++; + m_PC++; } prefetch(); cmp_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_m_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_m_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + do_cmp(m_A, m_TMP2); prefetch(); cmp_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - do_cmp(A, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_cmp(m_A, m_TMP2); prefetch(); dec_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_m_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read_dummy(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); eor_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_m_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_m_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); inc_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_m_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read_dummy(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); jmp_m_ind - // JMP ($XXFF) has the same bug as on the NMOS 6502 - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - PC = read_data(TMP); - PC = set_h(PC, read_data(set_l(TMP, TMP+1))); + // JMP ($m_Xm_XFF) has the same bug as on the NMOS 6502 + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = read_data(m_TMP); + m_PC = set_h(m_PC, read_data(set_l(m_TMP, m_TMP+1))); prefetch(); jsr_m_adr - TMP = read_pc(); - PC++; - read_dummy(SP); - write(SP, PC>>8); + m_TMP = read_pc(); + m_PC++; + read_dummy(m_SP); + write(m_SP, m_PC>>8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - TMP = set_h(TMP, read_pc()); - PC++; - PC = TMP; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = m_TMP; prefetch(); lda_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - A = read(TMP + X); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_A = read(m_TMP + m_X); + set_nz(m_A); prefetch(); lda_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - A = read(TMP + Y); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_A = read(m_TMP + m_Y); + set_nz(m_A); prefetch(); lda_m_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - A = read_data(TMP); - set_nz(A); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_A = read_data(m_TMP); + set_nz(m_A); prefetch(); lda_m_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - A = read_data(TMP+Y); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_A = read_data(m_TMP+m_Y); + set_nz(m_A); prefetch(); lda_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - A = read(uint8_t(TMP+X)); - set_nz(A); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_A = read(uint8_t(m_TMP+m_X)); + set_nz(m_A); prefetch(); ldx_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - X = read(TMP + Y); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_X = read(m_TMP + m_Y); + set_nz(m_X); prefetch(); ldx_m_zpy - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - X = read(uint8_t(TMP+Y)); - set_nz(X); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_X = read(uint8_t(m_TMP+m_Y)); + set_nz(m_X); prefetch(); ldy_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - Y = read(TMP); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_Y = read(m_TMP); + set_nz(m_Y); prefetch(); ldy_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - Y = read(uint8_t(TMP+X)); - set_nz(Y); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_Y = read(uint8_t(m_TMP+m_X)); + set_nz(m_Y); prefetch(); lsr_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_m_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ora_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_m_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_m_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); pla_m_imp read_pc(); - read_dummy(SP); + read_dummy(m_SP); inc_SP(); - A = read(SP); - set_nz(A); + m_A = read(m_SP); + set_nz(m_A); prefetch(); plp_m_imp read_pc(); - read_dummy(SP); + read_dummy(m_SP); inc_SP(); - TMP = read(SP) | (F_B); - inst_state_base = (TMP & F_T) ? 0x100 : 0; + m_TMP = read(m_SP) | (F_B); + m_inst_state_base = (m_TMP & F_T) ? 0x100 : 0; prefetch(); - P = TMP; // Do *not* move it before the prefetch + m_P = m_TMP; // Do *not* move it before the prefetch rol_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_m_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_m_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read_dummy(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read_dummy(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rti_m_imp read_pc(); - read_dummy(SP); + read_dummy(m_SP); inc_SP(); - P = read(SP) | (F_B); - inst_state_base = (P & F_T) ? 0x100 : 0; + m_P = read(m_SP) | (F_B); + m_inst_state_base = (m_P & F_T) ? 0x100 : 0; inc_SP(); - PC = read(SP); + m_PC = read(m_SP); inc_SP(); - PC = set_h(PC, read(SP)); + m_PC = set_h(m_PC, read(m_SP)); prefetch(); rts_m_imp read_pc(); - read_dummy(SP); + read_dummy(m_SP); inc_SP(); - PC = read(SP); + m_PC = read(m_SP); inc_SP(); - PC = set_h(PC, read(SP)); - read_dummy(PC); - PC++; + m_PC = set_h(m_PC, read(m_SP)); + read_dummy(m_PC); + m_PC++; prefetch(); sbc_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); prefetch(); sbc_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); prefetch(); sbc_m_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - do_sbc(TMP2); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + do_sbc(m_TMP2); prefetch(); sbc_m_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - do_sbc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + do_sbc(m_TMP2); prefetch(); sbc_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - do_sbc(TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_sbc(m_TMP2); prefetch(); sta_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(TMP); - write(TMP, A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(m_TMP); + write(m_TMP, m_A); prefetch(); sta_m_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - read_dummy(TMP+X); - write(TMP+X, A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + read_dummy(m_TMP+m_X); + write(m_TMP+m_X, m_A); prefetch(); sta_m_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - read_dummy(TMP+Y); - write(TMP+Y, A); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + read_dummy(m_TMP+m_Y); + write(m_TMP+m_Y, m_A); prefetch(); sta_m_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(TMP); - write_data(TMP, A); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(m_TMP); + write_data(m_TMP, m_A); prefetch(); sta_m_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - read_dummy(TMP+Y); - write_data(TMP+Y, A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + read_dummy(m_TMP+m_Y); + write_data(m_TMP+m_Y, m_A); prefetch(); sta_m_zpg - TMP = read_pc(); - PC++; - read_dummy(TMP); - write(TMP, A); + m_TMP = read_pc(); + m_PC++; + read_dummy(m_TMP); + write(m_TMP, m_A); prefetch(); sta_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - read_dummy(uint8_t(TMP+X)); - write(uint8_t(TMP+X), A); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + read_dummy(uint8_t(m_TMP+m_X)); + write(uint8_t(m_TMP+m_X), m_A); prefetch(); stx_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(TMP); - write(TMP, X); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(m_TMP); + write(m_TMP, m_X); prefetch(); stx_m_zpg - TMP = read_pc(); - PC++; - read_dummy(TMP); - write(TMP, X); + m_TMP = read_pc(); + m_PC++; + read_dummy(m_TMP); + write(m_TMP, m_X); prefetch(); stx_m_zpy - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - read_dummy(uint8_t(TMP+Y)); - write(uint8_t(TMP+Y), X); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + read_dummy(uint8_t(m_TMP+m_Y)); + write(uint8_t(m_TMP+m_Y), m_X); prefetch(); sty_m_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(TMP); - write(TMP, Y); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(m_TMP); + write(m_TMP, m_Y); prefetch(); sty_m_zpg - TMP = read_pc(); - PC++; - read_dummy(TMP); - write(TMP, Y); + m_TMP = read_pc(); + m_PC++; + read_dummy(m_TMP); + write(m_TMP, m_Y); prefetch(); sty_m_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - read_dummy(uint8_t(TMP+X)); - write(uint8_t(TMP+X), Y); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + read_dummy(uint8_t(m_TMP+m_X)); + write(uint8_t(m_TMP+m_X), m_Y); prefetch(); # T=1 opcodes adct_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - do_adct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_adct(m_TMP2); + write(m_X, m_TMP); prefetch(); adct_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - do_adct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_adct(m_TMP2); + write(m_X, m_TMP); prefetch(); adct_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - do_adct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_adct(m_TMP2); + write(m_X, m_TMP); prefetch(); adct_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - TMP = read(X); - read_dummy(X); - do_adct(TMP2); - write(X, TMP); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_adct(m_TMP2); + write(m_X, m_TMP); prefetch(); adct_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - TMP = read(X); - read_dummy(X); - do_adct(TMP2); - write(X, TMP); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_TMP = read(m_X); + read_dummy(m_X); + do_adct(m_TMP2); + write(m_X, m_TMP); prefetch(); adct_imm - TMP2 = read_pc(); - PC++; - TMP = read(X); - read_dummy(X); - do_adct(TMP2); - write(X, TMP); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_X); + read_dummy(m_X); + do_adct(m_TMP2); + write(m_X, m_TMP); prefetch(); adct_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - do_adct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_adct(m_TMP2); + write(m_X, m_TMP); prefetch(); adct_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - TMP = read(X); - read_dummy(X); - do_adct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_TMP = read(m_X); + read_dummy(m_X); + do_adct(m_TMP2); + write(m_X, m_TMP); prefetch(); andt_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP &= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP &= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); andt_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP &= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP &= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); andt_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP &= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP &= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); andt_imm - TMP = read_pc(); - PC++; - TMP2 = read(X); - read_dummy(X); - TMP2 &= TMP; - set_nz(TMP2); - write(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_X); + read_dummy(m_X); + m_TMP2 &= m_TMP; + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); andt_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - TMP = read(X); - read_dummy(X); - TMP &= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP &= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); andt_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - TMP = read(X); - read_dummy(X); - TMP &= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP &= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); andt_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP &= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP &= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); andt_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - TMP = read(X); - read_dummy(X); - TMP &= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP &= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); cmpt_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = read(X); - do_cmp(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + do_cmp(m_TMP, m_TMP2); prefetch(); cmpt_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - TMP = read(X); - do_cmp(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + do_cmp(m_TMP, m_TMP2); prefetch(); cmpt_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - TMP = read(X); - do_cmp(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + do_cmp(m_TMP, m_TMP2); prefetch(); cmpt_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - TMP = read(X); - do_cmp(TMP, TMP2); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_TMP = read(m_X); + do_cmp(m_TMP, m_TMP2); prefetch(); cmpt_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - TMP = read(X); - do_cmp(TMP, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_TMP = read(m_X); + do_cmp(m_TMP, m_TMP2); prefetch(); cmpt_imm - TMP = read_pc(); - PC++; - TMP2 = read(X); - do_cmp(TMP2, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_X); + do_cmp(m_TMP2, m_TMP); prefetch(); cmpt_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP = read(X); - do_cmp(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + do_cmp(m_TMP, m_TMP2); prefetch(); cmpt_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - TMP = read(X); - do_cmp(TMP, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_TMP = read(m_X); + do_cmp(m_TMP, m_TMP2); prefetch(); eort_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP ^= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP ^= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); eort_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP ^= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP ^= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); eort_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP ^= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP ^= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); eort_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - TMP = read(X); - read_dummy(X); - TMP ^= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP ^= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); eort_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - TMP = read(X); - read_dummy(X); - TMP ^= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP ^= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); eort_imm - TMP = read_pc(); - PC++; - TMP2 = read(X); - read_dummy(X); - TMP2 ^= TMP; - set_nz(TMP2); - write(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_X); + read_dummy(m_X); + m_TMP2 ^= m_TMP; + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); eort_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP ^= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP ^= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); eort_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - TMP = read(X); - read_dummy(X); - TMP ^= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP ^= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); ldt_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read_dummy(X); - set_nz(TMP2); - write(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_X); + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ldt_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read_dummy(X); - set_nz(TMP2); - write(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read_dummy(m_X); + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ldt_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - read_dummy(X); - set_nz(TMP2); - write(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + read_dummy(m_X); + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ldt_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - read_dummy(X); - set_nz(TMP2); - write(X, TMP2); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + read_dummy(m_X); + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ldt_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - read_dummy(X); - set_nz(TMP2); - write(X, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + read_dummy(m_X); + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ldt_imm - TMP2 = read_pc(); - PC++; - read_dummy(X); - set_nz(TMP2); - write(X, TMP2); + m_TMP2 = read_pc(); + m_PC++; + read_dummy(m_X); + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ldt_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read_dummy(X); - set_nz(TMP2); - write(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read_dummy(m_X); + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ldt_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - read_dummy(X); - set_nz(TMP2); - write(X, TMP2); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + read_dummy(m_X); + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ort_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP |= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP |= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); ort_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP |= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP |= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); ort_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP |= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP |= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); ort_imm - TMP = read_pc(); - PC++; - TMP2 = read(X); - read_dummy(X); - TMP2 |= TMP; - set_nz(TMP2); - write(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_X); + read_dummy(m_X); + m_TMP2 |= m_TMP; + set_nz(m_TMP2); + write(m_X, m_TMP2); prefetch(); ort_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - TMP = read(X); - read_dummy(X); - TMP |= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP |= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); ort_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - TMP = read(X); - read_dummy(X); - TMP |= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP |= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); ort_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - TMP |= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP |= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); ort_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - TMP = read(X); - read_dummy(X); - TMP |= TMP2; - set_nz(TMP); - write(X, TMP); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_TMP = read(m_X); + read_dummy(m_X); + m_TMP |= m_TMP2; + set_nz(m_TMP); + write(m_X, m_TMP); prefetch(); sbct_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - do_sbct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_sbct(m_TMP2); + write(m_X, m_TMP); prefetch(); sbct_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - do_sbct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_sbct(m_TMP2); + write(m_X, m_TMP); prefetch(); sbct_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read_dummy(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - do_sbct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_sbct(m_TMP2); + write(m_X, m_TMP); prefetch(); sbct_idx - TMP2 = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read_data(TMP); - TMP = read(X); - read_dummy(X); - do_sbct(TMP2); - write(X, TMP); + m_TMP2 = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read_data(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_sbct(m_TMP2); + write(m_X, m_TMP); prefetch(); sbct_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read_dummy(set_l(TMP, TMP+Y)); - TMP2 = read_data(TMP+Y); - TMP = read(X); - read_dummy(X); - do_sbct(TMP2); - write(X, TMP); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read_dummy(set_l(m_TMP, m_TMP+m_Y)); + m_TMP2 = read_data(m_TMP+m_Y); + m_TMP = read(m_X); + read_dummy(m_X); + do_sbct(m_TMP2); + write(m_X, m_TMP); prefetch(); sbct_imm - TMP2 = read_pc(); - PC++; - TMP = read(X); - read_dummy(X); - do_sbct(TMP2); - write(X, TMP); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_X); + read_dummy(m_X); + do_sbct(m_TMP2); + write(m_X, m_TMP); prefetch(); sbct_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - TMP = read(X); - read_dummy(X); - do_sbct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read(m_X); + read_dummy(m_X); + do_sbct(m_TMP2); + write(m_X, m_TMP); prefetch(); sbct_zpx - TMP = read_pc(); - read_dummy(PC & 0xff); - PC++; - TMP2 = read(uint8_t(TMP+X)); - TMP = read(X); - read_dummy(X); - do_sbct(TMP2); - write(X, TMP); + m_TMP = read_pc(); + read_dummy(m_PC & 0xff); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_TMP = read(m_X); + read_dummy(m_X); + do_sbct(m_TMP2); + write(m_X, m_TMP); prefetch(); diff --git a/src/devices/cpu/m6502/or65c19.lst b/src/devices/cpu/m6502/or65c19.lst index 36568280df8..f4763d6307d 100644 --- a/src/devices/cpu/m6502/or65c19.lst +++ b/src/devices/cpu/m6502/or65c19.lst @@ -1,183 +1,183 @@ # license:BSD-3-Clause -# copyright-holders:Olivier Galibert, AJR +# copyright-holders:Olivier Galibert, m_AJR adc_ipx - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP2 = read(TMP+X); - do_adc(TMP2); - if(P & F_D) { + m_TMP2 = read(m_TMP+m_X); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); add_imm - TMP = read_pc(); - PC++; - do_add(TMP); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + do_add(m_TMP); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); add_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_add(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_add(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); add_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_add(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_add(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); and_ipx - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP2 = read(TMP+X); - A &= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_X); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); asr_acc read_pc(); - A = do_asr(A); + m_A = do_asr(m_A); prefetch(); bar_amr - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = read_pc(); - read_pc(); - PC++; - TMP2 = ~TMP2 & TMP; - TMP = read_pc(); - PC++; - if(TMP2 != 0) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read_pc(); + read_pc(); + m_PC++; + m_TMP2 = ~m_TMP2 & m_TMP; + m_TMP = read_pc(); + m_PC++; + if(m_TMP2 != 0) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); bas_amr - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = read_pc(); - read_pc(); - PC++; - TMP2 &= TMP; - TMP = read_pc(); - PC++; - if(TMP2 != 0) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = read_pc(); + read_pc(); + m_PC++; + m_TMP2 &= m_TMP; + m_TMP = read_pc(); + m_PC++; + if(m_TMP2 != 0) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); brk_r_imp - if(irq_taken || nmi_pending) { + if(m_irq_taken || m_nmi_pending) { read_pc(); } else { read_pc(); - PC++; + m_PC++; } - write(SP, PC >> 8); + write(m_SP, m_PC >> 8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - write(SP, irq_taken || nmi_pending ? P & ~F_B : P); + write(m_SP, m_irq_taken || m_nmi_pending ? m_P & ~F_B : m_P); dec_SP(); - if(irq_taken && nmi_pending) { - standard_irq_callback(NMI_LINE, PC); - PC = read_arg(0xfffc); - PC = set_h(PC, read_arg(0xfffd)); - nmi_pending = false; + if(m_irq_taken && m_nmi_pending) { + standard_irq_callback(NMI_LINE, m_PC); + m_PC = read_arg(0xfffc); + m_PC = set_h(m_PC, read_arg(0xfffd)); + m_nmi_pending = false; } else { - if(irq_taken) - standard_irq_callback(((~TMP & 0x000e) >> 1) - 1, PC); - TMP = get_irq_vector(); - PC = read_arg(TMP); - PC = set_h(PC, read_arg(TMP+1)); + if(m_irq_taken) + standard_irq_callback(((~m_TMP & 0x000e) >> 1) - 1, m_PC); + m_TMP = get_irq_vector(); + m_PC = read_arg(m_TMP); + m_PC = set_h(m_PC, read_arg(m_TMP+1)); } - irq_taken = false; - P = (P | F_I) & ~F_D; // Do *not* move after the prefetch + m_irq_taken = false; + m_P = (m_P | F_I) & ~F_D; // Do *not* move after the prefetch prefetch(); - inst_state = -1; + m_inst_state = -1; clw_imp read_pc(); - P &= ~F_V; + m_P &= ~F_V; m_w = 0; prefetch(); cmp_ipx - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP2 = read(TMP+X); - do_cmp(A, TMP2); + m_TMP2 = read(m_TMP+m_X); + do_cmp(m_A, m_TMP2); prefetch(); eor_ipx - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP2 = read(TMP+X); - A ^= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_X); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); exc_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, A); - A = TMP2; + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_A); + m_A = m_TMP2; prefetch(); ini_imp @@ -187,83 +187,83 @@ ini_imp prefetch(); jpi_ind - m_i = PC; - TMP = read_arg(m_i); - TMP = set_h(TMP, read_arg(m_i+1)); + m_i = m_PC; + m_TMP = read_arg(m_i); + m_TMP = set_h(m_TMP, read_arg(m_i+1)); m_i += 2; - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); jsb_vec read_pc(); - write(SP, PC>>8); + write(m_SP, m_PC>>8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - TMP = 0xffe0 | ((inst_state >> 3) & 0x0e); - PC = read_arg(TMP); - PC = set_h(PC, read_arg(TMP+1)); + m_TMP = 0xffe0 | ((m_inst_state >> 3) & 0x0e); + m_PC = read_arg(m_TMP); + m_PC = set_h(m_PC, read_arg(m_TMP+1)); prefetch(); jmp_r_ind - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); jsr_r_adr - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(SP, PC>>8); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_SP, m_PC>>8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - PC = TMP; + m_PC = m_TMP; prefetch(); lab_acc read_pc(); read_pc(); - if(int8_t(A) < 0) - A = -A; - set_nz(A); + if(int8_t(m_A) < 0) + m_A = -m_A; + set_nz(m_A); prefetch(); lai_imp read_pc(); - A = read(m_i); + m_A = read(m_i); prefetch(); lan_imp read_pc(); - A = read(m_i); + m_A = read(m_i); m_i++; prefetch(); lda_ipx - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - A = read(TMP+X); - set_nz(A); + m_A = read(m_TMP+m_X); + set_nz(m_A); prefetch(); lii_imp read_pc(); - TMP = read(m_i); - TMP = set_h(TMP, read(m_i+1)); - read(TMP); - m_i = TMP; + m_TMP = read(m_i); + m_TMP = set_h(m_TMP, read(m_i+1)); + read(m_TMP); + m_i = m_TMP; prefetch(); mpa_imp @@ -272,8 +272,8 @@ mpa_imp read_pc(); read_pc(); read_pc(); - TMP = int8_t(A) * int8_t(Y); - m_w = do_accumulate(TMP, m_w); + m_TMP = int8_t(m_A) * int8_t(m_Y); + m_w = do_accumulate(m_TMP, m_w); prefetch(); mpy_imp @@ -282,207 +282,207 @@ mpy_imp read_pc(); read_pc(); read_pc(); - TMP = int8_t(A) * int8_t(Y); - A = do_accumulate(TMP, 0)>>8; + m_TMP = int8_t(m_A) * int8_t(m_Y); + m_A = do_accumulate(m_TMP, 0)>>8; prefetch(); neg_acc read_pc(); - A = -A; - set_nz(A); + m_A = -m_A; + set_nz(m_A); prefetch(); nxt_imp read_pc(); - PC = read(m_i); - PC = set_h(PC, read(m_i+1)); + m_PC = read(m_i); + m_PC = set_h(m_PC, read(m_i+1)); m_i += 2; prefetch(); ora_ipx - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP2 = read(TMP+X); - A |= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_X); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); phi_imp read_pc(); - write(SP, m_i>>8); + write(m_SP, m_i>>8); dec_SP(); - write(SP, m_i); + write(m_SP, m_i); dec_SP(); prefetch(); phw_imp read_pc(); - write(SP, m_w>>8); + write(m_SP, m_w>>8); dec_SP(); - write(SP, m_w); + write(m_SP, m_w); dec_SP(); prefetch(); pia_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - m_i = read(SP); + m_i = read(m_SP); inc_SP(); - m_i = set_h(m_i, read(SP)); - A = read(m_i); + m_i = set_h(m_i, read(m_SP)); + m_A = read(m_i); m_i++; prefetch(); pli_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - m_i = read(SP); + m_i = read(m_SP); inc_SP(); - m_i = set_h(m_i, read(SP)); + m_i = set_h(m_i, read(m_SP)); read(m_i); prefetch(); plw_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - m_w = read(SP); + m_w = read(m_SP); inc_SP(); - m_w = set_h(m_w, read(SP)); + m_w = set_h(m_w, read(m_SP)); prefetch(); psh_imp read_pc(); - write(SP, A); + write(m_SP, m_A); dec_SP(); - write(SP, X); + write(m_SP, m_X); dec_SP(); - write(SP, Y); + write(m_SP, m_Y); dec_SP(); prefetch(); pul_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - Y = read(SP); + m_Y = read(m_SP); inc_SP(); - X = read(SP); + m_X = read(m_SP); inc_SP(); - A = read(SP); + m_A = read(m_SP); prefetch(); rba_ima - A = read_pc(); // "Note that Accumulator contents are altered by RBA and SBA" (C29/C39 Technical Reference Manual, p. C-29) - PC++; - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 &= ~A; - write(TMP, TMP2); + m_A = read_pc(); // "Note that Accumulator contents are altered by RBA and SBA" (C29/C39 Technical Reference Manual, p. C-29) + m_PC++; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 &= ~m_A; + write(m_TMP, m_TMP2); prefetch(); rnd_imp read_pc(); - TMP = set_l(m_w, Y); - A = do_accumulate(TMP, (m_w<<1) & 0x100)>>8; + m_TMP = set_l(m_w, m_Y); + m_A = do_accumulate(m_TMP, (m_w<<1) & 0x100)>>8; prefetch(); rts_r_imp read_pc(); read_pc(); inc_SP(); - PC = read(SP); + m_PC = read(m_SP); inc_SP(); - PC = set_h(PC, read(SP)); + m_PC = set_h(m_PC, read(m_SP)); prefetch(); sba_ima - A = read_pc(); - PC++; - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 |= A; - write(TMP, TMP2); + m_A = read_pc(); + m_PC++; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 |= m_A; + write(m_TMP, m_TMP2); prefetch(); sbc_ipx - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP2 = read(TMP+X); - do_sbc(TMP2); - if(P & F_D) { + m_TMP2 = read(m_TMP+m_X); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sta_ipx - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+X)); - write(TMP+X, A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_X)); + write(m_TMP+m_X, m_A); prefetch(); sti_imz - TMP = read_pc(); - PC++; - TMP2 = read_pc(); - PC++; - write(TMP2, TMP); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_pc(); + m_PC++; + write(m_TMP2, m_TMP); prefetch(); taw_imp read_pc(); - m_w = A<<8; + m_w = m_A<<8; set_nz(m_w>>8); prefetch(); tip_imp read_pc(); - PC = m_i; + m_PC = m_i; prefetch(); twa_imp read_pc(); - A = m_w>>8; - set_nz(A); + m_A = m_w>>8; + set_nz(m_A); prefetch(); # exceptions reset_r read_pc(); - PC++; + m_PC++; read_pc(); - read(SP); + read(m_SP); dec_SP(); - read(SP); + read(m_SP); dec_SP(); - read(SP); + read(m_SP); dec_SP(); - P = (P | F_I) & ~F_D; - PC = read_arg(0xfffe); - PC = set_h(PC, read_arg(0xffff)); + m_P = (m_P | F_I) & ~F_D; + m_PC = read_arg(0xfffe); + m_PC = set_h(m_PC, read_arg(0xffff)); prefetch(); - inst_state = -1; + m_inst_state = -1; diff --git a/src/devices/cpu/m6502/orp2a03.lst b/src/devices/cpu/m6502/orp2a03.lst index 44f453a1c4e..5cc236d4ca0 100644 --- a/src/devices/cpu/m6502/orp2a03.lst +++ b/src/devices/cpu/m6502/orp2a03.lst @@ -2,346 +2,346 @@ # copyright-holders:Olivier Galibert # rp2a03 opcodes - same as 6502 but with d disabled adc_nd_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_adc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_adc_nd(m_TMP2); prefetch(); adc_nd_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - do_adc_nd(TMP2); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_adc_nd(m_TMP2); prefetch(); adc_nd_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP += Y; - TMP2 = read(TMP); - do_adc_nd(TMP2); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_adc_nd(m_TMP2); prefetch(); adc_nd_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_adc_nd(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_adc_nd(m_TMP2); prefetch(); adc_nd_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - do_adc_nd(TMP2); + m_TMP2 = read(m_TMP+m_Y); + do_adc_nd(m_TMP2); prefetch(); adc_nd_imm - TMP = read_pc(); - PC++; - do_adc_nd(TMP); + m_TMP = read_pc(); + m_PC++; + do_adc_nd(m_TMP); prefetch(); adc_nd_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_adc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_adc_nd(m_TMP2); prefetch(); adc_nd_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_adc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_adc_nd(m_TMP2); prefetch(); arr_nd_imm - TMP = read_pc(); - A &= TMP; - PC++; + m_TMP = read_pc(); + m_A &= m_TMP; + m_PC++; do_arr_nd(); prefetch(); rra_nd_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc_nd(m_TMP2); prefetch(); rra_nd_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc_nd(m_TMP2); prefetch(); rra_nd_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc_nd(m_TMP2); prefetch(); rra_nd_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc_nd(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc_nd(m_TMP2); prefetch(); rra_nd_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc_nd(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc_nd(m_TMP2); prefetch(); rra_nd_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc_nd(m_TMP2); prefetch(); rra_nd_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc_nd(m_TMP2); prefetch(); sbc_nd_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_sbc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_sbc_nd(m_TMP2); prefetch(); sbc_nd_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - do_sbc_nd(TMP2); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_sbc_nd(m_TMP2); prefetch(); sbc_nd_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP += Y; - TMP2 = read(TMP); - do_sbc_nd(TMP2); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_sbc_nd(m_TMP2); prefetch(); sbc_nd_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_sbc_nd(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_sbc_nd(m_TMP2); prefetch(); sbc_nd_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - TMP2 = read(TMP+Y); - do_sbc_nd(TMP2); + m_TMP2 = read(m_TMP+m_Y); + do_sbc_nd(m_TMP2); prefetch(); sbc_nd_imm - TMP = read_pc(); - PC++; - do_sbc_nd(TMP); + m_TMP = read_pc(); + m_PC++; + do_sbc_nd(m_TMP); prefetch(); sbc_nd_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_sbc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_sbc_nd(m_TMP2); prefetch(); sbc_nd_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_sbc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_sbc_nd(m_TMP2); prefetch(); isb_nd_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc_nd(m_TMP2); prefetch(); isb_nd_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc_nd(m_TMP2); prefetch(); isb_nd_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc_nd(m_TMP2); prefetch(); isb_nd_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc_nd(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc_nd(m_TMP2); prefetch(); isb_nd_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc_nd(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc_nd(m_TMP2); prefetch(); isb_nd_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc_nd(m_TMP2); prefetch(); isb_nd_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc_nd(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc_nd(m_TMP2); prefetch(); diff --git a/src/devices/cpu/m6502/ovt3xx_spu.lst b/src/devices/cpu/m6502/ovt3xx_spu.lst index eb9afa295c4..7eb37a0cc0d 100644 --- a/src/devices/cpu/m6502/ovt3xx_spu.lst +++ b/src/devices/cpu/m6502/ovt3xx_spu.lst @@ -4,74 +4,74 @@ phy_vt_imp read_pc(); - write(SP, Y); + write(m_SP, m_Y); dec_SP(); prefetch(); phx_vt_imp read_pc(); - write(SP, X); + write(m_SP, m_X); dec_SP(); prefetch(); plx_vt_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - X = read(SP); - set_nz(X); + m_X = read(m_SP); + set_nz(m_X); prefetch(); ply_vt_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - Y = read(SP); - set_nz(Y); + m_Y = read(m_SP); + set_nz(m_Y); prefetch(); vtgetdbk_imp read_pc(); - A = m_databank; + m_A = m_databank; prefetch(); vtsetdbk_imp read_pc(); - m_databank = A; + m_databank = m_A; prefetch(); vtldabank_abx - TMP = read_pc(); - PC++; - TMP2 = read_pc(); - PC++; - A = m_extdata_space->read_byte(((m_databank << 16) | (TMP2 << 8) | TMP) + X); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_pc(); + m_PC++; + m_A = m_extdata_space->read_byte(((m_databank << 16) | (m_TMP2 << 8) | m_TMP) + m_X); + set_nz(m_A); prefetch(); vtldabank_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); } - A = m_extdata_space->read_byte((m_databank << 16) | (TMP+Y) ); - set_nz(A); + m_A = m_extdata_space->read_byte((m_databank << 16) | (m_TMP+m_Y) ); + set_nz(m_A); prefetch(); vtadcx_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - TMP = TMP2 + X + (P & F_C ? 1 : 0); // do ADC, but with source + result in X - P &= ~(F_N|F_V|F_Z|F_C); - if(!uint8_t(TMP)) P |= F_Z; - else if(int8_t(TMP) < 0) P |= F_N; - if(~(TMP2^X) & (TMP2^TMP) & 0x80) P |= F_V; - if(TMP & 0xff00) P |= F_C; - X = TMP & 0xff; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + m_TMP = m_TMP2 + m_X + (m_P & F_C ? 1 : 0); // do m_ADC, but with source + result in m_X + m_P &= ~(F_N|F_V|F_Z|F_C); + if(!uint8_t(m_TMP)) m_P |= F_Z; + else if(int8_t(m_TMP) < 0) m_P |= F_N; + if(~(m_TMP2^m_X) & (m_TMP2^m_TMP) & 0x80) m_P |= F_V; + if(m_TMP & 0xff00) m_P |= F_C; + m_X = m_TMP & 0xff; prefetch(); diff --git a/src/devices/cpu/m6502/ow65c02.lst b/src/devices/cpu/m6502/ow65c02.lst index d4debf9f1fc..37a05fef464 100644 --- a/src/devices/cpu/m6502/ow65c02.lst +++ b/src/devices/cpu/m6502/ow65c02.lst @@ -3,483 +3,483 @@ # w65c02 opcodes adc_c_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); adc_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); - } - TMP += X; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); + } + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); adc_c_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); - } - TMP += Y; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); + } + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); adc_c_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); adc_c_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); - } - TMP2 = read(TMP+Y); - do_adc(TMP2); - if(P & F_D) { + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); + } + m_TMP2 = read(m_TMP+m_Y); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); adc_c_imm - TMP = read_pc(); - PC++; - do_adc(TMP); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + do_adc(m_TMP); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); adc_c_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); adc_c_zpi - TMP2 = read_pc(); - PC++; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); adc_c_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_adc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); and_zpi - TMP2 = read_pc(); - PC++; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); asl_c_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_c_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_c_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read(TMP); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); bbr_zpb - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP = read_pc(); - PC++; - if(!(TMP2 & (1 << ((inst_state >> 4) & 7)))) { + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP = read_pc(); + m_PC++; + if(!(m_TMP2 & (1 << ((m_inst_state >> 4) & 7)))) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); bbs_zpb - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP = read_pc(); - PC++; - if(TMP2 & (1 << ((inst_state >> 4) & 7))) { + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP = read_pc(); + m_PC++; + if(m_TMP2 & (1 << ((m_inst_state >> 4) & 7))) { read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); } prefetch(); bit_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); } - TMP += X; - TMP2 = read(TMP); - do_bit(TMP2); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_bit(m_TMP2); prefetch(); bit_imm - TMP = read_pc(); - PC++; - if(A & TMP) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + if(m_A & m_TMP) + m_P &= ~F_Z; else - P |= F_Z; + m_P |= F_Z; prefetch(); bit_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_bit(TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_bit(m_TMP2); prefetch(); bra_rel - TMP = read_pc(); - PC++; + m_TMP = read_pc(); + m_PC++; read_pc(); - if(page_changing(PC, int8_t(TMP))) { - read_arg(set_l(PC, PC+int8_t(TMP))); + if(page_changing(m_PC, int8_t(m_TMP))) { + read_arg(set_l(m_PC, m_PC+int8_t(m_TMP))); } - PC += int8_t(TMP); + m_PC += int8_t(m_TMP); prefetch(); brk_c_imp - if(irq_taken || nmi_pending) { + if(m_irq_taken || m_nmi_pending) { read_pc(); } else { read_pc(); - PC++; + m_PC++; } - write(SP, PC >> 8); + write(m_SP, m_PC >> 8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - write(SP, irq_taken || nmi_pending ? P & ~F_B : P); + write(m_SP, m_irq_taken || m_nmi_pending ? m_P & ~F_B : m_P); dec_SP(); - if(irq_taken && nmi_pending) { - standard_irq_callback(NMI_LINE, PC); - PC = read_arg(0xfffa); - PC = set_h(PC, read_arg(0xfffb)); - nmi_pending = false; + if(m_irq_taken && m_nmi_pending) { + standard_irq_callback(NMI_LINE, m_PC); + m_PC = read_arg(0xfffa); + m_PC = set_h(m_PC, read_arg(0xfffb)); + m_nmi_pending = false; } else { - if(irq_taken) - standard_irq_callback(IRQ_LINE, PC); - PC = read_arg(0xfffe); - PC = set_h(PC, read_arg(0xffff)); + if(m_irq_taken) + standard_irq_callback(IRQ_LINE, m_PC); + m_PC = read_arg(0xfffe); + m_PC = set_h(m_PC, read_arg(0xffff)); } - irq_taken = false; - P = (P | F_I) & ~F_D; // Do *not* move after the prefetch + m_irq_taken = false; + m_P = (m_P | F_I) & ~F_D; // Do *not* move after the prefetch prefetch(); - inst_state = -1; + m_inst_state = -1; cmp_zpi - TMP2 = read_pc(); - PC++; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); dec_acc read_pc(); - A--; - set_nz(A); + m_A--; + set_nz(m_A); prefetch(); dec_c_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_c_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_c_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read(TMP); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); eor_zpi - TMP2 = read_pc(); - PC++; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); inc_acc read_pc(); - A++; - set_nz(A); + m_A++; + set_nz(m_A); prefetch(); inc_c_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_c_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_c_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read(TMP); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); jmp_iax - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); jmp_c_ind - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - PC = read(TMP); - read(set_l(TMP, TMP+1)); - PC = set_h(PC, read(TMP+1)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = read(m_TMP); + read(set_l(m_TMP, m_TMP+1)); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); lda_zpi - TMP2 = read_pc(); - PC++; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - A = read(TMP); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_A = read(m_TMP); + set_nz(m_A); prefetch(); lsr_c_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_c_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_c_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read(TMP); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); nop_c_imp @@ -487,9 +487,9 @@ nop_c_imp nop_c_aba read_pc(); - PC++; + m_PC++; read_pc(); - PC++; + m_PC++; read_pc(); read_pc(); read_pc(); @@ -498,287 +498,287 @@ nop_c_aba prefetch(); nop_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); prefetch(); ora_zpi - TMP2 = read_pc(); - PC++; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); phx_imp read_pc(); - write(SP, X); + write(m_SP, m_X); dec_SP(); prefetch(); phy_imp read_pc(); - write(SP, Y); + write(m_SP, m_Y); dec_SP(); prefetch(); plx_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - X = read(SP); - set_nz(X); + m_X = read(m_SP); + set_nz(m_X); prefetch(); ply_imp read_pc(); - read(SP); + read(m_SP); inc_SP(); - Y = read(SP); - set_nz(Y); + m_Y = read(m_SP); + set_nz(m_Y); prefetch(); rmb_bzp - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 &= ~(1 << ((inst_state >> 4) & 7)); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 &= ~(1 << ((m_inst_state >> 4) & 7)); + write(m_TMP, m_TMP2); prefetch(); rol_c_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_c_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_c_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read(TMP); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_c_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_c_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_c_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read(TMP); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); sbc_c_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sbc_c_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, X)) { - read(set_l(TMP, TMP+X)); - } - TMP += X; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_X)) { + read(set_l(m_TMP, m_TMP+m_X)); + } + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sbc_c_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); - } - TMP += Y; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); + } + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sbc_c_idx - TMP2 = read_pc(); - PC++; - read(TMP2); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP2 = read_pc(); + m_PC++; + read(m_TMP2); + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sbc_c_idy - TMP2 = read_pc(); - PC++; - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); - } - TMP2 = read(TMP+Y); - do_sbc(TMP2); - if(P & F_D) { + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); + } + m_TMP2 = read(m_TMP+m_Y); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sbc_c_imm - TMP = read_pc(); - PC++; - do_sbc(TMP); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + do_sbc(m_TMP); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sbc_c_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sbc_c_zpi - TMP2 = read_pc(); - PC++; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); sbc_c_zpx - TMP = read_pc(); - PC++; - read(TMP); - TMP2 = read(uint8_t(TMP+X)); - do_sbc(TMP2); - if(P & F_D) { + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } prefetch(); smb_bzp - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - TMP2 |= 1 << ((inst_state >> 4) & 7); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 |= 1 << ((m_inst_state >> 4) & 7); + write(m_TMP, m_TMP2); prefetch(); sta_zpi - TMP2 = read_pc(); - PC++; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - write(TMP, A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + write(m_TMP, m_A); prefetch(); stp_imp @@ -787,95 +787,95 @@ stp_imp } stz_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP, 0x00); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP, 0x00); prefetch(); stz_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - write(TMP+X, 0x00); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + write(m_TMP+m_X, 0x00); prefetch(); stz_zpg - TMP = read_pc(); - PC++; - write(TMP, 0x00); + m_TMP = read_pc(); + m_PC++; + write(m_TMP, 0x00); prefetch(); stz_zpx - TMP = read_pc(); - PC++; - read(TMP); - write(uint8_t(TMP+X), 0x00); + m_TMP = read_pc(); + m_PC++; + read(m_TMP); + write(uint8_t(m_TMP+m_X), 0x00); prefetch(); trb_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 &= ~A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 &= ~m_A; + write(m_TMP, m_TMP2); prefetch(); trb_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 &= ~A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 &= ~m_A; + write(m_TMP, m_TMP2); prefetch(); tsb_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - read(TMP); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 |= A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 |= m_A; + write(m_TMP, m_TMP2); prefetch(); tsb_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read(TMP); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read(m_TMP); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 |= A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 |= m_A; + write(m_TMP, m_TMP2); prefetch(); wai_imp read_pc(); read_pc(); - while(!nmi_pending && !irq_state) { + while(!m_nmi_pending && !m_irq_state) { eat-all-cycles; } prefetch(); @@ -884,14 +884,14 @@ wai_imp reset_c read_arg(0xffff); read_pc(); - read(SP); + read(m_SP); dec_SP(); - read(SP); + read(m_SP); dec_SP(); - read(SP); + read(m_SP); dec_SP(); - P = (P | F_I) & ~F_D; - PC = read_arg(0xfffc); - PC = set_h(PC, read_arg(0xfffd)); + m_P = (m_P | F_I) & ~F_D; + m_PC = read_arg(0xfffc); + m_PC = set_h(m_PC, read_arg(0xfffd)); prefetch(); - inst_state = -1; + m_inst_state = -1; diff --git a/src/devices/cpu/m6502/ow65c02s.lst b/src/devices/cpu/m6502/ow65c02s.lst index 5e6f5a346cb..9ca97b3f8a5 100644 --- a/src/devices/cpu/m6502/ow65c02s.lst +++ b/src/devices/cpu/m6502/ow65c02s.lst @@ -3,966 +3,966 @@ # w65c02s opcodes adc_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); adc_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, Y)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP += Y; - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); adc_s_idx - TMP2 = read_pc(); + m_TMP2 = read_pc(); read_pc(); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_adc(TMP2); - if(P & F_D) { + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); adc_s_idy - TMP2 = read_pc(); - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP2 = read(TMP+Y); - do_adc(TMP2); - if(P & F_D) { + m_TMP2 = read(m_TMP+m_Y); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); adc_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - TMP2 = read(uint8_t(TMP+X)); - do_adc(TMP2); - if(P & F_D) { + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_adc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); and_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); and_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, Y)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP += Y; - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); - PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); and_s_idx - TMP2 = read_pc(); + m_TMP2 = read_pc(); read_pc(); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); and_s_idy - TMP2 = read_pc(); - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP2 = read(TMP+Y); - A &= TMP2; - set_nz(A); - PC++; + m_TMP2 = read(m_TMP+m_Y); + m_A &= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); and_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP2 = read(uint8_t(TMP+X)); - A &= TMP2; - set_nz(A); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); asl_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - read(TMP+1); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP+1); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_PC++; prefetch(); asl_s_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); asl_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); bit_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - do_bit(TMP2); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_bit(m_TMP2); + m_PC++; prefetch(); bit_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP2 = read(uint8_t(TMP+X)); - do_bit(TMP2); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_bit(m_TMP2); prefetch(); brk_s_imp - if(irq_taken || nmi_pending) { + if(m_irq_taken || m_nmi_pending) { read_pc(); } else { read_pc(); - PC++; + m_PC++; } - write(SP, PC >> 8); + write(m_SP, m_PC >> 8); dec_SP(); - write(SP, PC); + write(m_SP, m_PC); dec_SP(); - write(SP, irq_taken || nmi_pending ? P & ~F_B : P); + write(m_SP, m_irq_taken || m_nmi_pending ? m_P & ~F_B : m_P); dec_SP(); - if(irq_taken && nmi_pending) { - standard_irq_callback(NMI_LINE, PC); - PC = read_vector(0xfffa); - PC = set_h(PC, read_vector(0xfffb)); - nmi_pending = false; + if(m_irq_taken && m_nmi_pending) { + standard_irq_callback(NMI_LINE, m_PC); + m_PC = read_vector(0xfffa); + m_PC = set_h(m_PC, read_vector(0xfffb)); + m_nmi_pending = false; } else { - if(irq_taken) - standard_irq_callback(IRQ_LINE, PC); - PC = read_vector(0xfffe); - PC = set_h(PC, read_vector(0xffff)); + if(m_irq_taken) + standard_irq_callback(IRQ_LINE, m_PC); + m_PC = read_vector(0xfffe); + m_PC = set_h(m_PC, read_vector(0xffff)); } - irq_taken = false; - P = (P | F_I) & ~F_D; // Do *not* move after the prefetch + m_irq_taken = false; + m_P = (m_P | F_I) & ~F_D; // Do *not* move after the prefetch prefetch(); - inst_state = -1; + m_inst_state = -1; cmp_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - do_cmp(A, TMP2); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); + m_PC++; prefetch(); cmp_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, Y)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP += Y; - TMP2 = read(TMP); - do_cmp(A, TMP2); - PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); + m_PC++; prefetch(); cmp_s_idx - TMP2 = read_pc(); + m_TMP2 = read_pc(); read_pc(); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cmp_s_idy - TMP2 = read_pc(); - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP2 = read(TMP+Y); - do_cmp(A, TMP2); - PC++; + m_TMP2 = read(m_TMP+m_Y); + do_cmp(m_A, m_TMP2); + m_PC++; prefetch(); cmp_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP = read(uint8_t(TMP+X)); - do_cmp(A, TMP); + m_PC++; + m_TMP = read(uint8_t(m_TMP+m_X)); + do_cmp(m_A, m_TMP); prefetch(); dec_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - read(TMP+1); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP+1); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); + m_PC++; prefetch(); dec_s_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); dec_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2--; - set_nz(TMP2); - write(TMP, TMP2); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2--; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); eor_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); eor_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, Y)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP += Y; - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); - PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); eor_s_idx - TMP2 = read_pc(); + m_TMP2 = read_pc(); read_pc(); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); eor_s_idy - TMP2 = read_pc(); - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP2 = read(TMP+Y); - A ^= TMP2; - set_nz(A); - PC++; + m_TMP2 = read(m_TMP+m_Y); + m_A ^= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); eor_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP2 = read(uint8_t(TMP+X)); - A ^= TMP2; - set_nz(A); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); inc_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - read(TMP+1); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP+1); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); + m_PC++; prefetch(); inc_s_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); inc_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2++; - set_nz(TMP2); - write(TMP, TMP2); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2++; + set_nz(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); jmp_s_iax - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); read_pc(); - TMP += X; - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); + m_TMP += m_X; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); jmp_s_ind - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); read_pc(); - PC = read(TMP); - PC = set_h(PC, read(TMP+1)); + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(m_TMP+1)); prefetch(); lda_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - A = read(TMP + X); - set_nz(A); - PC++; + m_A = read(m_TMP + m_X); + set_nz(m_A); + m_PC++; prefetch(); lda_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, Y)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - A = read(TMP + Y); - set_nz(A); - PC++; + m_A = read(m_TMP + m_Y); + set_nz(m_A); + m_PC++; prefetch(); lda_s_idx - TMP2 = read_pc(); + m_TMP2 = read_pc(); read_pc(); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - A = read(TMP); - set_nz(A); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_A = read(m_TMP); + set_nz(m_A); prefetch(); lda_s_idy - TMP2 = read_pc(); - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - A = read(TMP+Y); - set_nz(A); - PC++; + m_A = read(m_TMP+m_Y); + set_nz(m_A); + m_PC++; prefetch(); lda_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - A = read(uint8_t(TMP+X)); - set_nz(A); + m_PC++; + m_A = read(uint8_t(m_TMP+m_X)); + set_nz(m_A); prefetch(); ldx_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, Y)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - X = read(TMP + Y); - set_nz(X); - PC++; + m_X = read(m_TMP + m_Y); + set_nz(m_X); + m_PC++; prefetch(); ldx_s_zpy - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - X = read(uint8_t(TMP+Y)); - set_nz(X); + m_PC++; + m_X = read(uint8_t(m_TMP+m_Y)); + set_nz(m_X); prefetch(); ldy_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - Y = read(TMP); - set_nz(Y); - PC++; + m_TMP += m_X; + m_Y = read(m_TMP); + set_nz(m_Y); + m_PC++; prefetch(); ldy_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - Y = read(uint8_t(TMP+X)); - set_nz(Y); + m_PC++; + m_Y = read(uint8_t(m_TMP+m_X)); + set_nz(m_Y); prefetch(); lsr_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_PC++; prefetch(); lsr_s_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); lsr_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); nop_s_abx read_pc(); - PC++; + m_PC++; read_pc(); read_pc(); - PC++; + m_PC++; prefetch(); nop_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - read(uint8_t(TMP+X)); + m_PC++; + read(uint8_t(m_TMP+m_X)); prefetch(); ora_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); ora_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, Y)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP += Y; - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); - PC++; + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); ora_s_idx - TMP2 = read_pc(); + m_TMP2 = read_pc(); read_pc(); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_s_idy - TMP2 = read_pc(); - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP2 = read(TMP+Y); - A |= TMP2; - set_nz(A); - PC++; + m_TMP2 = read(m_TMP+m_Y); + m_A |= m_TMP2; + set_nz(m_A); + m_PC++; prefetch(); ora_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP2 = read(uint8_t(TMP+X)); - A |= TMP2; - set_nz(A); + m_PC++; + m_TMP2 = read(uint8_t(m_TMP+m_X)); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); pla_s_imp read_pc(); read_pc(); inc_SP(); - A = read(SP); - set_nz(A); + m_A = read(m_SP); + set_nz(m_A); prefetch(); plp_s_imp read_pc(); read_pc(); inc_SP(); - TMP = read(SP) | (F_B|F_E); + m_TMP = read(m_SP) | (F_B|F_E); prefetch(); - P = TMP; // Do *not* move it before the prefetch + m_P = m_TMP; // Do *not* move it before the prefetch plx_s_imp read_pc(); read_pc(); inc_SP(); - X = read(SP); - set_nz(X); + m_X = read(m_SP); + set_nz(m_X); prefetch(); ply_s_imp read_pc(); read_pc(); inc_SP(); - Y = read(SP); - set_nz(Y); + m_Y = read(m_SP); + set_nz(m_Y); prefetch(); rol_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - read(TMP+1); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP+1); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_PC++; prefetch(); rol_s_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rol_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - read(TMP+1); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP+1); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + m_PC++; prefetch(); ror_s_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); ror_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read(TMP); - read((TMP+1) & 0xff); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); rti_s_imp read_pc(); inc_SP(); - P = read(SP) | (F_B|F_E); + m_P = read(m_SP) | (F_B|F_E); inc_SP(); - TMP = read(SP); + m_TMP = read(m_SP); inc_SP(); - TMP = set_h(TMP, read(SP)); + m_TMP = set_h(m_TMP, read(m_SP)); read_pc(); end_interrupt(); - PC = TMP; + m_PC = m_TMP; prefetch(); rts_s_imp read_pc(); read_pc(); inc_SP(); - TMP = read(SP); + m_TMP = read(m_SP); inc_SP(); - TMP = set_h(TMP, read(SP)); + m_TMP = set_h(m_TMP, read(m_SP)); read_pc(); - PC = TMP + 1; + m_PC = m_TMP + 1; prefetch(); sbc_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, X)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_X)) { read_pc(); } - TMP += X; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); sbc_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - if(page_changing(TMP, Y)) { + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP += Y; - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); sbc_s_idx - TMP2 = read_pc(); + m_TMP2 = read_pc(); read_pc(); - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_sbc(TMP2); - if(P & F_D) { + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); sbc_s_idy - TMP2 = read_pc(); - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { read_pc(); } - TMP2 = read(TMP+Y); - do_sbc(TMP2); - if(P & F_D) { + m_TMP2 = read(m_TMP+m_Y); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); sbc_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - TMP2 = read(uint8_t(TMP+X)); - do_sbc(TMP2); - if(P & F_D) { + m_TMP2 = read(uint8_t(m_TMP+m_X)); + do_sbc(m_TMP2); + if(m_P & F_D) { read_pc(); - set_nz(A); + set_nz(m_A); } - PC++; + m_PC++; prefetch(); sta_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); read_pc(); - PC++; - write(TMP+X, A); + m_PC++; + write(m_TMP+m_X, m_A); prefetch(); sta_s_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); read_pc(); - PC++; - write(TMP+Y, A); + m_PC++; + write(m_TMP+m_Y, m_A); prefetch(); sta_s_idx - TMP2 = read_pc(); + m_TMP2 = read_pc(); read_pc(); - PC++; - TMP2 += X; - TMP = read(TMP2 & 0xff); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); - write(TMP, A); + m_PC++; + m_TMP2 += m_X; + m_TMP = read(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); + write(m_TMP, m_A); prefetch(); sta_s_idy - TMP2 = read_pc(); - TMP = read(TMP2); - TMP = set_h(TMP, read((TMP2+1) & 0xff)); + m_TMP2 = read_pc(); + m_TMP = read(m_TMP2); + m_TMP = set_h(m_TMP, read((m_TMP2+1) & 0xff)); read_pc(); - PC++; - write(TMP+Y, A); + m_PC++; + write(m_TMP+m_Y, m_A); prefetch(); sta_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - write(uint8_t(TMP+X), A); + m_PC++; + write(uint8_t(m_TMP+m_X), m_A); prefetch(); stx_s_zpy - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - write(uint8_t(TMP+Y), X); + m_PC++; + write(uint8_t(m_TMP+m_Y), m_X); prefetch(); sty_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - write(uint8_t(TMP+X), Y); + m_PC++; + write(uint8_t(m_TMP+m_X), m_Y); prefetch(); stz_s_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); read_pc(); - PC++; - write(TMP+X, 0x00); + m_PC++; + write(m_TMP+m_X, 0x00); prefetch(); stz_s_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - write(uint8_t(TMP+X), 0x00); + m_PC++; + write(uint8_t(m_TMP+m_X), 0x00); prefetch(); trb_s_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 &= ~A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 &= ~m_A; + write(m_TMP, m_TMP2); prefetch(); tsb_s_zpg - TMP = read_pc(); - PC++; - TMP2 = read(TMP); - read((TMP+1) & 0xff); - if(A & TMP2) - P &= ~F_Z; + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read(m_TMP); + read((m_TMP+1) & 0xff); + if(m_A & m_TMP2) + m_P &= ~F_Z; else - P |= F_Z; - TMP2 |= A; - write(TMP, TMP2); + m_P |= F_Z; + m_TMP2 |= m_A; + write(m_TMP, m_TMP2); prefetch(); # exceptions reset_s read_arg(0xffff); read_pc(); - read(SP); + read(m_SP); dec_SP(); - read(SP); + read(m_SP); dec_SP(); - read(SP); + read(m_SP); dec_SP(); - P = (P | F_I) & ~F_D; - PC = read_vector(0xfffc); - PC = set_h(PC, read_vector(0xfffd)); + m_P = (m_P | F_I) & ~F_D; + m_PC = read_vector(0xfffc); + m_PC = set_h(m_PC, read_vector(0xfffd)); prefetch(); - inst_state = -1; + m_inst_state = -1; diff --git a/src/devices/cpu/m6502/oxavix.lst b/src/devices/cpu/m6502/oxavix.lst index 84caf0a2277..66bebe760d4 100644 --- a/src/devices/cpu/m6502/oxavix.lst +++ b/src/devices/cpu/m6502/oxavix.lst @@ -3,128 +3,128 @@ # xavix opcodes callf_xa3 - read_stack(SP); - write_special_stack(SP, get_codebank()); + read_stack(m_SP); + write_special_stack(m_SP, get_codebank()); dec_special_stack(); - TMP2 = read_pc(); - PC++; - TMP = read_pc(); - PC++; - //read_stack(SP); - write_stack(SP, PC>>8); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_pc(); + m_PC++; + //read_stack(m_SP); + write_stack(m_SP, m_PC>>8); dec_SP(); - write_stack(SP, PC); + write_stack(m_SP, m_PC); dec_SP(); - TMP = set_h(TMP, read_pc()); - PC++; - PC = TMP; - set_codebank(TMP2); + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = m_TMP; + set_codebank(m_TMP2); prefetch(); jmp_xa3 - TMP2 = read_pc(); - PC++; - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - PC = TMP; - set_codebank(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = m_TMP; + set_codebank(m_TMP2); prefetch(); retf_imp read_pc(); - read_stack(SP); + read_stack(m_SP); inc_SP(); - PC = read_stack(SP); + m_PC = read_stack(m_SP); inc_SP(); - PC = set_h(PC, read_stack(SP)); + m_PC = set_h(m_PC, read_stack(m_SP)); inc_special_stack(); - TMP2 = read_special_stack(SP); - set_codebank(TMP2); + m_TMP2 = read_special_stack(m_SP); + set_codebank(m_TMP2); read_pc(); - PC++; + m_PC++; prefetch(); brk_xav_imp // there is code in some games to indicate this doesn't always push the far bank to the stack.. // The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_pending) - if(irq_taken) { + if(m_irq_taken) { read_pc(); } else { read_pc(); - PC++; + m_PC++; } - write_special_stack(SP, get_codebank()); + write_special_stack(m_SP, get_codebank()); set_codebank(0x00); // epo_efdx, rad_ping and rad_mtrk strongly suggest that interrupts must force bank 0 as code jumps to a ROM pointer stored earlier / a fixed pointer to a rom address in bank 0 dec_special_stack(); - write_stack(SP, PC >> 8); + write_stack(m_SP, m_PC >> 8); dec_SP(); - write_stack(SP, PC); + write_stack(m_SP, m_PC); dec_SP(); - write_stack(SP, irq_taken ? P & ~F_B : P); + write_stack(m_SP, m_irq_taken ? m_P & ~F_B : m_P); dec_SP(); - if(nmi_pending) { - standard_irq_callback(NMI_LINE, PC); + if(m_nmi_pending) { + standard_irq_callback(NMI_LINE, m_PC); if (m_vector_callback.isnull()) { - PC = read_arg(0xfffa); - PC = set_h(PC, read_arg(0xfffb)); + m_PC = read_arg(0xfffa); + m_PC = set_h(m_PC, read_arg(0xfffb)); } else { if (m_vector_callback(0,1) != -1) { - PC = m_vector_callback(0,1); - PC = set_h(PC, m_vector_callback(0,0)); + m_PC = m_vector_callback(0,1); + m_PC = set_h(m_PC, m_vector_callback(0,0)); } else { - PC = read_arg(0xfffa); - PC = set_h(PC, read_arg(0xfffb)); + m_PC = read_arg(0xfffa); + m_PC = set_h(m_PC, read_arg(0xfffb)); } } - nmi_pending = false; + m_nmi_pending = false; } else { - if(irq_taken) - standard_irq_callback(IRQ_LINE, PC); + if(m_irq_taken) + standard_irq_callback(IRQ_LINE, m_PC); if (m_vector_callback.isnull()) { - PC = read_arg(0xfffe); - PC = set_h(PC, read_arg(0xffff)); + m_PC = read_arg(0xfffe); + m_PC = set_h(m_PC, read_arg(0xffff)); } else { if (m_vector_callback(1,1) != -1) { - PC = m_vector_callback(1,1); - PC = set_h(PC, m_vector_callback(1,0)); + m_PC = m_vector_callback(1,1); + m_PC = set_h(m_PC, m_vector_callback(1,0)); } else { - PC = read_arg(0xfffe); - PC = set_h(PC, read_arg(0xffff)); + m_PC = read_arg(0xfffe); + m_PC = set_h(m_PC, read_arg(0xffff)); } } } - irq_taken = false; - P |= F_I; // Do *not* move after the prefetch + m_irq_taken = false; + m_P |= F_I; // Do *not* move after the prefetch prefetch(); - inst_state = -1; + m_inst_state = -1; rti_xav_imp read_pc(); - read_stack(SP); + read_stack(m_SP); inc_SP(); - P = read_stack(SP) | (F_B|F_E); + m_P = read_stack(m_SP) | (F_B|F_E); inc_SP(); - PC = read_stack(SP); + m_PC = read_stack(m_SP); inc_SP(); - PC = set_h(PC, read_stack(SP)); + m_PC = set_h(m_PC, read_stack(m_SP)); inc_special_stack(); - TMP2 = read_special_stack(SP); - set_codebank(TMP2); + m_TMP2 = read_special_stack(m_SP); + set_codebank(m_TMP2); prefetch(); @@ -132,975 +132,975 @@ rti_xav_imp pha_xav_imp read_pc(); - write_stack(SP, A); + write_stack(m_SP, m_A); dec_SP(); prefetch(); php_xav_imp read_pc(); - write_stack(SP, P); + write_stack(m_SP, m_P); dec_SP(); prefetch(); jsr_xav_adr - TMP = read_pc(); - PC++; - read_stack(SP); - write_stack(SP, PC>>8); + m_TMP = read_pc(); + m_PC++; + read_stack(m_SP); + write_stack(m_SP, m_PC>>8); dec_SP(); - write_stack(SP, PC); + write_stack(m_SP, m_PC); dec_SP(); - TMP = set_h(TMP, read_pc()); - PC++; - PC = TMP; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = m_TMP; prefetch(); pla_xav_imp read_pc(); - read_stack(SP); + read_stack(m_SP); inc_SP(); - A = read_stack(SP); - set_nz(A); + m_A = read_stack(m_SP); + set_nz(m_A); prefetch(); plp_xav_imp read_pc(); - read_stack(SP); + read_stack(m_SP); inc_SP(); - TMP = read_stack(SP) | (F_B|F_E); + m_TMP = read_stack(m_SP) | (F_B|F_E); prefetch(); - P = TMP; // Do *not* move it before the prefetch + m_P = m_TMP; // Do *not* move it before the prefetch rts_xav_imp read_pc(); - read_stack(SP); + read_stack(m_SP); inc_SP(); - PC = read_stack(SP); + m_PC = read_stack(m_SP); inc_SP(); - PC = set_h(PC, read_stack(SP)); + m_PC = set_h(m_PC, read_stack(m_SP)); read_pc(); - PC++; + m_PC++; prefetch(); # opcodes below are modified to access zero page through different handlers lda_xav_idy - TMP2 = read_pc(); // we need to fetch the zero page part from zero page, but the rest as if zero page wasn't there, similar to the 6509 - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); // dummy read + m_TMP2 = read_pc(); // we need to fetch the zero page part from zero page, but the rest as if zero page wasn't there, similar to the 6509 + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read } - A = read(TMP+Y); - set_nz(A); + m_A = read(m_TMP+m_Y); + set_nz(m_A); prefetch(); adc_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); // dummy read + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read } - TMP2 = read(TMP+Y); - do_adc(TMP2); + m_TMP2 = read(m_TMP+m_Y); + do_adc(m_TMP2); prefetch(); cmp_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); // dummy read + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read } - TMP2 = read(TMP+Y); - do_cmp(A, TMP2); + m_TMP2 = read(m_TMP+m_Y); + do_cmp(m_A, m_TMP2); prefetch(); sbc_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); // dummy read + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read } - TMP2 = read(TMP+Y); - do_sbc(TMP2); + m_TMP2 = read(m_TMP+m_Y); + do_sbc(m_TMP2); prefetch(); eor_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); // dummy read + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read } - TMP2 = read(TMP+Y); - A ^= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_Y); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); and_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); // dummy read + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read } - TMP2 = read(TMP+Y); - A &= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_Y); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); ora_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); // dummy read + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read } - TMP2 = read(TMP+Y); - A |= TMP2; - set_nz(A); + m_TMP2 = read(m_TMP+m_Y); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); ora_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); and_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); eor_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); adc_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_adc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_adc(m_TMP2); prefetch(); lda_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - A = read(TMP); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_A = read(m_TMP); + set_nz(m_A); prefetch(); cmp_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); sbc_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - do_sbc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + do_sbc(m_TMP2); prefetch(); sta_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - read_zeropage(set_l(TMP, TMP+Y)); // dummy read - write(TMP+Y, A); // TODO + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + read_zeropage(set_l(m_TMP, m_TMP+m_Y)); // dummy read + write(m_TMP+m_Y, m_A); // TODO prefetch(); sta_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - write(TMP, A); // TODO + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + write(m_TMP, m_A); // TODO prefetch(); adc_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + do_adc(m_TMP2); prefetch(); and_xav_zpg - TMP = read_pc(); - PC++; - A &= read_zeropage(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A &= read_zeropage(m_TMP); + set_nz(m_A); prefetch(); asl_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_asl(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_asl(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); bit_xav_zpg - TMP = read_pc(); - PC++; - do_bit(read_zeropage(TMP)); + m_TMP = read_pc(); + m_PC++; + do_bit(read_zeropage(m_TMP)); prefetch(); cmp_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + do_cmp(m_A, m_TMP2); prefetch(); cpx_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - do_cmp(X, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + do_cmp(m_X, m_TMP2); prefetch(); cpy_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - do_cmp(Y, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + do_cmp(m_Y, m_TMP2); prefetch(); dec_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2--; - set_nz(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2--; + set_nz(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); eor_xav_zpg - TMP = read_pc(); - PC++; - A ^= read_zeropage(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A ^= read_zeropage(m_TMP); + set_nz(m_A); prefetch(); inc_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2++; - set_nz(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2++; + set_nz(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); lda_xav_zpg - TMP = read_pc(); - PC++; - A = read_zeropage(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A = read_zeropage(m_TMP); + set_nz(m_A); prefetch(); ldx_xav_zpg - TMP = read_pc(); - PC++; - X = read_zeropage(TMP); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + m_X = read_zeropage(m_TMP); + set_nz(m_X); prefetch(); ldy_xav_zpg - TMP = read_pc(); - PC++; - Y = read_zeropage(TMP); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + m_Y = read_zeropage(m_TMP); + set_nz(m_Y); prefetch(); lsr_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_lsr(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_lsr(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); ora_xav_zpg - TMP = read_pc(); - PC++; - A |= read_zeropage(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A |= read_zeropage(m_TMP); + set_nz(m_A); prefetch(); rol_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_rol(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_rol(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); ror_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_ror(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_ror(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); sbc_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + do_sbc(m_TMP2); prefetch(); sta_xav_zpg - TMP = read_pc(); - PC++; - write_zeropage(TMP, A); + m_TMP = read_pc(); + m_PC++; + write_zeropage(m_TMP, m_A); prefetch(); stx_xav_zpg - TMP = read_pc(); - PC++; - write_zeropage(TMP, X); + m_TMP = read_pc(); + m_PC++; + write_zeropage(m_TMP, m_X); prefetch(); sty_xav_zpg - TMP = read_pc(); - PC++; - write_zeropage(TMP, Y); + m_TMP = read_pc(); + m_PC++; + write_zeropage(m_TMP, m_Y); prefetch(); dcp_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2--; - write_zeropage(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2--; + write_zeropage(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); isb_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2++; - write_zeropage(TMP, TMP2); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2++; + write_zeropage(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); lax_xav_zpg - TMP = read_pc(); - PC++; - A = X = read_zeropage(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_A = m_X = read_zeropage(m_TMP); + set_nz(m_A); prefetch(); rla_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_rol(TMP2); - write_zeropage(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_rol(m_TMP2); + write_zeropage(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rra_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_ror(TMP2); - write_zeropage(TMP, TMP2); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_ror(m_TMP2); + write_zeropage(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); sax_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = A & X; - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = m_A & m_X; + write_zeropage(m_TMP, m_TMP2); prefetch(); slo_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_asl(TMP2); - write_zeropage(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_asl(m_TMP2); + write_zeropage(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); sre_xav_zpg - TMP = read_pc(); - PC++; - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_lsr(TMP2); - write_zeropage(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_lsr(m_TMP2); + write_zeropage(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); nop_xav_zpg - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read prefetch(); # more zero page changes ldx_xav_zpy - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - X = read_zeropage(uint8_t(TMP+Y)); - set_nz(X); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_X = read_zeropage(uint8_t(m_TMP+m_Y)); + set_nz(m_X); prefetch(); stx_xav_zpy - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - write_zeropage(uint8_t(TMP+Y), X); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + write_zeropage(uint8_t(m_TMP+m_Y), m_X); prefetch(); lax_xav_zpy - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+Y); - A = X = read_zeropage(TMP); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_Y); + m_A = m_X = read_zeropage(m_TMP); + set_nz(m_A); prefetch(); sax_xav_zpy - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+Y); - TMP2 = A & X; - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_Y); + m_TMP2 = m_A & m_X; + write_zeropage(m_TMP, m_TMP2); prefetch(); # more zero page changes adc_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP2 = read_zeropage(uint8_t(TMP+X)); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP2 = read_zeropage(uint8_t(m_TMP+m_X)); + do_adc(m_TMP2); prefetch(); and_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - A &= read_zeropage(uint8_t(TMP+X)); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_A &= read_zeropage(uint8_t(m_TMP+m_X)); + set_nz(m_A); prefetch(); asl_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_asl(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_asl(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); cmp_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP2 = read_zeropage(uint8_t(TMP+X)); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP2 = read_zeropage(uint8_t(m_TMP+m_X)); + do_cmp(m_A, m_TMP2); prefetch(); dec_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2--; - set_nz(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2--; + set_nz(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); eor_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - A ^= read_zeropage(uint8_t(TMP+X)); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_A ^= read_zeropage(uint8_t(m_TMP+m_X)); + set_nz(m_A); prefetch(); inc_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2++; - set_nz(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2++; + set_nz(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); lda_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - A = read_zeropage(uint8_t(TMP+X)); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_A = read_zeropage(uint8_t(m_TMP+m_X)); + set_nz(m_A); prefetch(); ldy_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - Y = read_zeropage(uint8_t(TMP+X)); - set_nz(Y); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_Y = read_zeropage(uint8_t(m_TMP+m_X)); + set_nz(m_Y); prefetch(); lsr_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_lsr(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_lsr(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); ora_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - A |= read_zeropage(uint8_t(TMP+X)); - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_A |= read_zeropage(uint8_t(m_TMP+m_X)); + set_nz(m_A); prefetch(); rol_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_rol(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_rol(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); ror_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_ror(TMP2); - write_zeropage(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_ror(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); sbc_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP2 = read_zeropage(uint8_t(TMP+X)); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP2 = read_zeropage(uint8_t(m_TMP+m_X)); + do_sbc(m_TMP2); prefetch(); sta_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - write_zeropage(uint8_t(TMP+X), A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + write_zeropage(uint8_t(m_TMP+m_X), m_A); prefetch(); sty_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - write_zeropage(uint8_t(TMP+X), Y); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + write_zeropage(uint8_t(m_TMP+m_X), m_Y); prefetch(); dcp_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2--; - write_zeropage(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2--; + write_zeropage(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); isb_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2++; - write_zeropage(TMP, TMP2); - do_sbc(TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2++; + write_zeropage(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); rla_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_rol(TMP2); - write_zeropage(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_rol(m_TMP2); + write_zeropage(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); rra_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_ror(TMP2); - write_zeropage(TMP, TMP2); - do_adc(TMP2); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_ror(m_TMP2); + write_zeropage(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); slo_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_asl(TMP2); - write_zeropage(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_asl(m_TMP2); + write_zeropage(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); sre_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); // dummy read - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - write_zeropage(TMP, TMP2); // dummy write - TMP2 = do_lsr(TMP2); - write_zeropage(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); // dummy read + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + write_zeropage(m_TMP, m_TMP2); // dummy write + m_TMP2 = do_lsr(m_TMP2); + write_zeropage(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); nop_xav_zpx - TMP = read_pc(); - PC++; - read_zeropage(TMP); - read_zeropage(uint8_t(TMP+X)); + m_TMP = read_pc(); + m_PC++; + read_zeropage(m_TMP); + read_zeropage(uint8_t(m_TMP+m_X)); prefetch(); #### slo_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); # idx with zero page changes rla_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); sre_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); rra_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); sax_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = A & X; - write(TMP, TMP2); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = m_A & m_X; + write(m_TMP, m_TMP2); prefetch(); lax_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dumm read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - A = X = read(TMP); - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dumm read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_A = m_X = read(m_TMP); + set_nz(m_A); prefetch(); dcp_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); isb_xav_idx - TMP2 = read_pc(); - PC++; - read_zeropage(TMP2); // dummy read - TMP2 += X; - TMP = read_zeropage(TMP2 & 0xff); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + read_zeropage(m_TMP2); // dummy read + m_TMP2 += m_X; + m_TMP = read_zeropage(m_TMP2 & 0xff); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); # idy with zero page changes slo_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); // dummy read - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asl(TMP2); - write(TMP, TMP2); - A |= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asl(m_TMP2); + write(m_TMP, m_TMP2); + m_A |= m_TMP2; + set_nz(m_A); prefetch(); rla_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); // dummy read - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_rol(TMP2); - write(TMP, TMP2); - A &= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_rol(m_TMP2); + write(m_TMP, m_TMP2); + m_A &= m_TMP2; + set_nz(m_A); prefetch(); sre_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); // dummy read - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_lsr(TMP2); - write(TMP, TMP2); - A ^= TMP2; - set_nz(A); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_lsr(m_TMP2); + write(m_TMP, m_TMP2); + m_A ^= m_TMP2; + set_nz(m_A); prefetch(); rra_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); // dummy read - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_ror(TMP2); - write(TMP, TMP2); - do_adc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_ror(m_TMP2); + write(m_TMP, m_TMP2); + do_adc(m_TMP2); prefetch(); sha_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); // dummy read - TMP2 = A & X & ((TMP >> 8)+1); - if(page_changing(TMP, Y)) - TMP = set_h(TMP+Y, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read + m_TMP2 = m_A & m_X & ((m_TMP >> 8)+1); + if(page_changing(m_TMP, m_Y)) + m_TMP = set_h(m_TMP+m_Y, m_TMP2); else - TMP += Y; - write(TMP, TMP2); + m_TMP += m_Y; + write(m_TMP, m_TMP2); prefetch(); lax_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - if(page_changing(TMP, Y)) { - read(set_l(TMP, TMP+Y)); // dummy read + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + if(page_changing(m_TMP, m_Y)) { + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read } - A = X = read(TMP+Y); - set_nz(A); + m_A = m_X = read(m_TMP+m_Y); + set_nz(m_A); prefetch(); dcp_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); // dummy read - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2--; - write(TMP, TMP2); - do_cmp(A, TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2--; + write(m_TMP, m_TMP2); + do_cmp(m_A, m_TMP2); prefetch(); isb_xav_idy - TMP2 = read_pc(); - PC++; - TMP = read_zeropage(TMP2); - TMP = set_h(TMP, read_zeropage((TMP2+1) & 0xff)); - read(set_l(TMP, TMP+Y)); // dummy read - TMP += Y; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2++; - write(TMP, TMP2); - do_sbc(TMP2); + m_TMP2 = read_pc(); + m_PC++; + m_TMP = read_zeropage(m_TMP2); + m_TMP = set_h(m_TMP, read_zeropage((m_TMP2+1) & 0xff)); + read(set_l(m_TMP, m_TMP+m_Y)); // dummy read + m_TMP += m_Y; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2++; + write(m_TMP, m_TMP2); + do_sbc(m_TMP2); prefetch(); diff --git a/src/devices/cpu/m6502/oxavix2000.lst b/src/devices/cpu/m6502/oxavix2000.lst index f2e2b7a32f9..fa3b48a048f 100644 --- a/src/devices/cpu/m6502/oxavix2000.lst +++ b/src/devices/cpu/m6502/oxavix2000.lst @@ -4,132 +4,132 @@ phy_imp read_pc(); - write_stack(SP, Y); + write_stack(m_SP, m_Y); dec_SP(); prefetch(); phx_imp read_pc(); - write_stack(SP, X); + write_stack(m_SP, m_X); dec_SP(); prefetch(); plx_imp read_pc(); - read_stack(SP); + read_stack(m_SP); inc_SP(); - X = read_stack(SP); - set_nz(X); + m_X = read_stack(m_SP); + set_nz(m_X); prefetch(); ply_imp read_pc(); - read_stack(SP); + read_stack(m_SP); inc_SP(); - Y = read_stack(SP); - set_nz(Y); + m_Y = read_stack(m_SP); + set_nz(m_Y); prefetch(); clr_acc read_pc(); - A = 0; - set_nz(A); + m_A = 0; + set_nz(m_A); prefetch(); dec_acc read_pc(); - A--; - set_nz(A); + m_A--; + set_nz(m_A); prefetch(); not_acc read_pc(); - A = A ^ 0xff; - set_nz(A); + m_A = m_A ^ 0xff; + set_nz(m_A); prefetch(); inc_acc read_pc(); - A++; - set_nz(A); + m_A++; + set_nz(m_A); prefetch(); neg_acc read_pc(); - A = (0x00 - A) & 0xff; - set_nz(A); + m_A = (0x00 - m_A) & 0xff; + set_nz(m_A); prefetch(); oraj_imp read_pc(); - A |= m_j; - set_nz(A); + m_A |= m_j; + set_nz(m_A); prefetch(); orak_imp read_pc(); - A |= m_k; - set_nz(A); + m_A |= m_k; + set_nz(m_A); prefetch(); oral_imp read_pc(); - A |= m_l; - set_nz(A); + m_A |= m_l; + set_nz(m_A); prefetch(); oram_imp read_pc(); - A |= m_m; - set_nz(A); + m_A |= m_m; + set_nz(m_A); prefetch(); andj_imp read_pc(); - A &= m_j; - set_nz(A); + m_A &= m_j; + set_nz(m_A); prefetch(); andk_imp read_pc(); - A &= m_k; - set_nz(A); + m_A &= m_k; + set_nz(m_A); prefetch(); andl_imp read_pc(); - A &= m_l; - set_nz(A); + m_A &= m_l; + set_nz(m_A); prefetch(); andm_imp read_pc(); - A &= m_m; - set_nz(A); + m_A &= m_m; + set_nz(m_A); prefetch(); eorj_imp read_pc(); - A ^= m_j; - set_nz(A); + m_A ^= m_j; + set_nz(m_A); prefetch(); eork_imp read_pc(); - A ^= m_k; - set_nz(A); + m_A ^= m_k; + set_nz(m_A); prefetch(); eorl_imp read_pc(); - A ^= m_l; - set_nz(A); + m_A ^= m_l; + set_nz(m_A); prefetch(); eorm_imp read_pc(); - A ^= m_m; - set_nz(A); + m_A ^= m_m; + set_nz(m_A); prefetch(); adcj_imp @@ -154,66 +154,66 @@ adcm_imp staj_imp read_pc(); - m_j = A; + m_j = m_A; prefetch(); stak_imp read_pc(); - m_k = A; + m_k = m_A; prefetch(); stal_imp read_pc(); - m_l = A; + m_l = m_A; prefetch(); stam_imp read_pc(); - m_m = A; + m_m = m_A; prefetch(); ldaj_imp read_pc(); - A = m_j; - set_nz(A); + m_A = m_j; + set_nz(m_A); prefetch(); ldak_imp read_pc(); - A = m_k; - set_nz(A); + m_A = m_k; + set_nz(m_A); prefetch(); ldal_imp read_pc(); - A = m_l; - set_nz(A); + m_A = m_l; + set_nz(m_A); prefetch(); ldam_imp read_pc(); - A = m_m; - set_nz(A); + m_A = m_m; + set_nz(m_A); prefetch(); cmpj_imp read_pc(); - do_cmp(A, m_j); + do_cmp(m_A, m_j); prefetch(); cmpk_imp read_pc(); - do_cmp(A, m_k); + do_cmp(m_A, m_k); prefetch(); cmpl_imp read_pc(); - do_cmp(A, m_l); + do_cmp(m_A, m_l); prefetch(); cmpm_imp read_pc(); - do_cmp(A, m_m); + do_cmp(m_A, m_m); prefetch(); sbcj_imp @@ -238,68 +238,68 @@ sbcm_imp spa0_imp read_pc(); - m_pa = (m_pa & 0xffff00) | A; + m_pa = (m_pa & 0xffff00) | m_A; prefetch(); lpa0_imp read_pc(); - A = (m_pa & 0x0000ff) >> 0; - set_nz(A); + m_A = (m_pa & 0x0000ff) >> 0; + set_nz(m_A); prefetch(); spa1_imp read_pc(); - m_pa = (m_pa & 0xff00ff) | (A << 8); + m_pa = (m_pa & 0xff00ff) | (m_A << 8); prefetch(); lpa1_imp read_pc(); - A = (m_pa & 0x00ff00) >> 8; - set_nz(A); + m_A = (m_pa & 0x00ff00) >> 8; + set_nz(m_A); prefetch(); spa2_imp read_pc(); - m_pa = (m_pa & 0x00ffff) | (A << 16); + m_pa = (m_pa & 0x00ffff) | (m_A << 16); prefetch(); lpa2_imp read_pc(); - A = (m_pa & 0xff0000) >> 16; - set_nz(A); + m_A = (m_pa & 0xff0000) >> 16; + set_nz(m_A); prefetch(); spb0_imp read_pc(); - m_pb = (m_pb & 0xffff00) | A; + m_pb = (m_pb & 0xffff00) | m_A; prefetch(); lpb0_imp read_pc(); - A = (m_pb & 0x0000ff) >> 0; - set_nz(A); + m_A = (m_pb & 0x0000ff) >> 0; + set_nz(m_A); prefetch(); spb1_imp read_pc(); - m_pb = (m_pb & 0xff00ff) | (A << 8); + m_pb = (m_pb & 0xff00ff) | (m_A << 8); prefetch(); lpb1_imp read_pc(); - A = (m_pb & 0x00ff00) >> 8; - set_nz(A); + m_A = (m_pb & 0x00ff00) >> 8; + set_nz(m_A); prefetch(); spb2_imp read_pc(); - m_pb = (m_pb & 0x00ffff) | (A << 16); + m_pb = (m_pb & 0x00ffff) | (m_A << 16); prefetch(); lpb2_imp read_pc(); - A = (m_pb & 0xff0000) >> 16; - set_nz(A); + m_A = (m_pb & 0xff0000) >> 16; + set_nz(m_A); prefetch(); incpa_imp @@ -328,23 +328,23 @@ decpb_imp orapa_imp read_pc(); - TMP = read_full_data(m_pa); - A |= TMP; - set_nz(A); + m_TMP = read_full_data(m_pa); + m_A |= m_TMP; + set_nz(m_A); prefetch(); andpa_imp read_pc(); - TMP = read_full_data(m_pa); - A &= TMP; - set_nz(A); + m_TMP = read_full_data(m_pa); + m_A &= m_TMP; + set_nz(m_A); prefetch(); eorpa_imp read_pc(); - TMP = read_full_data(m_pa); - A ^= TMP; - set_nz(A); + m_TMP = read_full_data(m_pa); + m_A ^= m_TMP; + set_nz(m_A); prefetch(); adcpa_imp @@ -352,17 +352,17 @@ adcpa_imp prefetch(); stapa_imp - write_full_data(m_pa, A); + write_full_data(m_pa, m_A); prefetch(); ldapa_imp - A = read_full_data(m_pa); - set_nz(A); + m_A = read_full_data(m_pa); + set_nz(m_A); prefetch(); cmppa_imp - TMP = read_full_data(m_pa); - do_cmp(A, TMP); + m_TMP = read_full_data(m_pa); + do_cmp(m_A, m_TMP); prefetch(); sbcpa_imp @@ -371,23 +371,23 @@ sbcpa_imp orapb_imp read_pc(); - TMP = read_full_data(m_pb); - A |= TMP; - set_nz(A); + m_TMP = read_full_data(m_pb); + m_A |= m_TMP; + set_nz(m_A); prefetch(); andpb_imp read_pc(); - TMP = read_full_data(m_pb); - A &= TMP; - set_nz(A); + m_TMP = read_full_data(m_pb); + m_A &= m_TMP; + set_nz(m_A); prefetch(); eorpb_imp read_pc(); - TMP = read_full_data(m_pb); - A ^= TMP; - set_nz(A); + m_TMP = read_full_data(m_pb); + m_A ^= m_TMP; + set_nz(m_A); prefetch(); adcpb_imp @@ -395,16 +395,16 @@ adcpb_imp prefetch(); stapb_imp - write_full_data(m_pb, A); + write_full_data(m_pb, m_A); prefetch(); ldapb_imp - A = read_full_data(m_pb); - set_nz(A); + m_A = read_full_data(m_pb); + set_nz(m_A); prefetch(); cmppb_imp - fatalerror("unhandled opcode %02x%04x: %02x\n", m_codebank, PPC, inst_state); + fatalerror("unhandled opcode %02x%04x: %02x\n", m_codebank, m_PPC, m_inst_state); read_pc(); prefetch(); @@ -413,123 +413,123 @@ sbcpb_imp prefetch(); stx_aby - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP+Y, X); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP+m_Y, m_X); prefetch(); sty_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP+X, Y); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP+m_X, m_Y); prefetch(); stz_xav_zpg - TMP = read_pc(); - PC++; - write_zeropage(TMP, 0x00); + m_TMP = read_pc(); + m_PC++; + write_zeropage(m_TMP, 0x00); prefetch(); stz_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - write(TMP, 0x00); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + write(m_TMP, 0x00); prefetch(); bit_xav_zpx - fatalerror("unhandled opcode %02x%04x: %02x\n", m_codebank, PPC, inst_state); + fatalerror("unhandled opcode %02x%04x: %02x\n", m_codebank, m_PPC, m_inst_state); read_pc(); prefetch(); bit_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP += X; - TMP2 = read(TMP); - do_bit(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP += m_X; + m_TMP2 = read(m_TMP); + do_bit(m_TMP2); prefetch(); bit_imm - TMP = read_pc(); - PC++; - do_bit(TMP); + m_TMP = read_pc(); + m_PC++; + do_bit(m_TMP); prefetch(); asr_xav_zpg - TMP = read_pc(); // TODO: verify this, should it write back or set A? - PC++; - TMP2 = read_zeropage(TMP); - do_asr(TMP2); - write_zeropage(TMP,TMP2); + m_TMP = read_pc(); // TODO: verify this, should it write back or set m_A? + m_PC++; + m_TMP2 = read_zeropage(m_TMP); + do_asr(m_TMP2); + write_zeropage(m_TMP,m_TMP2); prefetch(); asr_aba - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - TMP2 = read(TMP); - write(TMP, TMP2); - TMP2 = do_asr(TMP2); // used by xavbox, see 14e8 - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_TMP2 = read(m_TMP); + write(m_TMP, m_TMP2); + m_TMP2 = do_asr(m_TMP2); // used by xavbox, see 14e8 + write(m_TMP, m_TMP2); prefetch(); asr_xav_zpx - TMP = read_pc(); + m_TMP = read_pc(); read_pc(); - PC++; - TMP = uint8_t(TMP+X); - TMP2 = read_zeropage(TMP); - read_zeropage((TMP+1) & 0xff); - TMP2 = do_asr(TMP2); - write_zeropage(TMP, TMP2); + m_PC++; + m_TMP = uint8_t(m_TMP+m_X); + m_TMP2 = read_zeropage(m_TMP); + read_zeropage((m_TMP+1) & 0xff); + m_TMP2 = do_asr(m_TMP2); + write_zeropage(m_TMP, m_TMP2); prefetch(); asr_acc - A = do_asr(A); + m_A = do_asr(m_A); prefetch(); asr_abx - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - read(set_l(TMP, TMP+X)); - TMP += X; - TMP2 = read(TMP); - read(TMP); - TMP2 = do_asr(TMP2); - write(TMP, TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + read(set_l(m_TMP, m_TMP+m_X)); + m_TMP += m_X; + m_TMP2 = read(m_TMP); + read(m_TMP); + m_TMP2 = do_asr(m_TMP2); + write(m_TMP, m_TMP2); prefetch(); cmc_imp read_pc(); - TMP = P & F_C; - P &= ~F_C; - TMP = ~TMP; - P |= TMP & F_C; + m_TMP = m_P & F_C; + m_P &= ~F_C; + m_TMP = ~m_TMP; + m_P |= m_TMP & F_C; prefetch(); sev_imp read_pc(); - P |= F_V; + m_P |= F_V; prefetch(); jmpf_ind - TMP = read_pc(); - PC++; - TMP = set_h(TMP, read_pc()); - PC++; - PC = read(TMP); - PC = set_h(PC, read(set_l(TMP, TMP+1))); - TMP2 = read(TMP+2); - set_codebank(TMP2); + m_TMP = read_pc(); + m_PC++; + m_TMP = set_h(m_TMP, read_pc()); + m_PC++; + m_PC = read(m_TMP); + m_PC = set_h(m_PC, read(set_l(m_TMP, m_TMP+1))); + m_TMP2 = read(m_TMP+2); + set_codebank(m_TMP2); prefetch(); diff --git a/src/devices/cpu/m6502/r65c19.cpp b/src/devices/cpu/m6502/r65c19.cpp index ffd6c3ee2db..ff379c79e3f 100644 --- a/src/devices/cpu/m6502/r65c19.cpp +++ b/src/devices/cpu/m6502/r65c19.cpp @@ -23,7 +23,7 @@ r65c19_device::r65c19_device(const machine_config &mconfig, device_type type, co , m_page1_ram(*this, "page1") , m_cir(0) { - program_config.m_internal_map = std::move(internal_map); + m_program_config.m_internal_map = std::move(internal_map); } r65c19_device::r65c19_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) @@ -50,7 +50,7 @@ std::unique_ptr<util::disasm_interface> r65c19_device::create_disassembler() void r65c19_device::do_add(u8 v) { - P &= ~F_C; + m_P &= ~F_C; do_adc(v); } @@ -60,24 +60,24 @@ u16 r65c19_device::do_accumulate(u16 v, u16 w) s32 result = s16(v) + s16(w); // Determine flags and saturate result upon overflow - P &= ~(F_N | F_V); + m_P &= ~(F_N | F_V); if (result > 32767) { - P |= F_V; + m_P |= F_V; result = 32767; } else if (result < 0) { - P |= F_N; + m_P |= F_N; if (result < -32768) { - P |= F_V; + m_P |= F_V; result = -32768; } } // MPA and MPY always destroy the old value of Y, as does RND when it overflows - Y = result & 0xff; + m_Y = result & 0xff; // 16-bit result to W, or high byte to A return result & 0xffff; @@ -91,7 +91,7 @@ u16 r65c19_device::get_irq_vector() void r65c19_device::device_start() { - mintf = std::make_unique<mi_default>(); + m_mintf = std::make_unique<mi_default>(); c19_init(); } @@ -99,7 +99,7 @@ void r65c19_device::device_start() device_memory_interface::space_config_vector c39_device::memory_space_config() const { return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), + std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_exp_config), std::make_pair(AS_IO, &m_es4_config) }; @@ -108,18 +108,18 @@ device_memory_interface::space_config_vector c39_device::memory_space_config() c void c39_device::device_start() { std::unique_ptr<mi_banked> intf = std::make_unique<mi_banked>(); - space(AS_DATA).cache(intf->escache); - space(AS_DATA).specific(intf->exp); - space(AS_IO).specific(intf->es4); + space(AS_DATA).cache(intf->m_escache); + space(AS_DATA).specific(intf->m_exp); + space(AS_IO).specific(intf->m_es4); - save_item(NAME(intf->bsr)); - save_item(NAME(intf->pbs)); - mintf = std::move(intf); + save_item(NAME(intf->m_bsr)); + save_item(NAME(intf->m_pbs)); + m_mintf = std::move(intf); c19_init(); for (int i = 0; i < 8; i++) - state_add(C39_BSR0 + i, string_format("BSR%d", i).c_str(), downcast<mi_banked &>(*mintf).bsr[i]); + state_add(C39_BSR0 + i, string_format("BSR%d", i).c_str(), downcast<mi_banked &>(*m_mintf).m_bsr[i]); } void r65c19_device::c19_init() @@ -151,16 +151,16 @@ void c39_device::device_reset() { r65c02_device::device_reset(); - mi_banked &intf = downcast<mi_banked &>(*mintf); - intf.bsr[0] = 0xe0; - intf.bsr[1] = 0xd1; - intf.bsr[2] = 0xb2; - intf.bsr[3] = 0xb3; - intf.bsr[4] = 0x74; - intf.bsr[5] = 0x75; - intf.bsr[6] = 0x76; - intf.bsr[7] = 0x77; - intf.pbs = 0xff; + mi_banked &intf = downcast<mi_banked &>(*m_mintf); + intf.m_bsr[0] = 0xe0; + intf.m_bsr[1] = 0xd1; + intf.m_bsr[2] = 0xb2; + intf.m_bsr[3] = 0xb3; + intf.m_bsr[4] = 0x74; + intf.m_bsr[5] = 0x75; + intf.m_bsr[6] = 0x76; + intf.m_bsr[7] = 0x77; + intf.m_pbs = 0xff; } u8 r65c19_device::page1_seg_r(offs_t offset) @@ -186,39 +186,39 @@ void r65c19_device::cir_w(u8 data) u8 c39_device::mi_banked::exp_read(u16 adr) { - return exp.read_byte(u32(bsr[(adr & 0xe000) >> 13]) << 13 | (adr & 0x1fff)); + return m_exp.read_byte(u32(m_bsr[(adr & 0xe000) >> 13]) << 13 | (adr & 0x1fff)); } u8 c39_device::mi_banked::exp_read_cached(u16 adr) { - return escache.read_byte(u32(bsr[(adr & 0xe000) >> 13]) << 13 | (adr & 0x1fff)); + return m_escache.read_byte(u32(m_bsr[(adr & 0xe000) >> 13]) << 13 | (adr & 0x1fff)); } void c39_device::mi_banked::exp_write(u16 adr, u8 val) { - exp.write_byte(u32(bsr[(adr & 0xe000) >> 13]) << 13 | (adr & 0x1fff), val); + m_exp.write_byte(u32(m_bsr[(adr & 0xe000) >> 13]) << 13 | (adr & 0x1fff), val); } u8 c39_device::mi_banked::es4_read(u16 adr) { - return es4.read_byte(adr & 0x1ff); + return m_es4.read_byte(adr & 0x1ff); } void c39_device::mi_banked::es4_write(u16 adr, u8 val) { - es4.write_byte(adr & 0x1ff, val); + m_es4.write_byte(adr & 0x1ff, val); } u8 c39_device::mi_banked::read(u16 adr) { - return program.read_byte(adr); + return m_program.read_byte(adr); } u8 c39_device::mi_banked::read_sync(u16 adr) { if (adr < 0x0600) - return cprogram.read_byte(adr); - else if (adr >= 0x0800 || BIT(pbs, 1)) + return m_cprogram.read_byte(adr); + else if (adr >= 0x0800 || BIT(m_pbs, 1)) return exp_read_cached(adr); else return es4_read(adr); @@ -227,8 +227,8 @@ u8 c39_device::mi_banked::read_sync(u16 adr) u8 c39_device::mi_banked::read_arg(u16 adr) { if (adr < 0x0600) - return cprogram.read_byte(adr); - else if (adr >= 0x0800 || BIT(pbs, 1)) + return m_cprogram.read_byte(adr); + else if (adr >= 0x0800 || BIT(m_pbs, 1)) return exp_read_cached(adr); else return es4_read(adr); @@ -236,33 +236,33 @@ u8 c39_device::mi_banked::read_arg(u16 adr) void c39_device::mi_banked::write(u16 adr, u8 val) { - program.write_byte(adr, val); + m_program.write_byte(adr, val); } u8 c39_device::pbs_r() { - return downcast<mi_banked &>(*mintf).pbs; + return downcast<mi_banked &>(*m_mintf).m_pbs; } void c39_device::pbs_w(u8 data) { - downcast<mi_banked &>(*mintf).pbs = data; + downcast<mi_banked &>(*m_mintf).m_pbs = data; } u8 c39_device::bsr_r(offs_t offset) { - return downcast<mi_banked &>(*mintf).bsr[offset]; + return downcast<mi_banked &>(*m_mintf).m_bsr[offset]; } void c39_device::bsr_w(offs_t offset, u8 data) { - downcast<mi_banked &>(*mintf).bsr[offset] = data; + downcast<mi_banked &>(*m_mintf).m_bsr[offset] = data; } u8 c39_device::expansion_r(offs_t offset) { - mi_banked &intf = downcast<mi_banked &>(*mintf); - if (offset >= 0x0200 || BIT(intf.pbs, 1)) + mi_banked &intf = downcast<mi_banked &>(*m_mintf); + if (offset >= 0x0200 || BIT(intf.m_pbs, 1)) return intf.exp_read(offset + 0x0600); else return intf.es4_read(offset + 0x0600); @@ -270,8 +270,8 @@ u8 c39_device::expansion_r(offs_t offset) void c39_device::expansion_w(offs_t offset, u8 data) { - mi_banked &intf = downcast<mi_banked &>(*mintf); - if (offset >= 0x0200 || BIT(intf.pbs, 1)) + mi_banked &intf = downcast<mi_banked &>(*m_mintf); + if (offset >= 0x0200 || BIT(intf.m_pbs, 1)) intf.exp_write(offset + 0x0600, data); else intf.es4_write(offset + 0x0600, data); diff --git a/src/devices/cpu/m6502/r65c19.h b/src/devices/cpu/m6502/r65c19.h index 7c53a74ecc4..1c63e58b3d9 100644 --- a/src/devices/cpu/m6502/r65c19.h +++ b/src/devices/cpu/m6502/r65c19.h @@ -138,12 +138,12 @@ private: u8 es4_read(u16 adr); void es4_write(u16 adr, u8 val); - memory_access<21, 0, 0, ENDIANNESS_LITTLE>::cache escache; - memory_access<21, 0, 0, ENDIANNESS_LITTLE>::specific exp; - memory_access< 9, 0, 0, ENDIANNESS_LITTLE>::specific es4; + memory_access<21, 0, 0, ENDIANNESS_LITTLE>::cache m_escache; + memory_access<21, 0, 0, ENDIANNESS_LITTLE>::specific m_exp; + memory_access< 9, 0, 0, ENDIANNESS_LITTLE>::specific m_es4; - u8 bsr[8]; - u8 pbs; + u8 m_bsr[8]; + u8 m_pbs; }; address_space_config m_exp_config; diff --git a/src/devices/cpu/m6502/rp2a03.cpp b/src/devices/cpu/m6502/rp2a03.cpp index 4132e780d5a..2e1267d8c11 100644 --- a/src/devices/cpu/m6502/rp2a03.cpp +++ b/src/devices/cpu/m6502/rp2a03.cpp @@ -48,7 +48,7 @@ rp2a03_device::rp2a03_device(const machine_config &mconfig, device_type type, co , device_mixer_interface(mconfig, *this) , m_apu(*this, "nesapu") { - program_config.m_internal_map = address_map_constructor(FUNC(rp2a03_device::rp2a03_map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(rp2a03_device::rp2a03_map), this); } rp2a03_device::rp2a03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -76,7 +76,7 @@ void rp2a03_device::apu_irq(int state) uint8_t rp2a03_device::apu_read_mem(offs_t offset) { - return mintf->program.read_byte(offset); + return m_mintf->m_program.read_byte(offset); } void rp2a03_device::device_add_mconfig(machine_config &config) diff --git a/src/devices/cpu/m6502/st2204.cpp b/src/devices/cpu/m6502/st2204.cpp index cc18732226e..7f1ade8f627 100644 --- a/src/devices/cpu/m6502/st2204.cpp +++ b/src/devices/cpu/m6502/st2204.cpp @@ -72,14 +72,14 @@ void st2204_device::device_start() { std::unique_ptr<mi_st2204> intf = std::make_unique<mi_st2204>(); - space(AS_DATA).cache(intf->dcache); - space(AS_DATA).specific(intf->data); - intf->irr_enable = false; - intf->irr = 0; - intf->prr = 0; - intf->drr = 0; - intf->dmr = 0; - intf->irq_service = false; + space(AS_DATA).cache(intf->m_dcache); + space(AS_DATA).specific(intf->m_data); + intf->m_irr_enable = false; + intf->m_irr = 0; + intf->m_prr = 0; + intf->m_drr = 0; + intf->m_dmr = 0; + intf->m_irq_service = false; init_base_timer(0x0020); init_lcd_timer(0x0040); @@ -98,15 +98,15 @@ void st2204_device::device_start() save_item(NAME(m_dms)); save_item(NAME(m_dmd)); save_item(NAME(m_dcnth)); - save_item(NAME(intf->dmr)); + save_item(NAME(intf->m_dmr)); - mintf = std::move(intf); + m_mintf = std::move(intf); save_common_registers(); init(); - state_add(ST_IRR, "IRR", downcast<mi_st2204 &>(*mintf).irr).mask(0xff); - state_add(ST_PRR, "PRR", downcast<mi_st2204 &>(*mintf).prr).mask(0xfff); - state_add(ST_DRR, "DRR", downcast<mi_st2204 &>(*mintf).drr).mask(0x7ff); + state_add(ST_IRR, "IRR", downcast<mi_st2204 &>(*m_mintf).m_irr).mask(0xff); + state_add(ST_PRR, "PRR", downcast<mi_st2204 &>(*m_mintf).m_prr).mask(0xfff); + state_add(ST_DRR, "DRR", downcast<mi_st2204 &>(*m_mintf).m_drr).mask(0x7ff); state_add(ST_IREQ, "IREQ", m_ireq, [this](u16 data) { m_ireq = data; update_irq_state(); }).mask(st2xxx_ireq_mask()); state_add(ST_IENA, "IENA", m_iena, [this](u16 data) { m_iena = data; update_irq_state(); }).mask(st2xxx_ireq_mask()); for (int i = 0; i < 5; i++) @@ -155,7 +155,7 @@ void st2204_device::device_start() state_add(ST_BRS, "BRS", m_brs); state_add(ST_BDIV, "BDIV", m_bdiv); state_add(ST_DMS, "DMS", m_dms); - state_add(ST_DMR, "DMR", downcast<mi_st2204 &>(*mintf).dmr).mask(0x7ff); + state_add(ST_DMR, "DMR", downcast<mi_st2204 &>(*m_mintf).m_dmr).mask(0x7ff); state_add(ST_DMD, "DMD", m_dmd); } @@ -176,7 +176,7 @@ void st2204_device::device_reset() m_psg_timer->enable(false); m_dac_callback(0); - downcast<mi_st2204 &>(*mintf).dmr = 0; + downcast<mi_st2204 &>(*m_mintf).m_dmr = 0; // other DMA registers are undefined } @@ -201,56 +201,56 @@ const char *st2204_device::st2xxx_irq_name(int i) const u8 st2204_device::mi_st2204::pread(u16 adr) { - u16 bank = irq_service && irr_enable ? irr : prr; - return data.read_byte(u32(bank ^ 1) << 14 | (adr & 0x3fff)); + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; + return m_data.read_byte(u32(bank ^ 1) << 14 | (adr & 0x3fff)); } u8 st2204_device::mi_st2204::preadc(u16 adr) { - u16 bank = irq_service && irr_enable ? irr : prr; - return dcache.read_byte(u32(bank ^ 1) << 14 | (adr & 0x3fff)); + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; + return m_dcache.read_byte(u32(bank ^ 1) << 14 | (adr & 0x3fff)); } void st2204_device::mi_st2204::pwrite(u16 adr, u8 val) { - u16 bank = irq_service && irr_enable ? irr : prr; - data.write_byte(u32(bank ^ 1) << 14 | (adr & 0x3fff), val); + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; + m_data.write_byte(u32(bank ^ 1) << 14 | (adr & 0x3fff), val); } u8 st2204_device::mi_st2204::dread(u16 adr) { - return data.read_byte(u32(drr) << 15 | (adr & 0x7fff)); + return m_data.read_byte(u32(m_drr) << 15 | (adr & 0x7fff)); } u8 st2204_device::mi_st2204::dreadc(u16 adr) { - return dcache.read_byte(u32(drr) << 15 | (adr & 0x7fff)); + return m_dcache.read_byte(u32(m_drr) << 15 | (adr & 0x7fff)); } void st2204_device::mi_st2204::dwrite(u16 adr, u8 val) { - data.write_byte(u32(drr) << 15 | (adr & 0x7fff), val); + m_data.write_byte(u32(m_drr) << 15 | (adr & 0x7fff), val); } u8 st2204_device::mi_st2204::read(u16 adr) { - return program.read_byte(adr); + return m_program.read_byte(adr); } u8 st2204_device::mi_st2204::read_sync(u16 adr) { - return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : cprogram.read_byte(adr); + return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : m_cprogram.read_byte(adr); } u8 st2204_device::mi_st2204::read_arg(u16 adr) { - return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : cprogram.read_byte(adr); + return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : m_cprogram.read_byte(adr); } u8 st2204_device::mi_st2204::read_dma(u16 adr) { if (BIT(adr, 15)) - return dcache.read_byte(u32(dmr) << 15 | (adr & 0x7fff)); + return m_dcache.read_byte(u32(m_dmr) << 15 | (adr & 0x7fff)); else return read(adr); } @@ -262,7 +262,7 @@ u8 st2204_device::mi_st2204::read_vector(u16 adr) void st2204_device::mi_st2204::write(u16 adr, u8 val) { - program.write_byte(adr, val); + m_program.write_byte(adr, val); } unsigned st2204_device::st2xxx_bt_divider(int n) const @@ -573,7 +573,7 @@ void st2204_device::dcntl_w(u8 data) u16 count = data | u16(m_dcnth & 0x0f) << 8; // FIXME: not instantaneous (obviously), but takes 2 cycles per transfer while CPU is halted - mi_st2204 &intf = downcast<mi_st2204 &>(*mintf); + mi_st2204 &intf = downcast<mi_st2204 &>(*m_mintf); while (count != 0xffff) { intf.write(m_dmd, intf.read_dma(m_dms)); @@ -582,7 +582,7 @@ void st2204_device::dcntl_w(u8 data) { // DMR bank increments automatically when source is in data memory m_dms = 0x8000; - intf.dmr = (intf.dmr + 1) & 0x7ff; + intf.m_dmr = (intf.m_dmr + 1) & 0x7ff; } // DMAM inhibits destination increment @@ -600,44 +600,44 @@ void st2204_device::dcnth_w(u8 data) u8 st2204_device::dmrl_r() { - return downcast<mi_st2204 &>(*mintf).dmr & 0xff; + return downcast<mi_st2204 &>(*m_mintf).m_dmr & 0xff; } void st2204_device::dmrl_w(u8 data) { - u16 &dmr = downcast<mi_st2204 &>(*mintf).dmr; + u16 &dmr = downcast<mi_st2204 &>(*m_mintf).m_dmr; dmr = (data & m_drr_mask) | (dmr & 0xff00); } u8 st2204_device::dmrh_r() { - return downcast<mi_st2204 &>(*mintf).dmr >> 8; + return downcast<mi_st2204 &>(*m_mintf).m_dmr >> 8; } void st2204_device::dmrh_w(u8 data) { - u16 &dmr = downcast<mi_st2204 &>(*mintf).dmr; + u16 &dmr = downcast<mi_st2204 &>(*m_mintf).m_dmr; dmr = ((u16(data) << 8) & m_drr_mask) | (dmr & 0x00ff); } u8 st2204_device::pmem_r(offs_t offset) { - return downcast<mi_st2204 &>(*mintf).pread(offset); + return downcast<mi_st2204 &>(*m_mintf).pread(offset); } void st2204_device::pmem_w(offs_t offset, u8 data) { - downcast<mi_st2204 &>(*mintf).pwrite(offset, data); + downcast<mi_st2204 &>(*m_mintf).pwrite(offset, data); } u8 st2204_device::dmem_r(offs_t offset) { - return downcast<mi_st2204 &>(*mintf).dread(offset); + return downcast<mi_st2204 &>(*m_mintf).dread(offset); } void st2204_device::dmem_w(offs_t offset, u8 data) { - downcast<mi_st2204 &>(*mintf).dwrite(offset, data); + downcast<mi_st2204 &>(*m_mintf).dwrite(offset, data); } void st2204_device::common_map(address_map &map) diff --git a/src/devices/cpu/m6502/st2204.h b/src/devices/cpu/m6502/st2204.h index ba4ed6e9ee4..c56f8bd5a51 100644 --- a/src/devices/cpu/m6502/st2204.h +++ b/src/devices/cpu/m6502/st2204.h @@ -78,7 +78,7 @@ private: u8 dreadc(u16 adr); void dwrite(u16 adr, u8 val); - u16 dmr; + u16 m_dmr; }; u32 tclk_pres_div(u8 mode) const; diff --git a/src/devices/cpu/m6502/st2205u.cpp b/src/devices/cpu/m6502/st2205u.cpp index eeec370de92..249faf06554 100644 --- a/src/devices/cpu/m6502/st2205u.cpp +++ b/src/devices/cpu/m6502/st2205u.cpp @@ -160,7 +160,7 @@ void st2205u_base_device::base_init(std::unique_ptr<mi_st2xxx> &&intf) save_item(NAME(m_psg_amplitude)); save_item(NAME(m_psg_freqcntr)); - mintf = std::move(intf); + m_mintf = std::move(intf); save_common_registers(); init(); } @@ -168,28 +168,28 @@ void st2205u_base_device::base_init(std::unique_ptr<mi_st2xxx> &&intf) void st2205u_device::device_start() { std::unique_ptr<mi_st2205u> intf = std::make_unique<mi_st2205u>(); - space(AS_DATA).specific(intf->data); - space(AS_DATA).cache(intf->dcache); - intf->irr_enable = false; - intf->irr = 0; - intf->prr = 0; - intf->drr = 0; - intf->brr = 0; - intf->irq_service = false; - intf->ram = make_unique_clear<u8[]>(0x8000); + space(AS_DATA).specific(intf->m_data); + space(AS_DATA).cache(intf->m_dcache); + intf->m_irr_enable = false; + intf->m_irr = 0; + intf->m_prr = 0; + intf->m_drr = 0; + intf->m_brr = 0; + intf->m_irq_service = false; + intf->m_ram = make_unique_clear<u8[]>(0x8000); save_item(NAME(m_lbuf)); save_item(NAME(m_lpal_index)); save_item(NAME(m_gray_levels)); - save_item(NAME(intf->brr)); - save_pointer(NAME(intf->ram), 0x8000); + save_item(NAME(intf->m_brr)); + save_pointer(NAME(intf->m_ram), 0x8000); base_init(std::move(intf)); - state_add(ST_IRR, "IRR", downcast<mi_st2205u &>(*mintf).irr).mask(0x8fff); - state_add(ST_PRR, "PRR", downcast<mi_st2205u &>(*mintf).prr).mask(0x8fff); - state_add(ST_DRR, "DRR", downcast<mi_st2205u &>(*mintf).drr).mask(0x87ff); - state_add(ST_BRR, "BRR", downcast<mi_st2205u &>(*mintf).brr).mask(0x9fff); + state_add(ST_IRR, "IRR", downcast<mi_st2205u &>(*m_mintf).m_irr).mask(0x8fff); + state_add(ST_PRR, "PRR", downcast<mi_st2205u &>(*m_mintf).m_prr).mask(0x8fff); + state_add(ST_DRR, "DRR", downcast<mi_st2205u &>(*m_mintf).m_drr).mask(0x87ff); + state_add(ST_BRR, "BRR", downcast<mi_st2205u &>(*m_mintf).m_brr).mask(0x9fff); state_add(ST_IREQ, "IREQ", m_ireq, [this](u16 data) { m_ireq = data; update_irq_state(); }).mask(st2xxx_ireq_mask()); state_add(ST_IENA, "IENA", m_iena, [this](u16 data) { m_iena = data; update_irq_state(); }).mask(st2xxx_ireq_mask()); for (int i = 0; i < 6; i++) @@ -263,19 +263,19 @@ void st2205u_device::device_start() void st2302u_device::device_start() { std::unique_ptr<mi_st2302u> intf = std::make_unique<mi_st2302u>(); - space(AS_DATA).specific(intf->data); - space(AS_DATA).cache(intf->dcache); - intf->irr_enable = false; - intf->irr = 0; - intf->prr = 0; - intf->drr = 0; - intf->irq_service = false; + space(AS_DATA).specific(intf->m_data); + space(AS_DATA).cache(intf->m_dcache); + intf->m_irr_enable = false; + intf->m_irr = 0; + intf->m_prr = 0; + intf->m_drr = 0; + intf->m_irq_service = false; base_init(std::move(intf)); - state_add(ST_IRR, "IRR", downcast<mi_st2302u &>(*mintf).irr).mask(0x0fff); - state_add(ST_PRR, "PRR", downcast<mi_st2302u &>(*mintf).prr).mask(0x0fff); - state_add(ST_DRR, "DRR", downcast<mi_st2302u &>(*mintf).drr).mask(0x07ff); + state_add(ST_IRR, "IRR", downcast<mi_st2302u &>(*m_mintf).m_irr).mask(0x0fff); + state_add(ST_PRR, "PRR", downcast<mi_st2302u &>(*m_mintf).m_prr).mask(0x0fff); + state_add(ST_DRR, "DRR", downcast<mi_st2302u &>(*m_mintf).m_drr).mask(0x07ff); state_add(ST_IREQ, "IREQ", m_ireq, [this](u16 data) { m_ireq = data; update_irq_state(); }).mask(st2xxx_ireq_mask()); state_add(ST_IENA, "IENA", m_iena, [this](u16 data) { m_iena = data; update_irq_state(); }).mask(st2xxx_ireq_mask()); for (int i = 0; i < 6; i++) @@ -369,7 +369,7 @@ void st2205u_device::device_reset() { st2205u_base_device::device_reset(); - downcast<mi_st2205u &>(*mintf).brr = 0; + downcast<mi_st2205u &>(*m_mintf).m_brr = 0; m_lbuf = 0; m_lpal_index = 0; @@ -421,125 +421,125 @@ const char *st2302u_device::st2xxx_irq_name(int i) const u8 st2205u_device::mi_st2205u::pread(u16 adr) { - u16 bank = irq_service && irr_enable ? irr : prr; + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; if (BIT(bank, 15)) - return ram[0x4000 | (adr & 0x3fff)]; + return m_ram[0x4000 | (adr & 0x3fff)]; else - return data.read_byte(u32(bank) << 14 | (adr & 0x3fff)); + return m_data.read_byte(u32(bank) << 14 | (adr & 0x3fff)); } u8 st2205u_device::mi_st2205u::preadc(u16 adr) { - u16 bank = irq_service && irr_enable ? irr : prr; + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; if (BIT(bank, 15)) - return ram[0x4000 | (adr & 0x3fff)]; + return m_ram[0x4000 | (adr & 0x3fff)]; else - return dcache.read_byte(u32(bank) << 14 | (adr & 0x3fff)); + return m_dcache.read_byte(u32(bank) << 14 | (adr & 0x3fff)); } void st2205u_device::mi_st2205u::pwrite(u16 adr, u8 val) { - u16 bank = irq_service && irr_enable ? irr : prr; + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; if (BIT(bank, 15)) - ram[0x4000 | (adr & 0x3fff)] = val; + m_ram[0x4000 | (adr & 0x3fff)] = val; else - data.write_byte(u32(bank) << 14 | (adr & 0x3fff), val); + m_data.write_byte(u32(bank) << 14 | (adr & 0x3fff), val); } u8 st2205u_device::mi_st2205u::dread(u16 adr) { - if (BIT(drr, 15)) - return ram[adr & 0x7fff]; + if (BIT(m_drr, 15)) + return m_ram[adr & 0x7fff]; else - return data.read_byte(u32(drr) << 15 | (adr & 0x7fff)); + return m_data.read_byte(u32(m_drr) << 15 | (adr & 0x7fff)); } u8 st2205u_device::mi_st2205u::dreadc(u16 adr) { - if (BIT(drr, 15)) - return ram[adr & 0x7fff]; + if (BIT(m_drr, 15)) + return m_ram[adr & 0x7fff]; else - return dcache.read_byte(u32(drr) << 15 | (adr & 0x7fff)); + return m_dcache.read_byte(u32(m_drr) << 15 | (adr & 0x7fff)); } void st2205u_device::mi_st2205u::dwrite(u16 adr, u8 val) { - if (BIT(drr, 15)) - ram[adr & 0x7fff] = val; + if (BIT(m_drr, 15)) + m_ram[adr & 0x7fff] = val; else - data.write_byte(u32(drr) << 15 | (adr & 0x7fff), val); + m_data.write_byte(u32(m_drr) << 15 | (adr & 0x7fff), val); } u8 st2205u_device::mi_st2205u::bread(u16 adr) { - if (BIT(brr, 15)) - return ram[0x2000 | (adr & 0x1fff)]; + if (BIT(m_brr, 15)) + return m_ram[0x2000 | (adr & 0x1fff)]; else - return data.read_byte(u32(brr) << 13 | (adr & 0x1fff)); + return m_data.read_byte(u32(m_brr) << 13 | (adr & 0x1fff)); } u8 st2205u_device::mi_st2205u::breadc(u16 adr) { - if (BIT(brr, 15)) - return ram[0x2000 | (adr & 0x1fff)]; + if (BIT(m_brr, 15)) + return m_ram[0x2000 | (adr & 0x1fff)]; else - return dcache.read_byte(u32(brr) << 13 | (adr & 0x1fff)); + return m_dcache.read_byte(u32(m_brr) << 13 | (adr & 0x1fff)); } void st2205u_device::mi_st2205u::bwrite(u16 adr, u8 val) { - if (BIT(brr, 15)) - ram[0x2000 | (adr & 0x1fff)] = val; + if (BIT(m_brr, 15)) + m_ram[0x2000 | (adr & 0x1fff)] = val; else - data.write_byte(u32(brr) << 13 | (adr & 0x1fff), val); + m_data.write_byte(u32(m_brr) << 13 | (adr & 0x1fff), val); } u8 st2302u_device::mi_st2302u::pread(u16 adr) { - u16 bank = irq_service && irr_enable ? irr : prr; - return data.read_byte(u32(bank) << 14 | (adr & 0x3fff)); + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; + return m_data.read_byte(u32(bank) << 14 | (adr & 0x3fff)); } u8 st2302u_device::mi_st2302u::preadc(u16 adr) { - u16 bank = irq_service && irr_enable ? irr : prr; - return dcache.read_byte(u32(bank) << 14 | (adr & 0x3fff)); + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; + return m_dcache.read_byte(u32(bank) << 14 | (adr & 0x3fff)); } void st2302u_device::mi_st2302u::pwrite(u16 adr, u8 val) { - u16 bank = irq_service && irr_enable ? irr : prr; - data.write_byte(u32(bank) << 14 | (adr & 0x3fff), val); + u16 bank = m_irq_service && m_irr_enable ? m_irr : m_prr; + m_data.write_byte(u32(bank) << 14 | (adr & 0x3fff), val); } u8 st2302u_device::mi_st2302u::dread(u16 adr) { - return data.read_byte(u32(drr) << 15 | (adr & 0x7fff)); + return m_data.read_byte(u32(m_drr) << 15 | (adr & 0x7fff)); } u8 st2302u_device::mi_st2302u::dreadc(u16 adr) { - return dcache.read_byte(u32(drr) << 15 | (adr & 0x7fff)); + return m_dcache.read_byte(u32(m_drr) << 15 | (adr & 0x7fff)); } void st2302u_device::mi_st2302u::dwrite(u16 adr, u8 val) { - data.write_byte(u32(drr) << 15 | (adr & 0x7fff), val); + m_data.write_byte(u32(m_drr) << 15 | (adr & 0x7fff), val); } u8 st2205u_device::mi_st2205u::read(u16 adr) { - return program.read_byte(adr); + return m_program.read_byte(adr); } u8 st2205u_device::mi_st2205u::read_sync(u16 adr) { - return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : BIT(adr, 13) ? breadc(adr) : cprogram.read_byte(adr); + return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : BIT(adr, 13) ? breadc(adr) : m_cprogram.read_byte(adr); } u8 st2205u_device::mi_st2205u::read_arg(u16 adr) { - return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : BIT(adr, 13) ? breadc(adr) : cprogram.read_byte(adr); + return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : BIT(adr, 13) ? breadc(adr) : m_cprogram.read_byte(adr); } u8 st2205u_device::mi_st2205u::read_vector(u16 adr) @@ -549,22 +549,22 @@ u8 st2205u_device::mi_st2205u::read_vector(u16 adr) void st2205u_device::mi_st2205u::write(u16 adr, u8 val) { - program.write_byte(adr, val); + m_program.write_byte(adr, val); } u8 st2302u_device::mi_st2302u::read(u16 adr) { - return program.read_byte(adr); + return m_program.read_byte(adr); } u8 st2302u_device::mi_st2302u::read_sync(u16 adr) { - return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : cprogram.read_byte(adr); + return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : m_cprogram.read_byte(adr); } u8 st2302u_device::mi_st2302u::read_arg(u16 adr) { - return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : cprogram.read_byte(adr); + return BIT(adr, 15) ? dreadc(adr) : BIT(adr, 14) ? preadc(adr) : m_cprogram.read_byte(adr); } u8 st2302u_device::mi_st2302u::read_vector(u16 adr) @@ -574,28 +574,28 @@ u8 st2302u_device::mi_st2302u::read_vector(u16 adr) void st2302u_device::mi_st2302u::write(u16 adr, u8 val) { - program.write_byte(adr, val); + m_program.write_byte(adr, val); } u8 st2205u_device::brrl_r() { - return downcast<mi_st2205u &>(*mintf).brr & 0xff; + return downcast<mi_st2205u &>(*m_mintf).m_brr & 0xff; } void st2205u_device::brrl_w(u8 data) { - u16 &brr = downcast<mi_st2205u &>(*mintf).brr; + u16 &brr = downcast<mi_st2205u &>(*m_mintf).m_brr; brr = data | (brr & 0x9f00); } u8 st2205u_device::brrh_r() { - return downcast<mi_st2205u &>(*mintf).brr >> 8; + return downcast<mi_st2205u &>(*m_mintf).m_brr >> 8; } void st2205u_device::brrh_w(u8 data) { - u16 &brr = downcast<mi_st2205u &>(*mintf).brr; + u16 &brr = downcast<mi_st2205u &>(*m_mintf).m_brr; brr = (data & 0x9f) << 8 | (brr & 0x00ff); } @@ -1022,9 +1022,9 @@ void st2205u_base_device::dcnth_w(u8 data) { uint8_t data; if (BIT(srcb, 15)) - data = mintf->cprogram.read_byte(srcp); // FIXME: 0080-7FFF should be all RAM on ST2205U + data = m_mintf->m_cprogram.read_byte(srcp); // FIXME: 0080-7FFF should be all RAM on ST2205U else - data = downcast<mi_st2xxx &>(*mintf).dcache.read_byte(srcp | u32(srcb << 15)); + data = downcast<mi_st2xxx &>(*m_mintf).m_dcache.read_byte(srcp | u32(srcb << 15)); if (!BIT(mode, 1)) { if (srcp++ == 0x7fff) @@ -1036,9 +1036,9 @@ void st2205u_base_device::dcnth_w(u8 data) // TODO: XOR/OR/AND logic for DMA0 three-cycle modes (different on ST23XX?) if (BIT(dstb, 15)) - mintf->cprogram.write_byte(dstp, data); // FIXME: 0080-7FFF should be all RAM on ST2205U + m_mintf->m_cprogram.write_byte(dstp, data); // FIXME: 0080-7FFF should be all RAM on ST2205U else - downcast<mi_st2xxx &>(*mintf).dcache.write_byte(dstp | u32(dstb << 15), data); + downcast<mi_st2xxx &>(*m_mintf).m_dcache.write_byte(dstp | u32(dstb << 15), data); if (!BIT(mode, 3)) { if (dstp++ == 0x7fff) @@ -1189,62 +1189,62 @@ void st2302u_device::unk7f_w(u8 data) u8 st2205u_device::ram_r(offs_t offset) { - return downcast<mi_st2205u &>(*mintf).ram[0x0080 + offset]; + return downcast<mi_st2205u &>(*m_mintf).m_ram[0x0080 + offset]; } void st2205u_device::ram_w(offs_t offset, u8 data) { - downcast<mi_st2205u &>(*mintf).ram[0x0080 + offset] = data; + downcast<mi_st2205u &>(*m_mintf).m_ram[0x0080 + offset] = data; } u8 st2205u_device::pmem_r(offs_t offset) { - return downcast<mi_st2205u &>(*mintf).pread(offset); + return downcast<mi_st2205u &>(*m_mintf).pread(offset); } void st2205u_device::pmem_w(offs_t offset, u8 data) { - downcast<mi_st2205u &>(*mintf).pwrite(offset, data); + downcast<mi_st2205u &>(*m_mintf).pwrite(offset, data); } u8 st2205u_device::dmem_r(offs_t offset) { - return downcast<mi_st2205u &>(*mintf).dread(offset); + return downcast<mi_st2205u &>(*m_mintf).dread(offset); } void st2205u_device::dmem_w(offs_t offset, u8 data) { - downcast<mi_st2205u &>(*mintf).dwrite(offset, data); + downcast<mi_st2205u &>(*m_mintf).dwrite(offset, data); } u8 st2205u_device::bmem_r(offs_t offset) { - return downcast<mi_st2205u &>(*mintf).bread(offset); + return downcast<mi_st2205u &>(*m_mintf).bread(offset); } void st2205u_device::bmem_w(offs_t offset, u8 data) { - downcast<mi_st2205u &>(*mintf).bwrite(offset, data); + downcast<mi_st2205u &>(*m_mintf).bwrite(offset, data); } u8 st2302u_device::pmem_r(offs_t offset) { - return downcast<mi_st2302u &>(*mintf).pread(offset); + return downcast<mi_st2302u &>(*m_mintf).pread(offset); } void st2302u_device::pmem_w(offs_t offset, u8 data) { - downcast<mi_st2302u &>(*mintf).pwrite(offset, data); + downcast<mi_st2302u &>(*m_mintf).pwrite(offset, data); } u8 st2302u_device::dmem_r(offs_t offset) { - return downcast<mi_st2302u &>(*mintf).dread(offset); + return downcast<mi_st2302u &>(*m_mintf).dread(offset); } void st2302u_device::dmem_w(offs_t offset, u8 data) { - downcast<mi_st2302u &>(*mintf).dwrite(offset, data); + downcast<mi_st2302u &>(*m_mintf).dwrite(offset, data); } void st2205u_base_device::base_map(address_map &map) diff --git a/src/devices/cpu/m6502/st2205u.h b/src/devices/cpu/m6502/st2205u.h index 57f9e4eaf14..9414af02648 100644 --- a/src/devices/cpu/m6502/st2205u.h +++ b/src/devices/cpu/m6502/st2205u.h @@ -221,9 +221,9 @@ private: u8 breadc(u16 adr); void bwrite(u16 adr, u8 val); - u16 brr; + u16 m_brr; - std::unique_ptr<u8[]> ram; + std::unique_ptr<u8[]> m_ram; }; u8 brrl_r(); diff --git a/src/devices/cpu/m6502/st2xxx.cpp b/src/devices/cpu/m6502/st2xxx.cpp index c5c42fd9551..3dc8c88c0be 100644 --- a/src/devices/cpu/m6502/st2xxx.cpp +++ b/src/devices/cpu/m6502/st2xxx.cpp @@ -87,13 +87,13 @@ st2xxx_device::st2xxx_device(const machine_config &mconfig, device_type type, co , m_irctr(0) , m_bctr(0) { - program_config.m_internal_map = std::move(internal_map); + m_program_config.m_internal_map = std::move(internal_map); } device_memory_interface::space_config_vector st2xxx_device::memory_space_config() const { return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), + std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; } @@ -150,7 +150,7 @@ void st2xxx_device::init_lcd_timer(u16 ireq) void st2xxx_device::save_common_registers() { - mi_st2xxx *intf = downcast<mi_st2xxx *>(mintf.get()); + mi_st2xxx *intf = downcast<mi_st2xxx *>(m_mintf.get()); save_item(NAME(m_pdata)); save_item(NAME(m_pctrl)); @@ -161,14 +161,14 @@ void st2xxx_device::save_common_registers() { if (BIT(st2xxx_sys_mask(), 1)) { - save_item(NAME(intf->irq_service)); - save_item(NAME(intf->irr_enable)); - save_item(NAME(intf->irr)); + save_item(NAME(intf->m_irq_service)); + save_item(NAME(intf->m_irr_enable)); + save_item(NAME(intf->m_irr)); } - save_item(NAME(intf->prr)); + save_item(NAME(intf->m_prr)); } if (m_drr_mask != 0) - save_item(NAME(intf->drr)); + save_item(NAME(intf->m_drr)); if (m_bt_mask != 0) { save_item(NAME(m_bten)); @@ -230,11 +230,11 @@ void st2xxx_device::device_reset() m_pmcr = 0x80; // reset bank registers - mi_st2xxx &m = downcast<mi_st2xxx &>(*mintf); - m.irr_enable = false; - m.irr = 0; - m.prr = 0; - m.drr = 0; + mi_st2xxx &m = downcast<mi_st2xxx &>(*m_mintf); + m.m_irr_enable = false; + m.m_irr = 0; + m.m_prr = 0; + m.m_drr = 0; // reset interrupt registers m_ireq = 0; @@ -297,7 +297,7 @@ u8 st2xxx_device::read_vector(u16 adr) set_irq_service(true); // Make sure this doesn't change in between vector pull cycles - m_irq_level = irq_taken ? active_irq_level() : 0xff; + m_irq_level = m_irq_taken ? active_irq_level() : 0xff; } if (m_irq_level != 0xff) @@ -306,7 +306,7 @@ u8 st2xxx_device::read_vector(u16 adr) LOGMASKED(LOG_IRQ, "Acknowledging %s interrupt (PC = $%04X, IREQ = $%04X, IENA = $%04X, vector pull from $%04X)\n", st2xxx_irq_name(m_irq_level), - PPC, + m_PPC, m_ireq, m_iena, adr & 0x7fff); @@ -318,7 +318,7 @@ u8 st2xxx_device::read_vector(u16 adr) } } } - return downcast<mi_st2xxx &>(*mintf).read_vector(adr); + return downcast<mi_st2xxx &>(*m_mintf).read_vector(adr); } u8 st2xxx_device::pdata_r(offs_t offset) @@ -441,12 +441,12 @@ void st2xxx_device::bten_w(u8 data) assert(div != 0); assert(m_base_timer[n] != nullptr); m_base_timer[n]->adjust(attotime::from_ticks(div, 32768), n); - LOGMASKED(LOG_BT, "Base timer %d enabled at %.1f Hz (PC = $%04X)\n", n, 32768.0 / div, PPC); + LOGMASKED(LOG_BT, "Base timer %d enabled at %.1f Hz (PC = $%04X)\n", n, 32768.0 / div, m_PPC); } else if (!BIT(data, n) && BIT(m_bten, n)) { m_base_timer[n]->adjust(attotime::never); - LOGMASKED(LOG_BT, "Base timer %d disabled (PC = $%04X)\n", n, PPC); + LOGMASKED(LOG_BT, "Base timer %d disabled (PC = $%04X)\n", n, m_PPC); } } @@ -523,7 +523,7 @@ void st2xxx_device::sys_w(u8 data) u8 mask = st2xxx_sys_mask(); m_sys = data & mask; if (BIT(mask, 1)) - downcast<mi_st2xxx &>(*mintf).irr_enable = BIT(data, 1); + downcast<mi_st2xxx &>(*m_mintf).m_irr_enable = BIT(data, 1); } u8 st2xxx_device::misc_r() @@ -538,67 +538,67 @@ void st2xxx_device::misc_w(u8 data) u8 st2xxx_device::irrl_r() { - return downcast<mi_st2xxx &>(*mintf).irr & 0xff; + return downcast<mi_st2xxx &>(*m_mintf).m_irr & 0xff; } void st2xxx_device::irrl_w(u8 data) { - u16 &irr = downcast<mi_st2xxx &>(*mintf).irr; + u16 &irr = downcast<mi_st2xxx &>(*m_mintf).m_irr; irr = (data & m_prr_mask) | (irr & 0xff00); } u8 st2xxx_device::irrh_r() { - return downcast<mi_st2xxx &>(*mintf).irr >> 8; + return downcast<mi_st2xxx &>(*m_mintf).m_irr >> 8; } void st2xxx_device::irrh_w(u8 data) { - u16 &irr = downcast<mi_st2xxx &>(*mintf).irr; + u16 &irr = downcast<mi_st2xxx &>(*m_mintf).m_irr; irr = ((u16(data) << 8) & m_prr_mask) | (irr & 0x00ff); } u8 st2xxx_device::prrl_r() { - return downcast<mi_st2xxx &>(*mintf).prr & 0xff; + return downcast<mi_st2xxx &>(*m_mintf).m_prr & 0xff; } void st2xxx_device::prrl_w(u8 data) { - u16 &prr = downcast<mi_st2xxx &>(*mintf).prr; + u16 &prr = downcast<mi_st2xxx &>(*m_mintf).m_prr; prr = (data & m_prr_mask) | (prr & 0xff00); } u8 st2xxx_device::prrh_r() { - return downcast<mi_st2xxx &>(*mintf).prr >> 8; + return downcast<mi_st2xxx &>(*m_mintf).m_prr >> 8; } void st2xxx_device::prrh_w(u8 data) { - u16 &prr = downcast<mi_st2xxx &>(*mintf).prr; + u16 &prr = downcast<mi_st2xxx &>(*m_mintf).m_prr; prr = ((u16(data) << 8) & m_prr_mask) | (prr & 0x00ff); } u8 st2xxx_device::drrl_r() { - return downcast<mi_st2xxx &>(*mintf).drr & 0xff; + return downcast<mi_st2xxx &>(*m_mintf).m_drr & 0xff; } void st2xxx_device::drrl_w(u8 data) { - u16 &drr = downcast<mi_st2xxx &>(*mintf).drr; + u16 &drr = downcast<mi_st2xxx &>(*m_mintf).m_drr; drr = (data & m_drr_mask) | (drr & 0xff00); } u8 st2xxx_device::drrh_r() { - return downcast<mi_st2xxx &>(*mintf).drr >> 8; + return downcast<mi_st2xxx &>(*m_mintf).m_drr >> 8; } void st2xxx_device::drrh_w(u8 data) { - u16 &drr = downcast<mi_st2xxx &>(*mintf).drr; + u16 &drr = downcast<mi_st2xxx &>(*m_mintf).m_drr; drr = ((u16(data) << 8) & m_drr_mask) | (drr & 0x00ff); } @@ -614,7 +614,7 @@ void st2xxx_device::ireql_w(u8 data) for (int i = 0; i < 8; i++) { if (!BIT(data, i) && BIT(m_ireq, i)) - LOGMASKED(LOG_IRQ, "%s interrupt cleared (PC = $%04X)\n", st2xxx_irq_name(i), PPC); + LOGMASKED(LOG_IRQ, "%s interrupt cleared (PC = $%04X)\n", st2xxx_irq_name(i), m_PPC); } m_ireq &= data | 0xff00; update_irq_state(); @@ -633,7 +633,7 @@ void st2xxx_device::ireqh_w(u8 data) for (int i = 0; i < 8; i++) { if (!BIT(data, i) && BIT(m_ireq, i + 8)) - LOGMASKED(LOG_IRQ, "%s interrupt cleared (PC = $%04X)\n", st2xxx_irq_name(i + 8), PPC); + LOGMASKED(LOG_IRQ, "%s interrupt cleared (PC = $%04X)\n", st2xxx_irq_name(i + 8), m_PPC); } m_ireq &= u16(data) << 8 | 0x00ff; update_irq_state(); @@ -656,7 +656,7 @@ void st2xxx_device::ienal_w(u8 data) LOGMASKED(LOG_IRQ, "%s interrupt %sabled (PC = $%04X)\n", st2xxx_irq_name(i), BIT(data, i) ? "en" : "dis", - PPC); + m_PPC); } m_iena = (m_iena & 0xff00) | data; update_irq_state(); @@ -679,7 +679,7 @@ void st2xxx_device::ienah_w(u8 data) LOGMASKED(LOG_IRQ, "%s interrupt %sabled (PC = $%04X)\n", st2xxx_irq_name(i + 8), BIT(data, i) ? "en" : "dis", - PPC); + m_PPC); } m_iena = (m_iena & 0x00ff) | (u16(data) << 8); update_irq_state(); @@ -766,7 +766,7 @@ void st2xxx_device::lfr_recalculate_period() unsigned clocks = st2xxx_lfr_clocks(); assert(clocks != 0); attotime period = cycles_to_attotime(clocks); - LOGMASKED(LOG_LCDC, "LCD frame rate = %f Hz (PC = $%04X)\n", period.as_hz(), PPC); + LOGMASKED(LOG_LCDC, "LCD frame rate = %f Hz (PC = $%04X)\n", period.as_hz(), m_PPC); m_lcd_timer->adjust(period, 0, period); } else @@ -880,7 +880,7 @@ u8 st2xxx_device::udata_r() void st2xxx_device::udata_w(u8 data) { - logerror("Writing %02X to UART transmitter (PC = %04X)\n", data, PPC); + logerror("Writing %02X to UART transmitter (PC = %04X)\n", data, m_PPC); } u8 st2xxx_device::bctr_r() diff --git a/src/devices/cpu/m6502/st2xxx.h b/src/devices/cpu/m6502/st2xxx.h index 5189cb24a5d..7d0a57d16ae 100644 --- a/src/devices/cpu/m6502/st2xxx.h +++ b/src/devices/cpu/m6502/st2xxx.h @@ -115,14 +115,14 @@ protected: public: virtual u8 read_vector(u16 adr) = 0; - memory_access<26, 0, 0, ENDIANNESS_LITTLE>::cache dcache; - memory_access<26, 0, 0, ENDIANNESS_LITTLE>::specific data; - - bool irq_service; - bool irr_enable; - u16 irr; - u16 prr; - u16 drr; + memory_access<26, 0, 0, ENDIANNESS_LITTLE>::cache m_dcache; + memory_access<26, 0, 0, ENDIANNESS_LITTLE>::specific m_data; + + bool m_irq_service; + bool m_irr_enable; + u16 m_irr; + u16 m_prr; + u16 m_drr; }; void init_base_timer(u16 ireq); @@ -132,8 +132,8 @@ protected: virtual u8 read_vector(u16 adr) override; virtual void end_interrupt() override { set_irq_service(false); } - void set_irq_service(bool state) { downcast<mi_st2xxx &>(*mintf).irq_service = state; } - void update_irq_state() { irq_state = (m_ireq & m_iena) != 0; } + void set_irq_service(bool state) { downcast<mi_st2xxx &>(*m_mintf).m_irq_service = state; } + void update_irq_state() { m_irq_state = (m_ireq & m_iena) != 0; } u8 active_irq_level() const; TIMER_CALLBACK_MEMBER(bt_interrupt); diff --git a/src/devices/cpu/m6502/vt3xx_spu.cpp b/src/devices/cpu/m6502/vt3xx_spu.cpp index 88c41d8dcd0..c8e029f5b08 100644 --- a/src/devices/cpu/m6502/vt3xx_spu.cpp +++ b/src/devices/cpu/m6502/vt3xx_spu.cpp @@ -70,13 +70,13 @@ device_memory_interface::space_config_vector vt3xx_spu_device::memory_space_conf { if(has_configured_map(AS_OPCODES)) return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), - std::make_pair(AS_OPCODES, &sprogram_config), + std::make_pair(AS_PROGRAM, &m_program_config), + std::make_pair(AS_OPCODES, &m_sprogram_config), std::make_pair(5, &m_extdata_config), }; else return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), + std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(5, &m_extdata_config), }; } diff --git a/src/devices/cpu/m6502/w65c02s.h b/src/devices/cpu/m6502/w65c02s.h index 7a3da04bcd5..a26a2de761a 100644 --- a/src/devices/cpu/m6502/w65c02s.h +++ b/src/devices/cpu/m6502/w65c02s.h @@ -25,7 +25,7 @@ public: protected: w65c02s_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - virtual uint8_t read_vector(uint16_t adr) { return mintf->read_arg(adr); } + virtual uint8_t read_vector(uint16_t adr) { return m_mintf->read_arg(adr); } virtual void end_interrupt() { } #define O(o) void o ## _full(); void o ## _partial() diff --git a/src/devices/cpu/m6502/xavix.cpp b/src/devices/cpu/m6502/xavix.cpp index bf5eb25b925..406f45cc5c5 100644 --- a/src/devices/cpu/m6502/xavix.cpp +++ b/src/devices/cpu/m6502/xavix.cpp @@ -40,15 +40,15 @@ xavix_device::xavix_device(const machine_config &mconfig, const char *tag, devic xavix_device::xavix_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : m6502_device(mconfig, type, tag, owner, clock), - XPC(0), + m_XPC(0), m_lowbus_config("lowbus", ENDIANNESS_LITTLE, 8, 15), m_extbus_config("extbus", ENDIANNESS_LITTLE, 8, 24), m_vector_callback(*this) { - program_config.m_addr_width = 24; - program_config.m_logaddr_width = 24; - sprogram_config.m_addr_width = 24; - sprogram_config.m_logaddr_width = 24; + m_program_config.m_addr_width = 24; + m_program_config.m_logaddr_width = 24; + m_sprogram_config.m_addr_width = 24; + m_sprogram_config.m_logaddr_width = 24; // XaviX specific spaces m_lowbus_config.m_addr_width = 15; m_lowbus_config.m_logaddr_width = 15; @@ -71,7 +71,7 @@ offs_t xavix_device::pc_to_external(u16 pc) void xavix_device::device_start() { - mintf = std::make_unique<mi_xavix>(this); + m_mintf = std::make_unique<mi_xavix>(this); // bind delegates m_vector_callback.resolve(); @@ -103,7 +103,7 @@ void xavix_device::device_reset() xavix_device::mi_xavix::mi_xavix(xavix_device *_base) { - base = _base; + m_base = _base; } void xavix_device::write_special_stack(uint32_t addr, uint8_t data) @@ -192,20 +192,20 @@ inline uint8_t xavix_device::read_full_data(uint8_t databank, uint16_t adr) // data reads inline uint8_t xavix_device::mi_xavix::read(uint16_t adr) { - uint8_t databank = base->get_databank(); - return base->read_full_data(databank, adr); + uint8_t databank = m_base->get_databank(); + return m_base->read_full_data(databank, adr); } // opcode reads uint8_t xavix_device::mi_xavix::read_sync(uint16_t adr) { - return csprogram.read_byte(base->adr_with_codebank(adr)); + return m_csprogram.read_byte(m_base->adr_with_codebank(adr)); } // oprand reads uint8_t xavix_device::mi_xavix::read_arg(uint16_t adr) { - return cprogram.read_byte(base->adr_with_codebank(adr)); + return m_cprogram.read_byte(m_base->adr_with_codebank(adr)); } // data writes @@ -296,8 +296,8 @@ inline void xavix_device::write_full_data(uint8_t databank, uint16_t adr, uint8_ void xavix_device::mi_xavix::write(uint16_t adr, uint8_t val) { - uint8_t databank = base->get_databank(); - base->write_full_data(databank, adr, val); + uint8_t databank = m_base->get_databank(); + m_base->write_full_data(databank, adr, val); } void xavix_device::set_codebank(uint8_t bank) @@ -328,14 +328,14 @@ device_memory_interface::space_config_vector xavix_device::memory_space_config() { if(has_configured_map(AS_OPCODES)) return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), - std::make_pair(AS_OPCODES, &sprogram_config), + std::make_pair(AS_PROGRAM, &m_program_config), + std::make_pair(AS_OPCODES, &m_sprogram_config), std::make_pair(5, &m_lowbus_config), std::make_pair(6, &m_extbus_config) }; else return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), + std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(5, &m_lowbus_config), std::make_pair(6, &m_extbus_config) }; diff --git a/src/devices/cpu/m6502/xavix.h b/src/devices/cpu/m6502/xavix.h index 5363bb77d36..2416902c6b7 100644 --- a/src/devices/cpu/m6502/xavix.h +++ b/src/devices/cpu/m6502/xavix.h @@ -149,7 +149,7 @@ public: protected: class mi_xavix : public memory_interface { public: - xavix_device *base; + xavix_device *m_base; mi_xavix(xavix_device *base); virtual ~mi_xavix() {} @@ -162,7 +162,7 @@ protected: uint8_t m_databank; uint8_t m_codebank; - uint32_t XPC; + uint32_t m_XPC; xavix_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/elan_ep3a19a_soc.cpp b/src/devices/machine/elan_ep3a19a_soc.cpp index 0cd01efdb8a..9fde0663c95 100644 --- a/src/devices/machine/elan_ep3a19a_soc.cpp +++ b/src/devices/machine/elan_ep3a19a_soc.cpp @@ -21,7 +21,7 @@ elan_ep3a19a_soc_device::elan_ep3a19a_soc_device(const machine_config &mconfig, { m_extbus_config.m_addr_width = 24; m_extbus_config.m_logaddr_width = 24; - program_config.m_internal_map = address_map_constructor(FUNC(elan_ep3a19a_soc_device::int_map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(elan_ep3a19a_soc_device::int_map), this); } elan_ep3a19a_soc_device::elan_ep3a19a_soc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : @@ -135,13 +135,13 @@ device_memory_interface::space_config_vector elan_ep3a19a_soc_device::memory_spa { if(has_configured_map(AS_OPCODES)) return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), - std::make_pair(AS_OPCODES, &sprogram_config), + std::make_pair(AS_PROGRAM, &m_program_config), + std::make_pair(AS_OPCODES, &m_sprogram_config), std::make_pair(AS_EXTERNAL, &m_extbus_config), }; else return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), + std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_EXTERNAL, &m_extbus_config), }; } diff --git a/src/devices/machine/elan_eu3a05_soc.cpp b/src/devices/machine/elan_eu3a05_soc.cpp index c4593765eb5..b8d672a5e19 100644 --- a/src/devices/machine/elan_eu3a05_soc.cpp +++ b/src/devices/machine/elan_eu3a05_soc.cpp @@ -23,7 +23,7 @@ elan_eu3a05_soc_device::elan_eu3a05_soc_device(const machine_config &mconfig, de { m_extbus_config.m_addr_width = 24; m_extbus_config.m_logaddr_width = 24; - program_config.m_internal_map = address_map_constructor(FUNC(elan_eu3a05_soc_device::int_map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(elan_eu3a05_soc_device::int_map), this); m_fixed_bank_address = 0x3f8000; } @@ -160,13 +160,13 @@ device_memory_interface::space_config_vector elan_eu3a05_soc_device::memory_spac { if(has_configured_map(AS_OPCODES)) return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), - std::make_pair(AS_OPCODES, &sprogram_config), + std::make_pair(AS_PROGRAM, &m_program_config), + std::make_pair(AS_OPCODES, &m_sprogram_config), std::make_pair(AS_EXTERNAL, &m_extbus_config), }; else return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), + std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_EXTERNAL, &m_extbus_config), }; } diff --git a/src/devices/machine/elan_eu3a14_soc.cpp b/src/devices/machine/elan_eu3a14_soc.cpp index c9d521ac73d..e5a140f323c 100644 --- a/src/devices/machine/elan_eu3a14_soc.cpp +++ b/src/devices/machine/elan_eu3a14_soc.cpp @@ -26,7 +26,7 @@ elan_eu3a14_soc_device::elan_eu3a14_soc_device(const machine_config &mconfig, de { m_extbus_config.m_addr_width = 24; m_extbus_config.m_logaddr_width = 24; - program_config.m_internal_map = address_map_constructor(FUNC(elan_eu3a14_soc_device::int_map), this); + m_program_config.m_internal_map = address_map_constructor(FUNC(elan_eu3a14_soc_device::int_map), this); } elan_eu3a14_soc_device::elan_eu3a14_soc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : @@ -113,13 +113,13 @@ device_memory_interface::space_config_vector elan_eu3a14_soc_device::memory_spac { if(has_configured_map(AS_OPCODES)) return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), - std::make_pair(AS_OPCODES, &sprogram_config), + std::make_pair(AS_PROGRAM, &m_program_config), + std::make_pair(AS_OPCODES, &m_sprogram_config), std::make_pair(AS_EXTERNAL, &m_extbus_config), }; else return space_config_vector { - std::make_pair(AS_PROGRAM, &program_config), + std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_EXTERNAL, &m_extbus_config), }; } diff --git a/src/mame/dataeast/deco222.cpp b/src/mame/dataeast/deco222.cpp index 2e78dcbfdfd..1e356c06a9b 100644 --- a/src/mame/dataeast/deco222.cpp +++ b/src/mame/dataeast/deco222.cpp @@ -19,19 +19,19 @@ deco_222_device::deco_222_device(const machine_config &mconfig, const char *tag, void deco_222_device::device_start() { - mintf = std::make_unique<mi_decrypt>(); + m_mintf = std::make_unique<mi_decrypt>(); init(); } void deco_222_device::device_reset() { m6502_device::device_reset(); - downcast<mi_decrypt &>(*mintf).had_written = false; + downcast<mi_decrypt &>(*m_mintf).m_had_written = false; } uint8_t deco_222_device::mi_decrypt::read_sync(uint16_t adr) { - return bitswap<8>(cprogram.read_byte(adr) ,7,5,6,4,3,2,1,0); + return bitswap<8>(m_cprogram.read_byte(adr) ,7,5,6,4,3,2,1,0); } std::unique_ptr<util::disasm_interface> deco_222_device::create_disassembler() @@ -56,19 +56,19 @@ deco_c10707_device::deco_c10707_device(const machine_config &mconfig, const char void deco_c10707_device::device_start() { - mintf = std::make_unique<mi_decrypt>(); + m_mintf = std::make_unique<mi_decrypt>(); init(); } void deco_c10707_device::device_reset() { m6502_device::device_reset(); - downcast<mi_decrypt &>(*mintf).had_written = false; + downcast<mi_decrypt &>(*m_mintf).had_written = false; } uint8_t deco_c10707_device::mi_decrypt::read_sync(uint16_t adr) { - return bitswap<8>(cprogram.read_byte(adr) ,7,5,6,4,3,2,1,0); + return bitswap<8>(m_cprogram.read_byte(adr) ,7,5,6,4,3,2,1,0); } std::unique_ptr<util::disasm_interface> deco_c10707_device::create_disassembler() diff --git a/src/mame/dataeast/deco222.h b/src/mame/dataeast/deco222.h index be5b675063e..9ce916b9569 100644 --- a/src/mame/dataeast/deco222.h +++ b/src/mame/dataeast/deco222.h @@ -15,7 +15,7 @@ public: protected: class mi_decrypt : public mi_default { public: - bool had_written; + bool m_had_written; virtual ~mi_decrypt() {} virtual uint8_t read_sync(uint16_t adr) override; diff --git a/src/mame/dataeast/decocpu6.cpp b/src/mame/dataeast/decocpu6.cpp index bc167c5e35f..16a07eb51dc 100644 --- a/src/mame/dataeast/decocpu6.cpp +++ b/src/mame/dataeast/decocpu6.cpp @@ -19,7 +19,7 @@ deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, const char *ta void deco_cpu6_device::device_start() { - mintf = std::make_unique<mi_decrypt>(); + m_mintf = std::make_unique<mi_decrypt>(); init(); } @@ -31,9 +31,9 @@ void deco_cpu6_device::device_reset() uint8_t deco_cpu6_device::mi_decrypt::read_sync(uint16_t adr) { if (adr&1) - return bitswap<8>(cprogram.read_byte(adr),6,4,7,5,3,2,1,0); + return bitswap<8>(m_cprogram.read_byte(adr),6,4,7,5,3,2,1,0); else - return cprogram.read_byte(adr); + return m_cprogram.read_byte(adr); } std::unique_ptr<util::disasm_interface> deco_cpu6_device::create_disassembler() diff --git a/src/mame/dataeast/decocpu7.cpp b/src/mame/dataeast/decocpu7.cpp index 7f90c30ff01..a864aebd989 100644 --- a/src/mame/dataeast/decocpu7.cpp +++ b/src/mame/dataeast/decocpu7.cpp @@ -14,21 +14,21 @@ deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, const char *ta void deco_cpu7_device::device_start() { - mintf = std::make_unique<mi_decrypt>(); + m_mintf = std::make_unique<mi_decrypt>(); init(); } void deco_cpu7_device::device_reset() { m6502_device::device_reset(); - downcast<mi_decrypt &>(*mintf).had_written = false; + downcast<mi_decrypt &>(*m_mintf).m_had_written = false; } uint8_t deco_cpu7_device::mi_decrypt::read_sync(uint16_t adr) { - uint8_t res = cprogram.read_byte(adr); - if(had_written) { - had_written = false; + uint8_t res = m_cprogram.read_byte(adr); + if(m_had_written) { + m_had_written = false; if((adr & 0x0104) == 0x0104) res = bitswap<8>(res, 6,5,3,4,2,7,1,0); } @@ -37,16 +37,16 @@ uint8_t deco_cpu7_device::mi_decrypt::read_sync(uint16_t adr) void deco_cpu7_device::mi_decrypt::write(uint16_t adr, uint8_t val) { - program.write_byte(adr, val); - had_written = true; + m_program.write_byte(adr, val); + m_had_written = true; } std::unique_ptr<util::disasm_interface> deco_cpu7_device::create_disassembler() { - return std::make_unique<disassembler>(downcast<mi_decrypt *>(mintf.get())); + return std::make_unique<disassembler>(downcast<mi_decrypt *>(m_mintf.get())); } -deco_cpu7_device::disassembler::disassembler(mi_decrypt *mi) : mintf(mi) +deco_cpu7_device::disassembler::disassembler(mi_decrypt *mi) : m_mintf(mi) { } @@ -57,5 +57,5 @@ u32 deco_cpu7_device::disassembler::interface_flags() const u8 deco_cpu7_device::disassembler::decrypt8(u8 value, offs_t pc, bool opcode) const { - return opcode && mintf->had_written && ((pc & 0x104) == 0x104) ? bitswap<8>(value,6,5,3,4,2,7,1,0) : value; + return opcode && m_mintf->m_had_written && ((pc & 0x104) == 0x104) ? bitswap<8>(value,6,5,3,4,2,7,1,0) : value; } diff --git a/src/mame/dataeast/decocpu7.h b/src/mame/dataeast/decocpu7.h index 283679824fa..d4ce133b756 100644 --- a/src/mame/dataeast/decocpu7.h +++ b/src/mame/dataeast/decocpu7.h @@ -15,7 +15,7 @@ public: protected: class mi_decrypt : public mi_default { public: - bool had_written; + bool m_had_written; virtual ~mi_decrypt() {} virtual uint8_t read_sync(uint16_t adr) override; @@ -24,7 +24,7 @@ protected: class disassembler : public m6502_disassembler { public: - mi_decrypt *mintf; + mi_decrypt *m_mintf; disassembler(mi_decrypt *m); virtual ~disassembler() = default; diff --git a/src/mame/nintendo/m6502_swap_op_d2_d7.cpp b/src/mame/nintendo/m6502_swap_op_d2_d7.cpp index fa58c4e834d..910a34bdcb6 100644 --- a/src/mame/nintendo/m6502_swap_op_d2_d7.cpp +++ b/src/mame/nintendo/m6502_swap_op_d2_d7.cpp @@ -26,7 +26,7 @@ m6502_swap_op_d2_d7::m6502_swap_op_d2_d7(const machine_config &mconfig, const ch void m6502_swap_op_d2_d7::device_start() { - mintf = std::make_unique<mi_decrypt>(); + m_mintf = std::make_unique<mi_decrypt>(); init(); } @@ -42,7 +42,7 @@ uint8_t m6502_swap_op_d2_d7::mi_decrypt::descramble(uint8_t op) uint8_t m6502_swap_op_d2_d7::mi_decrypt::read_sync(uint16_t adr) { - uint8_t res = cprogram.read_byte(adr); + uint8_t res = m_cprogram.read_byte(adr); res = descramble(res); @@ -51,10 +51,10 @@ uint8_t m6502_swap_op_d2_d7::mi_decrypt::read_sync(uint16_t adr) std::unique_ptr<util::disasm_interface> m6502_swap_op_d2_d7::create_disassembler() { - return std::make_unique<disassembler>(downcast<mi_decrypt *>(mintf.get())); + return std::make_unique<disassembler>(downcast<mi_decrypt *>(m_mintf.get())); } -m6502_swap_op_d2_d7::disassembler::disassembler(mi_decrypt *mi) : mintf(mi) +m6502_swap_op_d2_d7::disassembler::disassembler(mi_decrypt *mi) : m_mintf(mi) { } @@ -65,5 +65,5 @@ u32 m6502_swap_op_d2_d7::disassembler::interface_flags() const u8 m6502_swap_op_d2_d7::disassembler::decrypt8(u8 value, offs_t pc, bool opcode) const { - return opcode ? mintf->descramble(value) : value; + return opcode ? m_mintf->descramble(value) : value; } diff --git a/src/mame/nintendo/m6502_swap_op_d2_d7.h b/src/mame/nintendo/m6502_swap_op_d2_d7.h index 4e83781f50b..9c99db6d8d4 100644 --- a/src/mame/nintendo/m6502_swap_op_d2_d7.h +++ b/src/mame/nintendo/m6502_swap_op_d2_d7.h @@ -35,7 +35,7 @@ protected: class disassembler : public m6502_disassembler { public: - mi_decrypt *mintf; + mi_decrypt *m_mintf; disassembler(mi_decrypt *m); virtual ~disassembler() = default; diff --git a/src/mame/nintendo/m6502_swap_op_d5_d6.cpp b/src/mame/nintendo/m6502_swap_op_d5_d6.cpp index cf5ddfdcec7..56a9e7abdf5 100644 --- a/src/mame/nintendo/m6502_swap_op_d5_d6.cpp +++ b/src/mame/nintendo/m6502_swap_op_d5_d6.cpp @@ -27,19 +27,19 @@ m6502_swap_op_d5_d6::m6502_swap_op_d5_d6(const machine_config &mconfig, const ch void m6502_swap_op_d5_d6::device_start() { - mintf = std::make_unique<mi_decrypt>(); + m_mintf = std::make_unique<mi_decrypt>(); init(); } void m6502_swap_op_d5_d6::device_reset() { - downcast<mi_decrypt &>(*mintf).m_encryption_enabled = true; + downcast<mi_decrypt &>(*m_mintf).m_encryption_enabled = true; m6502_device::device_reset(); } void m6502_swap_op_d5_d6::set_encryption_state(bool state) { - downcast<mi_decrypt &>(*mintf).m_encryption_enabled = state; + downcast<mi_decrypt &>(*m_mintf).m_encryption_enabled = state; } uint8_t m6502_swap_op_d5_d6::mi_decrypt::descramble(uint8_t op) @@ -52,7 +52,7 @@ uint8_t m6502_swap_op_d5_d6::mi_decrypt::descramble(uint8_t op) uint8_t m6502_swap_op_d5_d6::mi_decrypt::read_sync(uint16_t adr) { - uint8_t res = cprogram.read_byte(adr); + uint8_t res = m_cprogram.read_byte(adr); res = descramble(res); @@ -61,10 +61,10 @@ uint8_t m6502_swap_op_d5_d6::mi_decrypt::read_sync(uint16_t adr) std::unique_ptr<util::disasm_interface> m6502_swap_op_d5_d6::create_disassembler() { - return std::make_unique<disassembler>(downcast<mi_decrypt *>(mintf.get())); + return std::make_unique<disassembler>(downcast<mi_decrypt *>(m_mintf.get())); } -m6502_swap_op_d5_d6::disassembler::disassembler(mi_decrypt *mi) : mintf(mi) +m6502_swap_op_d5_d6::disassembler::disassembler(mi_decrypt *mi) : m_mintf(mi) { } @@ -75,7 +75,7 @@ u32 m6502_swap_op_d5_d6::disassembler::interface_flags() const u8 m6502_swap_op_d5_d6::disassembler::decrypt8(u8 value, offs_t pc, bool opcode) const { - return opcode ? mintf->descramble(value) : value; + return opcode ? m_mintf->descramble(value) : value; } @@ -91,21 +91,21 @@ rp2a03_core_swap_op_d5_d6::rp2a03_core_swap_op_d5_d6(const machine_config &mconf void rp2a03_core_swap_op_d5_d6::device_start() { - mintf = std::make_unique<mi_decrypt>(); + m_mintf = std::make_unique<mi_decrypt>(); init(); - save_item(downcast<mi_decrypt &>(*mintf).m_encryption_enabled, "m_encryption_enabled"); + save_item(downcast<mi_decrypt &>(*m_mintf).m_encryption_enabled, "m_encryption_enabled"); } void rp2a03_core_swap_op_d5_d6::device_reset() { - downcast<mi_decrypt &>(*mintf).m_encryption_enabled = m_encryption_enabled_on_reset; - downcast<mi_decrypt &>(*mintf).m_whichcrypt = m_cryptconfig; + downcast<mi_decrypt &>(*m_mintf).m_encryption_enabled = m_encryption_enabled_on_reset; + downcast<mi_decrypt &>(*m_mintf).m_whichcrypt = m_cryptconfig; rp2a03_core_device::device_reset(); } void rp2a03_core_swap_op_d5_d6::set_encryption_state(bool state) { - downcast<mi_decrypt &>(*mintf).m_encryption_enabled = state; + downcast<mi_decrypt &>(*m_mintf).m_encryption_enabled = state; } uint8_t rp2a03_core_swap_op_d5_d6::mi_decrypt::descramble(uint8_t op) @@ -127,7 +127,7 @@ uint8_t rp2a03_core_swap_op_d5_d6::mi_decrypt::descramble(uint8_t op) uint8_t rp2a03_core_swap_op_d5_d6::mi_decrypt::read_sync(uint16_t adr) { - uint8_t res = cprogram.read_byte(adr); + uint8_t res = m_cprogram.read_byte(adr); res = descramble(res); @@ -136,10 +136,10 @@ uint8_t rp2a03_core_swap_op_d5_d6::mi_decrypt::read_sync(uint16_t adr) std::unique_ptr<util::disasm_interface> rp2a03_core_swap_op_d5_d6::create_disassembler() { - return std::make_unique<disassembler>(downcast<mi_decrypt *>(mintf.get())); + return std::make_unique<disassembler>(downcast<mi_decrypt *>(m_mintf.get())); } -rp2a03_core_swap_op_d5_d6::disassembler::disassembler(mi_decrypt *mi) : mintf(mi) +rp2a03_core_swap_op_d5_d6::disassembler::disassembler(mi_decrypt *mi) : m_mintf(mi) { } @@ -150,6 +150,6 @@ u32 rp2a03_core_swap_op_d5_d6::disassembler::interface_flags() const u8 rp2a03_core_swap_op_d5_d6::disassembler::decrypt8(u8 value, offs_t pc, bool opcode) const { - return opcode ? mintf->descramble(value) : value; + return opcode ? m_mintf->descramble(value) : value; } diff --git a/src/mame/nintendo/m6502_swap_op_d5_d6.h b/src/mame/nintendo/m6502_swap_op_d5_d6.h index e220ea11a53..b70c7ebf8fa 100644 --- a/src/mame/nintendo/m6502_swap_op_d5_d6.h +++ b/src/mame/nintendo/m6502_swap_op_d5_d6.h @@ -35,7 +35,7 @@ protected: class disassembler : public m6502_disassembler { public: - mi_decrypt *mintf; + mi_decrypt *m_mintf; disassembler(mi_decrypt *m); virtual ~disassembler() = default; @@ -72,7 +72,7 @@ protected: class disassembler : public rp2a03_disassembler { public: - mi_decrypt *mintf; + mi_decrypt *m_mintf; disassembler(mi_decrypt *m); virtual ~disassembler() = default; diff --git a/src/mame/nintendo/rp2a03_vtscr.cpp b/src/mame/nintendo/rp2a03_vtscr.cpp index 037b6c408c3..92e90c5f8db 100644 --- a/src/mame/nintendo/rp2a03_vtscr.cpp +++ b/src/mame/nintendo/rp2a03_vtscr.cpp @@ -24,20 +24,20 @@ rp2a03_vtscr::rp2a03_vtscr(const machine_config &mconfig, const char *tag, devic void rp2a03_vtscr::device_start() { - mintf = std::make_unique<mi_decrypt>(); + m_mintf = std::make_unique<mi_decrypt>(); set_scramble(0x00); init(); } void rp2a03_vtscr::set_next_scramble(uint8_t scr) { - downcast<mi_decrypt &>(*mintf).m_next_scramble = scr; + downcast<mi_decrypt &>(*m_mintf).m_next_scramble = scr; } void rp2a03_vtscr::set_scramble(uint8_t scr) { - downcast<mi_decrypt &>(*mintf).m_next_scramble = scr; - downcast<mi_decrypt &>(*mintf).m_scramble_en = scr; + downcast<mi_decrypt &>(*m_mintf).m_next_scramble = scr; + downcast<mi_decrypt &>(*m_mintf).m_scramble_en = scr; } @@ -54,7 +54,7 @@ bool rp2a03_vtscr::mi_decrypt::toggle_scramble(uint8_t op) { uint8_t rp2a03_vtscr::mi_decrypt::read_sync(uint16_t adr) { - uint8_t res = cprogram.read_byte(adr); + uint8_t res = m_cprogram.read_byte(adr); if(m_scramble_en) { res = descramble(res); @@ -74,10 +74,10 @@ uint8_t rp2a03_vtscr::mi_decrypt::descramble(uint8_t op) std::unique_ptr<util::disasm_interface> rp2a03_vtscr::create_disassembler() { - return std::make_unique<disassembler>(downcast<mi_decrypt *>(mintf.get())); + return std::make_unique<disassembler>(downcast<mi_decrypt *>(m_mintf.get())); } -rp2a03_vtscr::disassembler::disassembler(mi_decrypt *mi) : mintf(mi) +rp2a03_vtscr::disassembler::disassembler(mi_decrypt *mi) : m_mintf(mi) { } @@ -88,5 +88,5 @@ u32 rp2a03_vtscr::disassembler::interface_flags() const u8 rp2a03_vtscr::disassembler::decrypt8(u8 value, offs_t pc, bool opcode) const { - return opcode && mintf->m_scramble_en ? mintf->descramble(value) : value; + return opcode && m_mintf->m_scramble_en ? m_mintf->descramble(value) : value; } diff --git a/src/mame/nintendo/rp2a03_vtscr.h b/src/mame/nintendo/rp2a03_vtscr.h index 1297f75aeb2..07df49a2b10 100644 --- a/src/mame/nintendo/rp2a03_vtscr.h +++ b/src/mame/nintendo/rp2a03_vtscr.h @@ -40,7 +40,7 @@ protected: class disassembler : public rp2a03_disassembler { public: - mi_decrypt *mintf; + mi_decrypt *m_mintf; disassembler(mi_decrypt *m); virtual ~disassembler() = default; |
