From eb746cb7d85d3f673f5b66ee65340129c6aa62d6 Mon Sep 17 00:00:00 2001 From: smf- Date: Wed, 13 Dec 2017 15:09:28 +0000 Subject: [PATCH] replace some space.device() calls (nw) --- src/mame/drivers/namcos11.cpp | 4 ++-- src/mame/drivers/namcos22.cpp | 12 +++++------ src/mame/drivers/namcos23.cpp | 38 +++++++++++++++++------------------ src/mame/drivers/naomi.cpp | 4 ++-- src/mame/drivers/rmhaihai.cpp | 6 +++--- src/mame/drivers/witch.cpp | 2 +- src/mame/drivers/x1.cpp | 8 ++++---- src/mame/drivers/x68k.cpp | 2 +- src/mame/drivers/xexex.cpp | 2 +- src/mame/drivers/xmen.cpp | 2 +- src/mame/drivers/xyonix.cpp | 4 ++-- src/mame/drivers/yunsung8.cpp | 2 +- src/mame/drivers/zn.cpp | 6 +++--- 13 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp index 86784874484..ee1c195bd5f 100644 --- a/src/mame/drivers/namcos11.cpp +++ b/src/mame/drivers/namcos11.cpp @@ -516,9 +516,9 @@ ADDRESS_MAP_END READ16_MEMBER(namcos11_state::c76_speedup_r) { - if ((space.device().safe_pc() == 0xc153) && (!(m_su_83 & 0xff00))) + if ((m_mcu->pc() == 0xc153) && (!(m_su_83 & 0xff00))) { - space.device().execute().spin_until_interrupt(); + m_mcu->spin_until_interrupt(); } return m_su_83; diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 5929f68d546..50ac0075e7c 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -5444,9 +5444,9 @@ ROM_END // for MCU BIOS v1.41 READ16_MEMBER(namcos22_state::mcu141_speedup_r) { - if ((space.device().safe_pc() == 0xc12d) && (!(m_su_82 & 0xff00))) + if ((m_mcu->pc() == 0xc12d) && (!(m_su_82 & 0xff00))) { - space.device().execute().spin_until_interrupt(); + m_mcu->spin_until_interrupt(); } return m_su_82; @@ -5460,9 +5460,9 @@ WRITE16_MEMBER(namcos22_state::mcu_speedup_w) // for MCU BIOS v1.20/v1.30 READ16_MEMBER(namcos22_state::mcu130_speedup_r) { - if ((space.device().safe_pc() == 0xc12a) && (!(m_su_82 & 0xff00))) + if ((m_mcu->pc() == 0xc12a) && (!(m_su_82 & 0xff00))) { - space.device().execute().spin_until_interrupt(); + m_mcu->spin_until_interrupt(); } return m_su_82; @@ -5471,9 +5471,9 @@ READ16_MEMBER(namcos22_state::mcu130_speedup_r) // for NSTX7702 v1.00 (C74) READ16_MEMBER(namcos22_state::mcuc74_speedup_r) { - if (((space.device().safe_pc() == 0xc0df) || (space.device().safe_pc() == 0xc101)) && (!(m_su_82 & 0xff00))) + if (((m_mcu->pc() == 0xc0df) || (m_mcu->pc() == 0xc101)) && (!(m_su_82 & 0xff00))) { - space.device().execute().spin_until_interrupt(); + m_mcu->spin_until_interrupt(); } return m_su_82; diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index 138cb3c90d1..66ebe564f04 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -1997,7 +1997,7 @@ READ32_MEMBER(namcos23_state::c435_r) return 1; // Busy flag } - logerror("c435_r %02x @ %08x (%08x, %08x)\n", offset, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c435_r %02x @ %08x (%08x, %08x)\n", offset, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); return 0; } @@ -2015,7 +2015,7 @@ WRITE32_MEMBER(namcos23_state::c435_w) c435_dma(space, m_c435_address, m_c435_size); break; default: - logerror("c435_w %02x, %08x @ %08x (%08x, %08x)\n", offset, data, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c435_w %02x, %08x @ %08x (%08x, %08x)\n", offset, data, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); break; } } @@ -2492,7 +2492,7 @@ READ16_MEMBER(namcos23_state::c417_r) case 1: return m_c417.adr; case 4: - //logerror("c417_r %04x = %04x (%08x, %08x)\n", c417.adr, c417.ram[c417.adr], space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + //logerror("c417_r %04x = %04x (%08x, %08x)\n", c417.adr, c417.ram[c417.adr], m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); return m_c417.ram[m_c417.adr]; case 5: if(m_c417.pointrom_adr >= m_ptrom_limit) @@ -2504,7 +2504,7 @@ READ16_MEMBER(namcos23_state::c417_r) return m_ptrom[m_c417.pointrom_adr]; } - logerror("c417_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c417_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); return 0; } @@ -2524,7 +2524,7 @@ WRITE16_MEMBER(namcos23_state::c417_w) m_c417.pointrom_adr = 0; break; case 4: - //logerror("c417_w %04x = %04x (%08x, %08x)\n", m_c417.adr, data, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + //logerror("c417_w %04x = %04x (%08x, %08x)\n", m_c417.adr, data, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); COMBINE_DATA(m_c417.ram + m_c417.adr); break; case 7: @@ -2532,7 +2532,7 @@ WRITE16_MEMBER(namcos23_state::c417_w) update_main_interrupts(m_main_irqcause & ~MAIN_C435_IRQ); break; default: - logerror("c417_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c417_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); break; } } @@ -2543,7 +2543,7 @@ WRITE16_MEMBER(namcos23_state::c417_w) READ16_MEMBER(namcos23_state::c412_ram_r) { - // logerror("c412_ram_r %06x (%08x, %08x)\n", offset, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + // logerror("c412_ram_r %06x (%08x, %08x)\n", offset, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); if(offset < 0x100000) return m_c412.sdram_a[offset & 0xfffff]; else if(offset < 0x200000) @@ -2558,7 +2558,7 @@ READ16_MEMBER(namcos23_state::c412_ram_r) WRITE16_MEMBER(namcos23_state::c412_ram_w) { - // logerror("c412_ram_w %06x = %04x (%08x, %08x)\n", offset, data, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + // logerror("c412_ram_w %06x = %04x (%08x, %08x)\n", offset, data, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); if(offset < 0x100000) COMBINE_DATA(m_c412.sdram_a + (offset & 0xfffff)); else if(offset < 0x200000) @@ -2587,7 +2587,7 @@ READ16_MEMBER(namcos23_state::c412_r) return m_c412.status_c; } - logerror("c412_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c412_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); return 0; } @@ -2609,7 +2609,7 @@ WRITE16_MEMBER(namcos23_state::c412_w) m_c412.adr += 2; break; default: - logerror("c412_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c412_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); break; } } @@ -2620,7 +2620,7 @@ WRITE16_MEMBER(namcos23_state::c412_w) READ16_MEMBER(namcos23_state::c421_ram_r) { - // logerror("c421_ram_r %06x (%08x, %08x)\n", offset, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + // logerror("c421_ram_r %06x (%08x, %08x)\n", offset, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); if(offset < 0x40000) return m_c421.dram_a[offset & 0x3ffff]; else if(offset < 0x80000) @@ -2633,7 +2633,7 @@ READ16_MEMBER(namcos23_state::c421_ram_r) WRITE16_MEMBER(namcos23_state::c421_ram_w) { - // logerror("c421_ram_w %06x = %04x (%08x, %08x)\n", offset, data, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + // logerror("c421_ram_w %06x = %04x (%08x, %08x)\n", offset, data, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); if(offset < 0x40000) COMBINE_DATA(m_c421.dram_a + (offset & 0x3ffff)); else if(offset < 0x80000) @@ -2654,7 +2654,7 @@ READ16_MEMBER(namcos23_state::c421_r) return m_c421.adr; } - logerror("c421_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c421_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); return 0; } @@ -2672,7 +2672,7 @@ WRITE16_MEMBER(namcos23_state::c421_w) m_c421.adr = (data & mem_mask) | (m_c421.adr & (0xffffffff ^ mem_mask)); break; default: - logerror("c421_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c421_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); break; } } @@ -2743,7 +2743,7 @@ WRITE16_MEMBER(namcos23_state::c361_w) break; default: - logerror("c361_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c361_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); break; } } @@ -2761,7 +2761,7 @@ READ16_MEMBER(namcos23_state::c361_r) return m_screen->vblank() ? 1 : 0; } - logerror("c361_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("c361_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); return 0xffff; } @@ -2793,11 +2793,11 @@ WRITE16_MEMBER(namcos23_state::ctl_w) case 6: // gmen wars spams this heavily with 0 prior to starting the GMEN board test if(data != 0) - logerror("ctl_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("ctl_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); break; default: - logerror("ctl_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("ctl_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); break; } } @@ -2815,7 +2815,7 @@ READ16_MEMBER(namcos23_state::ctl_r) } } - logerror("ctl_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, space.device().safe_pc(), (unsigned int)space.device().state().state_int(MIPS3_R31)); + logerror("ctl_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, m_maincpu->pc(), (unsigned int)m_maincpu->state_int(MIPS3_R31)); return 0xffff; } diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index ed210008ce4..327f8292da0 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -9518,14 +9518,14 @@ DRIVER_INIT_MEMBER(atomiswave_state,atomiswave) READ64_MEMBER(atomiswave_state::xtrmhnt2_hack_r) { // disable ALL.Net board check - if (space.device().safe_pc() == 0xc03cb30) + if (m_maincpu->pc() == 0xc03cb30) { dc_ram[0x357fe/8] |= (uint64_t)0x200 << 48; dc_ram[0x358e2/8] |= (uint64_t)0x200 << 16; dc_ram[0x38bb2/8] |= (uint64_t)0x200 << 16; dc_ram[0x38bee/8] |= (uint64_t)0x200 << 48; } - if (space.device().safe_pc() == 0xc108240) + if (m_maincpu->pc() == 0xc108240) dc_ram[0x9acc8/8] = (dc_ram[0x9acc8/8] & 0xffffffffffff0000U) | (uint64_t)0x0009; return 0; } diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index 082123d23df..58cb32a4c0e 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -123,8 +123,8 @@ READ8_MEMBER(rmhaihai_state::keyboard_r) { static const char *const keynames[] = { "KEY0", "KEY1" }; - logerror("%04x: keyboard_r\n",space.device().safe_pc()); - switch(space.device().safe_pc()) + logerror("%04x: keyboard_r\n",m_maincpu->pc()); + switch(m_maincpu->pc()) { /* read keyboard */ case 0x0280: @@ -173,7 +173,7 @@ READ8_MEMBER(rmhaihai_state::keyboard_r) WRITE8_MEMBER(rmhaihai_state::keyboard_w) { -logerror("%04x: keyboard_w %02x\n",space.device().safe_pc(),data); +logerror("%04x: keyboard_w %02x\n",m_maincpu->pc(),data); m_keyboard_cmd = data; } diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp index c220eed5371..0c7f4a46939 100644 --- a/src/mame/drivers/witch.cpp +++ b/src/mame/drivers/witch.cpp @@ -450,7 +450,7 @@ READ8_MEMBER(witch_state::prot_read_700x) Otherwise later in game some I/O (controls) reads are skipped. */ - switch(space.device().safe_pc()) + switch(m_subcpu->pc()) { case 0x23f: case 0x246: diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index afc1194e709..bbbb229a2fa 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -1697,7 +1697,7 @@ READ8_MEMBER( x1_state::x1_io_r ) else if(offset >= 0x4000 && offset <= 0xffff) { return m_gfx_bitmap_ram[offset-0x4000+(m_scrn_reg.gfx_bank*0xc000)]; } else { - //logerror("(PC=%06x) Read i/o address %04x\n",space.device().safe_pc(),offset); + //logerror("(PC=%06x) Read i/o address %04x\n",m_maincpu->pc(),offset); } return 0xff; } @@ -1740,7 +1740,7 @@ WRITE8_MEMBER( x1_state::x1_io_w ) else if(offset >= 0x4000 && offset <= 0xffff) { m_gfx_bitmap_ram[offset-0x4000+(m_scrn_reg.gfx_bank*0xc000)] = data; } else { - //logerror("(PC=%06x) Write %02x at i/o address %04x\n",space.device().safe_pc(),data,offset); + //logerror("(PC=%06x) Write %02x at i/o address %04x\n",m_maincpu->pc(),data,offset); } } @@ -1787,7 +1787,7 @@ READ8_MEMBER( x1_state::x1turbo_io_r ) else if(offset >= 0x4000 && offset <= 0xffff) { return m_gfx_bitmap_ram[offset-0x4000+(m_scrn_reg.gfx_bank*0xc000)]; } else { - //logerror("(PC=%06x) Read i/o address %04x\n",space.device().safe_pc(),offset); + //logerror("(PC=%06x) Read i/o address %04x\n",m_maincpu->pc(),offset); } return 0xff; } @@ -1843,7 +1843,7 @@ WRITE8_MEMBER( x1_state::x1turbo_io_w ) else if(offset >= 0x4000 && offset <= 0xffff) { m_gfx_bitmap_ram[offset-0x4000+(m_scrn_reg.gfx_bank*0xc000)] = data; } else { - //logerror("(PC=%06x) Write %02x at i/o address %04x\n",space.device().safe_pc(),data,offset); + //logerror("(PC=%06x) Write %02x at i/o address %04x\n",m_maincpu->pc(),data,offset); } } diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 65645edb7b8..010709f2301 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -829,7 +829,7 @@ WRITE16_MEMBER(x68k_state::x68k_sysport_w) COMBINE_DATA(&m_sysport.sram_writeprotect); break; default: -// logerror("SYS: [%08x] Wrote %04x to invalid or unimplemented system port %04x\n",space.device().safe_pc(),data,offset); +// logerror("SYS: [%08x] Wrote %04x to invalid or unimplemented system port %04x\n",m_maincpu->pc(),data,offset); break; } } diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp index 4757bfbaf6b..815578c6ef3 100644 --- a/src/mame/drivers/xexex.cpp +++ b/src/mame/drivers/xexex.cpp @@ -224,7 +224,7 @@ WRITE16_MEMBER(xexex_state::spriteram_mirror_w) READ16_MEMBER(xexex_state::xexex_waitskip_r) { - if (space.device().safe_pc() == 0x1158) + if (m_maincpu->pc() == 0x1158) { space.device().execute().spin_until_trigger(m_resume_trigger); m_suspension_active = 1; diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index 212c25e53cb..aca0f39192b 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -36,7 +36,7 @@ likewise a 2 screen game WRITE16_MEMBER(xmen_state::eeprom_w) { - logerror("%06x: write %04x to 108000\n",space.device().safe_pc(),data); + logerror("%06x: write %04x to 108000\n", m_maincpu->pc(),data); if (ACCESSING_BITS_0_7) { /* bit 0 = coin counter */ diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index 6b674a975af..24aca691bb6 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -86,7 +86,7 @@ void xyonix_state::handle_coins(int coin) READ8_MEMBER(xyonix_state::io_r) { - int regPC = space.device().safe_pc(); + int regPC = m_maincpu->pc(); if (regPC == 0x27ba) return 0x88; @@ -137,7 +137,7 @@ READ8_MEMBER(xyonix_state::io_r) WRITE8_MEMBER(xyonix_state::io_w) { - //logerror ("xyonix_port_e0_w %02x - PC = %04x\n", data, space.device().safe_pc()); + //logerror ("xyonix_port_e0_w %02x - PC = %04x\n", data, m_maincpu->pc()); m_e0_data = data; } diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp index 30837a49e7e..53a77152b65 100644 --- a/src/mame/drivers/yunsung8.cpp +++ b/src/mame/drivers/yunsung8.cpp @@ -53,7 +53,7 @@ WRITE8_MEMBER(yunsung8_state::bankswitch_w) membank("mainbank")->set_entry(data & 0x07); if (data & ~0x37) - logerror("CPU #0 - PC %04X: Bank %02X\n", space.device().safe_pc(), data); + logerror("CPU #0 - PC %04X: Bank %02X\n", m_maincpu->pc(), data); } READ8_MEMBER(yunsung8_state::sound_command_r) diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index 82057625afe..e6874bfed50 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -1647,7 +1647,7 @@ WRITE16_MEMBER(zn_state::bam2_mcu_w) case 1: m_bam2_mcu_command = data; - logerror("MCU command: %04x (PC %08x)\n", m_bam2_mcu_command, space.device().safe_pc()); + logerror("MCU command: %04x (PC %08x)\n", m_bam2_mcu_command, m_maincpu->pc()); break; } } @@ -1657,11 +1657,11 @@ READ16_MEMBER(zn_state::bam2_mcu_r) switch (offset) { case 0: - logerror("MCU port 0 read @ PC %08x mask %08x\n", space.device().safe_pc(), mem_mask); + logerror("MCU port 0 read @ PC %08x mask %08x\n", m_maincpu->pc(), mem_mask); break; case 2: - logerror("MCU status read @ PC %08x mask %08x\n", space.device().safe_pc(), mem_mask); + logerror("MCU status read @ PC %08x mask %08x\n", m_maincpu->pc(), mem_mask); switch (m_bam2_mcu_command) {