summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-01-02 17:08:29 +0100
committer Olivier Galibert <galibert@pobox.com>2018-01-02 17:48:20 +0100
commit3e1c1842c8be48973643ad747520589a0dc96cc9 (patch)
tree63385af8c0229b70c551c657e3fd041265c9cb84
parent28c582390a80ada2c6db7925dbd1dcfe73b2b389 (diff)
Finish the non-ambiguous ones (nw)
-rw-r--r--src/mame/drivers/atarigt.cpp6
-rw-r--r--src/mame/drivers/atarigx2.cpp10
-rw-r--r--src/mame/drivers/backfire.cpp4
-rw-r--r--src/mame/drivers/calchase.cpp2
-rw-r--r--src/mame/drivers/cobra.cpp16
-rw-r--r--src/mame/drivers/coolridr.cpp4
-rw-r--r--src/mame/drivers/cv1k.cpp2
-rw-r--r--src/mame/drivers/ddragon.cpp16
-rw-r--r--src/mame/drivers/deco_mlc.cpp4
-rw-r--r--src/mame/drivers/fastfred.cpp12
-rw-r--r--src/mame/drivers/ghosteo.cpp6
-rw-r--r--src/mame/drivers/gunbustr.cpp4
-rw-r--r--src/mame/drivers/homedata.cpp14
-rw-r--r--src/mame/drivers/hyprduel.cpp4
-rw-r--r--src/mame/drivers/igs_m027.cpp2
-rw-r--r--src/mame/drivers/itech32.cpp4
-rw-r--r--src/mame/drivers/jaguar.cpp12
-rw-r--r--src/mame/drivers/kickgoal.cpp2
-rw-r--r--src/mame/drivers/liberate.cpp2
-rw-r--r--src/mame/drivers/m92.cpp2
-rw-r--r--src/mame/drivers/macrossp.cpp4
-rw-r--r--src/mame/drivers/mcr.cpp5
-rw-r--r--src/mame/drivers/mcr3.cpp2
-rw-r--r--src/mame/drivers/megadrvb.cpp12
-rw-r--r--src/mame/drivers/midvunit.cpp2
-rw-r--r--src/mame/drivers/midzeus.cpp2
-rw-r--r--src/mame/drivers/mjsenpu.cpp2
-rw-r--r--src/mame/drivers/model1.cpp22
-rw-r--r--src/mame/drivers/model2.cpp4
-rw-r--r--src/mame/drivers/mpu3.cpp4
-rw-r--r--src/mame/drivers/mpu5.cpp8
-rw-r--r--src/mame/drivers/namcofl.cpp2
-rw-r--r--src/mame/drivers/namconb1.cpp6
-rw-r--r--src/mame/drivers/namcos21.cpp4
-rw-r--r--src/mame/drivers/naughtyb.cpp8
-rw-r--r--src/mame/drivers/neogeo.cpp6
-rw-r--r--src/mame/drivers/next.cpp18
-rw-r--r--src/mame/drivers/ninjakd2.cpp2
-rw-r--r--src/mame/drivers/offtwall.cpp4
-rw-r--r--src/mame/drivers/pacman.cpp12
-rw-r--r--src/mame/drivers/pasha2.cpp4
-rw-r--r--src/mame/drivers/pbaction.cpp2
-rw-r--r--src/mame/drivers/pgm2.cpp34
-rw-r--r--src/mame/drivers/playmark.cpp2
-rw-r--r--src/mame/drivers/plygonet.cpp6
-rw-r--r--src/mame/drivers/policetr.cpp4
-rw-r--r--src/mame/drivers/rastersp.cpp6
-rw-r--r--src/mame/drivers/realbrk.cpp2
-rw-r--r--src/mame/drivers/route16.cpp2
-rw-r--r--src/mame/drivers/segaorun.cpp12
-rw-r--r--src/mame/drivers/segas18.cpp4
-rw-r--r--src/mame/drivers/seibuspi.cpp58
-rw-r--r--src/mame/drivers/seta.cpp4
-rw-r--r--src/mame/drivers/seta2.cpp2
-rw-r--r--src/mame/drivers/simpl156.cpp20
-rw-r--r--src/mame/drivers/snesb.cpp6
-rw-r--r--src/mame/drivers/snowbros.cpp2
-rw-r--r--src/mame/drivers/spaceg.cpp4
-rw-r--r--src/mame/drivers/splash.cpp4
-rw-r--r--src/mame/drivers/strnskil.cpp10
-rw-r--r--src/mame/drivers/stv.cpp6
-rw-r--r--src/mame/drivers/suna8.cpp2
-rw-r--r--src/mame/drivers/superchs.cpp8
-rw-r--r--src/mame/drivers/superqix.cpp18
-rw-r--r--src/mame/drivers/suprnova.cpp32
-rw-r--r--src/mame/drivers/system1.cpp10
-rw-r--r--src/mame/drivers/taito_l.cpp8
-rw-r--r--src/mame/drivers/taitoair.cpp4
-rw-r--r--src/mame/drivers/taitojc.cpp8
-rw-r--r--src/mame/drivers/travrusa.cpp2
-rw-r--r--src/mame/drivers/trvmadns.cpp2
-rw-r--r--src/mame/drivers/tumbleb.cpp2
72 files changed, 258 insertions, 289 deletions
diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp
index a86d026b6ef..5d2fd10fad7 100644
--- a/src/mame/drivers/atarigt.cpp
+++ b/src/mame/drivers/atarigt.cpp
@@ -1287,19 +1287,19 @@ ROM_END
WRITE32_MEMBER(atarigt_state::tmek_pf_w)
{
- offs_t pc = space.device().safe_pc();
+ offs_t pc = m_maincpu->pc();
/* protected version */
if (pc == 0x2EB3C || pc == 0x2EB48)
{
- logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", space.device().safe_pc(), 0xd72000 + offset*4, data, mem_mask, (uint32_t)space.device().state().state_int(M68K_A4) - 2);
+ logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", m_maincpu->pc(), 0xd72000 + offset*4, data, mem_mask, (uint32_t)m_maincpu->state_int(M68K_A4) - 2);
/* skip these writes to make more stuff visible */
return;
}
/* unprotected version */
if (pc == 0x25834 || pc == 0x25860)
- logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", space.device().safe_pc(), 0xd72000 + offset*4, data, mem_mask, (uint32_t)space.device().state().state_int(M68K_A3) - 2);
+ logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", m_maincpu->pc(), 0xd72000 + offset*4, data, mem_mask, (uint32_t)m_maincpu->state_int(M68K_A3) - 2);
m_playfield_tilemap->write(space, offset, data, mem_mask);
}
diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp
index ee2bad3564c..c0bce2e4999 100644
--- a/src/mame/drivers/atarigx2.cpp
+++ b/src/mame/drivers/atarigx2.cpp
@@ -142,9 +142,9 @@ WRITE32_MEMBER(atarigx2_state::mo_command_w)
WRITE32_MEMBER(atarigx2_state::atarigx2_protection_w)
{
{
- int pc = space.device().safe_pcbase();
+ int pc = m_maincpu->pcbase();
// if (pc == 0x11cbe || pc == 0x11c30)
-// logerror("%06X:Protection W@%04X = %04X (result to %06X)\n", pc, offset, data, space.device().state().state_int(M68K_A2));
+// logerror("%06X:Protection W@%04X = %04X (result to %06X)\n", pc, offset, data, m_maincpu->state_int(M68K_A2));
// else
if (ACCESSING_BITS_16_31)
logerror("%06X:Protection W@%04X = %04X\n", pc, offset * 4, data >> 16);
@@ -1172,14 +1172,14 @@ READ32_MEMBER(atarigx2_state::atarigx2_protection_r)
result = machine().rand() << 16;
else
result = 0xffff << 16;
- logerror("%06X:Unhandled protection R@%04X = %04X\n", space.device().safe_pcbase(), offset, result);
+ logerror("%06X:Unhandled protection R@%04X = %04X\n", m_maincpu->pcbase(), offset, result);
}
}
if (ACCESSING_BITS_16_31)
- logerror("%06X:Protection R@%04X = %04X\n", space.device().safe_pcbase(), offset * 4, result >> 16);
+ logerror("%06X:Protection R@%04X = %04X\n", m_maincpu->pcbase(), offset * 4, result >> 16);
else
- logerror("%06X:Protection R@%04X = %04X\n", space.device().safe_pcbase(), offset * 4 + 2, result);
+ logerror("%06X:Protection R@%04X = %04X\n", m_maincpu->pcbase(), offset * 4 + 2, result);
return result;
}
diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp
index 6a56f803821..aa7bb631dde 100644
--- a/src/mame/drivers/backfire.cpp
+++ b/src/mame/drivers/backfire.cpp
@@ -704,8 +704,8 @@ READ32_MEMBER(backfire_state::backfire_speedup_r)
{
//osd_printf_debug( "%08x\n",space.device().safe_pc());
- if (space.device() .safe_pc()== 0xce44) space.device().execute().spin_until_time(attotime::from_usec(400)); // backfire
- if (space.device().safe_pc() == 0xcee4) space.device().execute().spin_until_time(attotime::from_usec(400)); // backfirea
+ if (m_maincpu->pc() == 0xce44) m_maincpu->spin_until_time(attotime::from_usec(400)); // backfire
+ if (m_maincpu->pc() == 0xcee4) m_maincpu->spin_until_time(attotime::from_usec(400)); // backfirea
return m_mainram[0x18/4];
}
diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp
index bed7d0ddce3..dc49d6ec13a 100644
--- a/src/mame/drivers/calchase.cpp
+++ b/src/mame/drivers/calchase.cpp
@@ -701,7 +701,7 @@ MACHINE_CONFIG_END
READ32_MEMBER(calchase_state::calchase_idle_skip_r)
{
- if(space.device().safe_pc()==0x1406f48)
+ if(m_maincpu->pc()==0x1406f48)
m_maincpu->spin_until_interrupt();
return m_idle_skip_ram;
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index 7a9d4d6a745..ebee01b8c9f 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -3133,14 +3133,14 @@ WRITE32_MEMBER(cobra_state::gfx_cpu_dc_store)
uint32_t a = (offset / 8) & 0xff;
- fifo_in->push(&space.device(), (uint32_t)(m_gfx_fifo_mem[a+0] >> 32) | i);
- fifo_in->push(&space.device(), (uint32_t)(m_gfx_fifo_mem[a+0] >> 0) | i);
- fifo_in->push(&space.device(), (uint32_t)(m_gfx_fifo_mem[a+1] >> 32) | i);
- fifo_in->push(&space.device(), (uint32_t)(m_gfx_fifo_mem[a+1] >> 0) | i);
- fifo_in->push(&space.device(), (uint32_t)(m_gfx_fifo_mem[a+2] >> 32) | i);
- fifo_in->push(&space.device(), (uint32_t)(m_gfx_fifo_mem[a+2] >> 0) | i);
- fifo_in->push(&space.device(), (uint32_t)(m_gfx_fifo_mem[a+3] >> 32) | i);
- fifo_in->push(&space.device(), (uint32_t)(m_gfx_fifo_mem[a+3] >> 0) | i);
+ fifo_in->push(m_gfxcpu, (uint32_t)(m_gfx_fifo_mem[a+0] >> 32) | i);
+ fifo_in->push(m_gfxcpu, (uint32_t)(m_gfx_fifo_mem[a+0] >> 0) | i);
+ fifo_in->push(m_gfxcpu, (uint32_t)(m_gfx_fifo_mem[a+1] >> 32) | i);
+ fifo_in->push(m_gfxcpu, (uint32_t)(m_gfx_fifo_mem[a+1] >> 0) | i);
+ fifo_in->push(m_gfxcpu, (uint32_t)(m_gfx_fifo_mem[a+2] >> 32) | i);
+ fifo_in->push(m_gfxcpu, (uint32_t)(m_gfx_fifo_mem[a+2] >> 0) | i);
+ fifo_in->push(m_gfxcpu, (uint32_t)(m_gfx_fifo_mem[a+3] >> 32) | i);
+ fifo_in->push(m_gfxcpu, (uint32_t)(m_gfx_fifo_mem[a+3] >> 0) | i);
m_renderer->gfx_fifo_exec();
}
diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp
index 0e55422b88b..a7e2a1c3c24 100644
--- a/src/mame/drivers/coolridr.cpp
+++ b/src/mame/drivers/coolridr.cpp
@@ -3856,7 +3856,7 @@ TODO: both irq routines writes 1 to 0x60d8894, sets up the Watchdog timer then e
*/
READ32_MEMBER(coolridr_state::coolridr_hack2_r)
{
- offs_t pc = downcast<cpu_device *>(&space.device())->pc();
+ offs_t pc = m_maincpu->pc();
if(pc == 0x6002cba || pc == 0x6002d42)
return 0;
@@ -3871,7 +3871,7 @@ READ32_MEMBER(coolridr_state::coolridr_hack2_r)
READ32_MEMBER(coolridr_state::aquastge_hack_r)
{
- offs_t pc = downcast<cpu_device *>(&space.device())->pc();
+ offs_t pc = m_maincpu->pc();
if ((pc == 0x6009e76) || (pc == 0x6009e78))
return 0;
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index 6137a3ada09..f9b326575f4 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -863,7 +863,7 @@ ROM_END
READ64_MEMBER(cv1k_state::speedup_r)
{
- offs_t pc = downcast<cpu_device *>(&space.device())->pc();
+ offs_t pc = m_maincpu->pc();
if (pc == m_idlepc || pc == m_idlepc + 2) m_maincpu->spin_until_time(attotime::from_usec(10));
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index 9aad91084b6..8d2a127dde0 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -199,7 +199,7 @@ WRITE8_MEMBER(toffy_state::toffy_bankswitch_w)
READ8_MEMBER(darktowr_state::darktowr_mcu_bank_r)
{
- // logerror("BankRead %05x %08x\n",space.device().safe_pc(),offset);
+ // logerror("BankRead %05x %08x\n",m_maincpu->pc(),offset);
/* Horrible hack - the alternate TStrike set is mismatched against the MCU,
so just hack around the protection here. (The hacks are 'right' as I have
@@ -208,9 +208,9 @@ READ8_MEMBER(darktowr_state::darktowr_mcu_bank_r)
if (!strcmp(machine().system().name, "tstrike"))
{
/* Static protection checks at boot-up */
- if (space.device().safe_pc() == 0x9ace)
+ if (m_maincpu->pc() == 0x9ace)
return 0;
- if (space.device().safe_pc() == 0x9ae4)
+ if (m_maincpu->pc() == 0x9ae4)
return 0x63;
/* Just return whatever the code is expecting */
@@ -227,7 +227,7 @@ READ8_MEMBER(darktowr_state::darktowr_mcu_bank_r)
WRITE8_MEMBER(darktowr_state::darktowr_mcu_bank_w)
{
- logerror("BankWrite %05x %08x %08x\n", space.device().safe_pc(), offset, data);
+ logerror("BankWrite %05x %08x %08x\n", m_maincpu->pc(), offset, data);
if (offset == 0x1400 || offset == 0)
{
@@ -253,9 +253,9 @@ WRITE8_MEMBER(darktowr_state::darktowr_bankswitch_w)
membank("bank1")->set_entry(newbank);
if (newbank == 4 && oldbank != 4)
- space.install_readwrite_handler(0x4000, 0x7fff, read8_delegate(FUNC(darktowr_state::darktowr_mcu_bank_r),this), write8_delegate(FUNC(darktowr_state::darktowr_mcu_bank_w),this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4000, 0x7fff, read8_delegate(FUNC(darktowr_state::darktowr_mcu_bank_r),this), write8_delegate(FUNC(darktowr_state::darktowr_mcu_bank_w),this));
else if (newbank != 4 && oldbank == 4)
- space.install_readwrite_bank(0x4000, 0x7fff, "bank1");
+ m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x4000, 0x7fff, "bank1");
}
@@ -356,14 +356,14 @@ CUSTOM_INPUT_MEMBER(ddragon_state::subcpu_bus_free)
WRITE8_MEMBER(darktowr_state::mcu_port_a_w)
{
- logerror("McuWrite %05x %08x %08x\n", space.device().safe_pc(), offset, data);
+ logerror("%s: McuWrite %08x %08x\n", machine().describe_context(), offset, data);
m_mcu_port_a_out = data;
}
READ8_MEMBER(ddragon_state::ddragon_hd63701_internal_registers_r)
{
- logerror("%04x: read %d\n", space.device().safe_pc(), offset);
+ logerror("%s: read %d\n", machine().describe_context(), offset);
return 0;
}
diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp
index 3a6051e097b..d9574037d92 100644
--- a/src/mame/drivers/deco_mlc.cpp
+++ b/src/mame/drivers/deco_mlc.cpp
@@ -903,9 +903,9 @@ void deco_mlc_state::descramble_sound( )
READ32_MEMBER(deco_mlc_state::avengrgs_speedup_r)
{
uint32_t a=m_mlc_ram[0x89a0/4];
- uint32_t p=space.device().safe_pc();
+ uint32_t p=m_maincpu->pc();
- if ((p==0x3234 || p==0x32dc) && (a&1)) space.device().execute().spin_until_interrupt();
+ if ((p==0x3234 || p==0x32dc) && (a&1)) m_maincpu->spin_until_interrupt();
return a;
}
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index f1bab673dc1..7c3ff57cf7f 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -37,7 +37,7 @@ void fastfred_state::machine_start()
// to change if a different ROM set ever surfaces.
READ8_MEMBER(fastfred_state::fastfred_custom_io_r)
{
- switch (space.device().safe_pc())
+ switch (m_maincpu->pc())
{
case 0x03c0: return 0x9d;
case 0x03e6: return 0x9f;
@@ -63,13 +63,13 @@ READ8_MEMBER(fastfred_state::fastfred_custom_io_r)
case 0x7b58: return 0x20;
}
- logerror("Uncaught custom I/O read %04X at %04X\n", 0xc800+offset, space.device().safe_pc());
+ logerror("Uncaught custom I/O read %04X at %04X\n", 0xc800+offset, m_maincpu->pc());
return 0x00;
}
READ8_MEMBER(fastfred_state::flyboy_custom1_io_r)
{
- switch (space.device().safe_pc())
+ switch (m_maincpu->pc())
{
case 0x049d: return 0xad; /* compare */
case 0x04b9: /* compare with 0x9e ??? When ??? */
@@ -90,13 +90,13 @@ READ8_MEMBER(fastfred_state::flyboy_custom1_io_r)
return 0x00;
}
- logerror("Uncaught custom I/O read %04X at %04X\n", 0xc085+offset, space.device().safe_pc());
+ logerror("Uncaught custom I/O read %04X at %04X\n", 0xc085+offset, m_maincpu->pc());
return 0x00;
}
READ8_MEMBER(fastfred_state::flyboy_custom2_io_r)
{
- switch (space.device().safe_pc())
+ switch (m_maincpu->pc())
{
case 0x0395: return 0xf7; /* $C900 compare */
case 0x03f5: /* $c8fd */
@@ -114,7 +114,7 @@ READ8_MEMBER(fastfred_state::flyboy_custom2_io_r)
return 0x00;
}
- logerror("Uncaught custom I/O read %04X at %04X\n", 0xc8fb+offset, space.device().safe_pc());
+ logerror("Uncaught custom I/O read %04X at %04X\n", 0xc8fb+offset, m_maincpu->pc());
return 0x00;
}
diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp
index b984c977d1c..841bf26ff73 100644
--- a/src/mame/drivers/ghosteo.cpp
+++ b/src/mame/drivers/ghosteo.cpp
@@ -570,18 +570,18 @@ READ32_MEMBER(ghosteo_state::bballoon_speedup_r)
uint32_t ret = m_s3c2410->s3c24xx_lcd_r(space, offset+0x10/4, mem_mask);
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
// these are vblank waits
if (pc == 0x3001c0e4 || pc == 0x3001c0d8)
{
// BnB Arcade
- space.device().execute().spin_until_time(attotime::from_usec(20));
+ m_maincpu->spin_until_time(attotime::from_usec(20));
}
else if (pc == 0x3002b580 || pc == 0x3002b550)
{
// Happy Tour
- space.device().execute().spin_until_time(attotime::from_usec(20));
+ m_maincpu->spin_until_time(attotime::from_usec(20));
}
//else
// printf("speedup %08x %08x\n", pc, ret);
diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp
index eb683567825..36acfab190f 100644
--- a/src/mame/drivers/gunbustr.cpp
+++ b/src/mame/drivers/gunbustr.cpp
@@ -377,8 +377,8 @@ ROM_END
READ32_MEMBER(gunbustr_state::main_cycle_r)
{
- if (space.device().safe_pc()==0x55a && (m_ram[0x3acc/4]&0xff000000)==0)
- space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x55a && (m_ram[0x3acc/4]&0xff000000)==0)
+ m_maincpu->spin_until_interrupt();
return m_ram[0x3acc/4];
}
diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp
index 0dda7b4c7b5..32909833959 100644
--- a/src/mame/drivers/homedata.cpp
+++ b/src/mame/drivers/homedata.cpp
@@ -386,21 +386,21 @@ READ8_MEMBER(homedata_state::reikaids_io_r)
m_vblank = 0;
- //logerror("%04x: io_r %02x\n", space.device().safe_pc(), res);
+ //logerror("%s: io_r %02x\n", machine().describe_context(), res);
return res;
}
READ8_MEMBER(homedata_state::reikaids_snd_command_r)
{
- //logerror("%04x: sndmcd_r (%02x)\n", space.device().safe_pc(), m_snd_command);
+ //logerror("%s: sndmcd_r (%02x)\n", machine().describe_context(), m_snd_command);
return m_snd_command;
}
WRITE8_MEMBER(homedata_state::reikaids_snd_command_w)
{
m_snd_command = data;
- //logerror("%04x: coprocessor_command_w %02x\n", space.device().safe_pc(), data);
+ //logerror("%s: coprocessor_command_w %02x\n", machine().describe_context(), data);
}
@@ -414,13 +414,13 @@ WRITE8_MEMBER(homedata_state::reikaids_snd_command_w)
WRITE8_MEMBER(homedata_state::pteacher_snd_command_w)
{
- //logerror("%04x: snd_command_w %02x\n", space.device().safe_pc(), data);
+ //logerror("%s: snd_command_w %02x\n", machine().describe_context(), data);
m_from_cpu = data;
}
READ8_MEMBER(homedata_state::pteacher_snd_r)
{
- //logerror("%04x: pteacher_snd_r %02x\n",space.device().safe_pc(),to_cpu);
+ //logerror("%s: pteacher_snd_r %02x\n",machine().describe_context(),to_cpu);
return m_to_cpu;
}
@@ -446,7 +446,7 @@ READ8_MEMBER(homedata_state::pteacher_keyboard_r)
static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5" };
int dips = ioport("DSW")->read();
- // logerror("%04x: keyboard_r with port A = %02x\n",space.device().safe_pc(),upd7807_porta);
+ // logerror("%s: keyboard_r with port A = %02x\n",machine().describe_context(),upd7807_porta);
if (m_upd7807_porta & 0x80)
{
@@ -469,7 +469,7 @@ READ8_MEMBER(homedata_state::pteacher_upd7807_porta_r)
if (!BIT(m_upd7807_portc, 6))
m_upd7807_porta = m_from_cpu;
else
- logerror("%04x: read PA with PC *not* clear\n", space.device().safe_pc());
+ logerror("%s: read PA with PC *not* clear\n", machine().describe_context());
return m_upd7807_porta;
}
diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp
index 19793955be1..2af30868d07 100644
--- a/src/mame/drivers/hyprduel.cpp
+++ b/src/mame/drivers/hyprduel.cpp
@@ -150,7 +150,7 @@ WRITE16_MEMBER(hyprduel_state::hyprduel_cpusync_trigger1_w)
{
if (!m_cpu_trigger && !m_subcpu_resetline)
{
- space.device().execute().spin_until_trigger(1001);
+ m_maincpu->spin_until_trigger(1001);
m_cpu_trigger = 1001;
}
}
@@ -176,7 +176,7 @@ WRITE16_MEMBER(hyprduel_state::hyprduel_cpusync_trigger2_w)
{
if (!m_cpu_trigger && !m_subcpu_resetline)
{
- space.device().execute().spin_until_trigger(1002);
+ m_maincpu->spin_until_trigger(1002);
m_cpu_trigger = 1002;
}
}
diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp
index d3932cfb485..195d3fd8cc4 100644
--- a/src/mame/drivers/igs_m027.cpp
+++ b/src/mame/drivers/igs_m027.cpp
@@ -88,7 +88,7 @@ WRITE32_MEMBER(igs_m027_state::igs_cg_videoram_w)
{
COMBINE_DATA(&m_igs_cg_videoram[offset]);
//if(data!=0)
- logerror("PC(%08X) CG @%x = %x!\n",space.device().safe_pc(),offset ,m_igs_cg_videoram[offset]);
+ logerror("PC(%08X) CG @%x = %x!\n",m_maincpu->pc(),offset ,m_igs_cg_videoram[offset]);
/*
ROM:08020520 DCW 0x3E ddd1 y
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index 3445e0b8687..0751f2a2ba0 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -842,14 +842,14 @@ WRITE32_MEMBER(itech32_state::tms2_trigger_w)
READ32_MEMBER(itech32_state::drivedge_tms1_speedup_r)
{
- if (m_tms1_ram[0x382] == 0 && space.device().safe_pc() == 0xee) START_TMS_SPINNING(0);
+ if (m_tms1_ram[0x382] == 0 && m_dsp1->pc() == 0xee) START_TMS_SPINNING(0);
return m_tms1_ram[0x382];
}
READ32_MEMBER(itech32_state::drivedge_tms2_speedup_r)
{
- if (m_tms2_ram[0x382] == 0 && space.device().safe_pc() == 0x809808) START_TMS_SPINNING(1);
+ if (m_tms2_ram[0x382] == 0 && m_dsp2->pc() == 0x809808) START_TMS_SPINNING(1);
return m_tms2_ram[0x382];
}
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index 3e471e2f486..db5d957218f 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -858,7 +858,7 @@ WRITE32_MEMBER(jaguar_state::gpu_jump_w)
{
/* update the data in memory */
COMBINE_DATA(m_gpu_jump_address);
- logerror("%08X:GPU jump address = %08X\n", space.device().safe_pcbase(), *m_gpu_jump_address);
+ logerror("%08X:GPU jump address = %08X\n", m_gpu->pcbase(), *m_gpu_jump_address);
/* if the GPU is suspended, release it now */
gpu_resume();
@@ -873,7 +873,7 @@ READ32_MEMBER(jaguar_state::gpu_jump_r)
{
/* if the current GPU command is just pointing back to the spin loop, and */
/* we're reading it from the spin loop, we can optimize */
- if (*m_gpu_jump_address == m_gpu_spin_pc && space.device().safe_pcbase() == m_gpu_spin_pc)
+ if (*m_gpu_jump_address == m_gpu_spin_pc && m_gpu->pcbase() == m_gpu_spin_pc)
{
#if ENABLE_SPEEDUP_HACKS
/* spin if we're allowed */
@@ -920,7 +920,7 @@ READ32_MEMBER(jaguar_state::cojagr3k_main_speedup_r)
/* increment the count; if we hit 5, we can spin until an interrupt comes */
if (m_main_speedup_hits++ > 5)
{
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
m_main_speedup_hits = 0;
}
}
@@ -961,7 +961,7 @@ READ32_MEMBER(jaguar_state::cojagr3k_main_speedup_r)
READ32_MEMBER(jaguar_state::main_gpu_wait_r)
{
if (m_gpu_command_pending)
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
return *m_main_gpu_wait;
}
@@ -997,7 +997,7 @@ WRITE32_MEMBER(jaguar_state::area51_main_speedup_w)
/* increment the count; if we hit 5, we can spin until an interrupt comes */
if (m_main_speedup_hits++ > 5)
{
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
m_main_speedup_hits = 0;
}
}
@@ -1031,7 +1031,7 @@ WRITE32_MEMBER(jaguar_state::area51mx_main_speedup_w)
/* increment the count; if we hit 5, we can spin until an interrupt comes */
if (m_main_speedup_hits++ > 10)
{
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
m_main_speedup_hits = 0;
}
}
diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp
index c6da4e43fd3..e41012c22fd 100644
--- a/src/mame/drivers/kickgoal.cpp
+++ b/src/mame/drivers/kickgoal.cpp
@@ -159,7 +159,7 @@ WRITE16_MEMBER(kickgoal_state::kickgoal_snd_w)
{
if (ACCESSING_BITS_0_7)
{
- logerror("PC:%06x Writing %04x to Sound CPU\n",space.device().safe_pcbase(),data);
+ logerror("PC:%06x Writing %04x to Sound CPU\n",m_maincpu->pcbase(),data);
if (data >= 0x40) {
if (data == 0xfe) {
m_oki->write(0,0x40); /* Stop playing the melody */
diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp
index b0c04d55813..e145193338c 100644
--- a/src/mame/drivers/liberate.cpp
+++ b/src/mame/drivers/liberate.cpp
@@ -68,7 +68,7 @@ READ8_MEMBER(liberate_state::deco16_io_r)
if (offset == 3) return ioport("DSW1")->read(); /* Dip 1 */
if (offset == 4) return ioport("DSW2")->read(); /* Dip 2 */
- logerror("%04x: Read input %d\n", space.device().safe_pc(), offset);
+ logerror("%04x: Read input %d\n", m_maincpu->pc(), offset);
return 0xff;
}
diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp
index efef6ad81e6..51315e3e4bb 100644
--- a/src/mame/drivers/m92.cpp
+++ b/src/mame/drivers/m92.cpp
@@ -290,7 +290,7 @@ WRITE16_MEMBER(m92_state::m92_bankswitch_w)
{
membank("bank1")->set_entry((data & 0x06) >> 1);
if (data & 0xf9)
- logerror("%05x: bankswitch %04x\n", space.device().safe_pc(), data);
+ logerror("%05x: bankswitch %04x\n", m_maincpu->pc(), data);
}
}
diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp
index 43f14f975eb..a144ebe0c85 100644
--- a/src/mame/drivers/macrossp.cpp
+++ b/src/mame/drivers/macrossp.cpp
@@ -699,14 +699,14 @@ PC :00018110 018110: beq 18104
*/
COMBINE_DATA(&m_mainram[0x10158 / 4]);
- if (space.device().safe_pc() == 0x001810A) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc() == 0x001810A) m_maincpu->spin_until_interrupt();
}
#ifdef UNUSED_FUNCTION
WRITE32_MEMBER(macrossp_state::quizmoon_speedup_w)
{
COMBINE_DATA(&m_mainram[0x00020 / 4]);
- if (space.device().safe_pc() == 0x1cc) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc() == 0x1cc) m_maincpu->spin_until_interrupt();
}
#endif
diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp
index 82f84d63555..2b9954067d0 100644
--- a/src/mame/drivers/mcr.cpp
+++ b/src/mame/drivers/mcr.cpp
@@ -636,17 +636,12 @@ READ8_MEMBER(mcr_nflfoot_state::ip2_r)
{
/* bit 7 = J3-2 on IPU board = TXDA on SIO */
uint8_t val = m_ipu_sio_txda << 7;
-
- if (space.device().safe_pc() != 0x107)
- logerror("%04X:ip2_r = %02X\n", space.device().safe_pc(), val);
return val;
}
WRITE8_MEMBER(mcr_nflfoot_state::op4_w)
{
- logerror("%04X:op4_w(%d%d%d)\n", space.device().safe_pc(), (data >> 7) & 1, (data >> 6) & 1, (data >> 5) & 1);
-
/* bit 7 = J3-7 on IPU board = /RXDA on SIO */
m_ipu_sio->rxa_w(!((data >> 7) & 1));
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index eaad27a6c34..3715e42db61 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -466,7 +466,7 @@ READ8_MEMBER(mcr3_state::turbotag_kludge_r)
/* Unfortunately, the game refuses to start if any bad ROM is */
/* found; to work around this, we catch the checksum byte read */
/* and modify it to what we know we will be getting. */
- if (space.device().safe_pcbase() == 0xb29)
+ if (m_maincpu->pcbase() == 0xb29)
return 0x82;
else
return 0x92;
diff --git a/src/mame/drivers/megadrvb.cpp b/src/mame/drivers/megadrvb.cpp
index 4fe74109388..d94bd7b55dd 100644
--- a/src/mame/drivers/megadrvb.cpp
+++ b/src/mame/drivers/megadrvb.cpp
@@ -305,12 +305,12 @@ WRITE16_MEMBER(md_boot_state::aladmdb_w )
- aladmdb_w : 1b2d18 - data = aa00 (only once on reset)
- aladmdb_w : 1b2d42 - data = 0000 (only once on reset)
*/
- logerror("aladmdb_w : %06x - data = %04x\n",space.device().safe_pc(),data);
+ logerror("aladmdb_w : %06x - data = %04x\n",m_maincpu->pc(),data);
}
READ16_MEMBER(md_boot_state::aladmdb_r )
{
- if (space.device().safe_pc()==0x1b2a56)
+ if (m_maincpu->pc()==0x1b2a56)
{
m_aladmdb_mcu_port = ioport("MCU")->read();
@@ -319,11 +319,11 @@ READ16_MEMBER(md_boot_state::aladmdb_r )
else
return (0x100); //MCU status, needed if you fall into a pitfall
}
- if (space.device().safe_pc()==0x1b2a72) return 0x0000;
- if (space.device().safe_pc()==0x1b2d24) return (ioport("MCU")->read() & 0x00f0) | 0x1200; // difficulty
- if (space.device().safe_pc()==0x1b2d4e) return 0x0000;
+ if (m_maincpu->pc()==0x1b2a72) return 0x0000;
+ if (m_maincpu->pc()==0x1b2d24) return (ioport("MCU")->read() & 0x00f0) | 0x1200; // difficulty
+ if (m_maincpu->pc()==0x1b2d4e) return 0x0000;
- logerror("aladbl_r : %06x\n",space.device().safe_pc());
+ logerror("aladbl_r : %06x\n",m_maincpu->pc());
return 0x0000;
}
diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp
index 11bbc541f6c..641fbf45aa6 100644
--- a/src/mame/drivers/midvunit.cpp
+++ b/src/mame/drivers/midvunit.cpp
@@ -1856,7 +1856,7 @@ ROM_END
READ32_MEMBER(midvunit_state::generic_speedup_r)
{
- space.device().execute().eat_cycles(100);
+ m_maincpu->eat_cycles(100);
return m_generic_speedup[offset];
}
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index d440645a788..8304444d711 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -391,7 +391,7 @@ WRITE32_MEMBER(midzeus_state::disk_asic_jr_w)
/* unknown purpose */
default:
//if (oldval ^ data)
- logerror("%06X:disk_asic_jr_w(%X) = %X\n", space.device().safe_pc(), offset, data);
+ logerror("%06X:disk_asic_jr_w(%X) = %X\n", m_maincpu->pc(), offset, data);
break;
}
diff --git a/src/mame/drivers/mjsenpu.cpp b/src/mame/drivers/mjsenpu.cpp
index c8bd3515590..091b0a1f02b 100644
--- a/src/mame/drivers/mjsenpu.cpp
+++ b/src/mame/drivers/mjsenpu.cpp
@@ -504,7 +504,7 @@ READ32_MEMBER(mjsenpu_state::mjsenpu_speedup_r)
if (pc == 0xadb8)
{
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
else
{
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index 4162c8e4ee9..9ac1407f6d8 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -812,7 +812,7 @@ WRITE16_MEMBER(model1_state::md1_w)
//if(0 && offset)
// return;
if(true && m_dump)
- logerror("TGP: md1_w %x, %04x @ %04x (%x)\n", offset, data, mem_mask, space.device().safe_pc());
+ logerror("TGP: md1_w %x, %04x @ %04x (%x)\n", offset, data, mem_mask, m_maincpu->pc());
}
WRITE16_MEMBER(model1_state::md0_w)
@@ -822,7 +822,7 @@ WRITE16_MEMBER(model1_state::md0_w)
//if(0 && offset)
// return;
if(true && m_dump)
- logerror("TGP: md0_w %x, %04x @ %04x (%x)\n", offset, data, mem_mask, space.device().safe_pc());
+ logerror("TGP: md0_w %x, %04x @ %04x (%x)\n", offset, data, mem_mask, m_maincpu->pc());
}
WRITE16_MEMBER(model1_state::p_w)
@@ -830,14 +830,14 @@ WRITE16_MEMBER(model1_state::p_w)
uint16_t old = m_paletteram16[offset];
m_palette->write(space, offset, data, mem_mask);
if(0 && m_paletteram16[offset] != old)
- logerror("XVIDEO: p_w %x, %04x @ %04x (%x)\n", offset, data, mem_mask, space.device().safe_pc());
+ logerror("XVIDEO: p_w %x, %04x @ %04x (%x)\n", offset, data, mem_mask, m_maincpu->pc());
}
WRITE16_MEMBER(model1_state::mr_w)
{
COMBINE_DATA(m_mr+offset);
if(0 && offset == 0x1138/2)
- logerror("MR.w %x, %04x @ %04x (%x)\n", offset*2+0x500000, data, mem_mask, space.device().safe_pc());
+ logerror("MR.w %x, %04x @ %04x (%x)\n", offset*2+0x500000, data, mem_mask, m_maincpu->pc());
}
WRITE16_MEMBER(model1_state::mr2_w)
@@ -845,23 +845,23 @@ WRITE16_MEMBER(model1_state::mr2_w)
COMBINE_DATA(m_mr2+offset);
#if 0
if(0 && offset == 0x6e8/2) {
- logerror("MR.w %x, %04x @ %04x (%x)\n", offset*2+0x400000, data, mem_mask, space.device().safe_pc());
+ logerror("MR.w %x, %04x @ %04x (%x)\n", offset*2+0x400000, data, mem_mask, m_maincpu->pc());
}
if(offset/2 == 0x3680/4)
- logerror("MW f80[r25], %04x%04x (%x)\n", m_mr2[0x3680/2+1], m_mr2[0x3680/2], space.device().safe_pc());
+ logerror("MW f80[r25], %04x%04x (%x)\n", m_mr2[0x3680/2+1], m_mr2[0x3680/2], m_maincpu->pc());
if(offset/2 == 0x06ca/4)
- logerror("MW fca[r19], %04x%04x (%x)\n", m_mr2[0x06ca/2+1], m_mr2[0x06ca/2], space.device().safe_pc());
+ logerror("MW fca[r19], %04x%04x (%x)\n", m_mr2[0x06ca/2+1], m_mr2[0x06ca/2], m_maincpu->pc());
if(offset/2 == 0x1eca/4)
- logerror("MW fca[r22], %04x%04x (%x)\n", m_mr2[0x1eca/2+1], m_mr2[0x1eca/2], space.device().safe_pc());
+ logerror("MW fca[r22], %04x%04x (%x)\n", m_mr2[0x1eca/2+1], m_mr2[0x1eca/2], m_maincpu->pc());
#endif
// wingwar scene position, pc=e1ce -> d735
if(offset/2 == 0x1f08/4)
- logerror("MW 8[r10], %f (%x)\n", *(float *)(m_mr2+0x1f08/2), space.device().safe_pc());
+ logerror("MW 8[r10], %f (%x)\n", *(float *)(m_mr2+0x1f08/2), m_maincpu->pc());
if(offset/2 == 0x1f0c/4)
- logerror("MW c[r10], %f (%x)\n", *(float *)(m_mr2+0x1f0c/2), space.device().safe_pc());
+ logerror("MW c[r10], %f (%x)\n", *(float *)(m_mr2+0x1f0c/2), m_maincpu->pc());
if(offset/2 == 0x1f10/4)
- logerror("MW 10[r10], %f (%x)\n", *(float *)(m_mr2+0x1f10/2), space.device().safe_pc());
+ logerror("MW 10[r10], %f (%x)\n", *(float *)(m_mr2+0x1f10/2), m_maincpu->pc());
}
static ADDRESS_MAP_START( model1_mem, AS_PROGRAM, 16, model1_state )
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index e9ad7f6f2cd..49e685b917e 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -1343,7 +1343,7 @@ READ32_MEMBER(model2_state::model2_5881prot_r)
retval <<= 16;
}
}
- else logerror("Unhandled Protection READ @ %x mask %x (PC=%x)\n", offset, mem_mask, space.device().safe_pc());
+ else logerror("Unhandled Protection READ @ %x mask %x (PC=%x)\n", offset, mem_mask, m_maincpu->pc());
logerror("model2_5881prot_r %08x: %08x (%08x)\n", offset*4, retval, mem_mask);
@@ -1374,7 +1374,7 @@ WRITE32_MEMBER(model2_state::model2_5881prot_w)
printf("subkey %08x (%08x)\n", data, mem_mask);
m_cryptdevice->set_subkey(data&0xffff);
}
- else printf("Unhandled Protection WRITE %x @ %x mask %x (PC=%x)\n", data, offset, mem_mask, space.device().safe_pc());
+ else printf("Unhandled Protection WRITE %x @ %x mask %x (PC=%x)\n", data, offset, mem_mask, m_maincpu->pc());
}
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index 3fc3dd5b8c6..48cf8dbdd00 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -757,7 +757,7 @@ WRITE8_MEMBER(mpu3_state::characteriser_w)
int x;
int call=data;
if (!m_current_chr_table)
- fatalerror("No Characteriser Table @ %04x\n", space.device().safe_pcbase());
+ fatalerror("No Characteriser Table @ %04x\n", m_maincpu->pcbase());
if (offset == 0)
{
@@ -785,7 +785,7 @@ WRITE8_MEMBER(mpu3_state::characteriser_w)
READ8_MEMBER(mpu3_state::characteriser_r)
{
if (!m_current_chr_table)
- fatalerror("No Characteriser Table @ %04x\n", space.device().safe_pcbase());
+ fatalerror("No Characteriser Table @ %04x\n", m_maincpu->pcbase());
if (offset == 0)
{
diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp
index 5f7a6cb3342..3982b74e42c 100644
--- a/src/mame/drivers/mpu5.cpp
+++ b/src/mame/drivers/mpu5.cpp
@@ -260,7 +260,7 @@ READ8_MEMBER(mpu5_state::asic_r8)
}
default:
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
logerror("%08x maincpu read from ASIC - offset %01x\n", pc, offset);
return 0;
}
@@ -396,7 +396,7 @@ WRITE8_MEMBER(mpu5_state::asic_w8)
break;
default:
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
logerror("%08x maincpu write to ASIC - offset %01x data %02x\n", pc, offset, data);
}
}
@@ -414,7 +414,7 @@ WRITE32_MEMBER(mpu5_state::asic_w32)
READ32_MEMBER(mpu5_state::pic_r)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
logerror("%08x maincpu read from PIC - offset %01x\n", pc, offset);
return m_pic_output_bit;
}
@@ -466,7 +466,7 @@ WRITE32_MEMBER(mpu5_state::pic_w)
}
default:
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
logerror("%08x maincpu write to PIC - offset %01x data %02x\n", pc, offset, data);
break;
}
diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp
index a9a55657cca..50c4406811e 100644
--- a/src/mame/drivers/namcofl.cpp
+++ b/src/mame/drivers/namcofl.cpp
@@ -252,7 +252,7 @@ WRITE16_MEMBER(namcofl_state::mcu_shared_w)
// C75 BIOS has a very short window on the CPU sync signal, so immediately let the i960 at it
if ((offset == 0x6000/2) && (data & 0x80))
{
- space.device().execute().yield();
+ m_mcu->yield();
}
}
diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp
index 5ee565bb8ad..7bd3139cabb 100644
--- a/src/mame/drivers/namconb1.cpp
+++ b/src/mame/drivers/namconb1.cpp
@@ -540,7 +540,7 @@ READ8_MEMBER(namconb1_state::namconb2_cpureg_r)
if (ENABLE_LOGGING)
{
if (offset != 0x14)
- logerror("Unhandled CPU reg read from [0x%.2x] (PC=0x%x)\n", offset, space.device().safe_pc());
+ logerror("Unhandled CPU reg read from [0x%.2x] (PC=0x%x)\n", offset, m_maincpu->pc());
}
return 0xff;
@@ -728,7 +728,7 @@ static ADDRESS_MAP_START( namconb2_am, AS_PROGRAM, 32, namconb1_state )
AM_RANGE(0x980000, 0x98000f) AM_READWRITE16(c169_roz_bank_r,c169_roz_bank_w,0xffffffff)
AM_RANGE(0xa00000, 0xa007ff) AM_DEVREADWRITE8("eeprom", eeprom_parallel_28xx_device, read, write, 0xffffffff)
AM_RANGE(0xc00000, 0xc0001f) AM_READ(custom_key_r) AM_WRITENOP
- AM_RANGE(0xf00000, 0xf0001f) AM_READWRITE8(namconb1_cpureg_r, namconb2_cpureg_w, 0xffffffff)
+ AM_RANGE(0xf00000, 0xf0001f) AM_READWRITE8(namconb2_cpureg_r, namconb2_cpureg_w, 0xffffffff)
ADDRESS_MAP_END
WRITE16_MEMBER(namconb1_state::mcu_shared_w)
@@ -748,7 +748,7 @@ WRITE16_MEMBER(namconb1_state::mcu_shared_w)
// C74 BIOS has a very short window on the CPU sync signal, so immediately let the '020 at it
if ((offset == 0x6000/2) && (data & 0x80))
{
- space.device().execute().spin_until_time(downcast<cpu_device *>(&space.device())->cycles_to_attotime(300)); // was 300
+ m_mcu->spin_until_time(m_mcu->cycles_to_attotime(300)); // was 300
}
}
diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp
index 6b0478d5ec8..5113a2b6de7 100644
--- a/src/mame/drivers/namcos21.cpp
+++ b/src/mame/drivers/namcos21.cpp
@@ -594,7 +594,7 @@ READ16_MEMBER(namcos21_state::dspcuskey_r)
}
else if( m_gametype == NAMCOS21_AIRCOMBAT )
{
- switch( space.device().safe_pc() )
+ switch( m_dspmaster->pc() )
{
case 0x8062: result = 0xfeb9; break;
case 0x806a: result = 0xffff; break;
@@ -1093,7 +1093,7 @@ WRITE16_MEMBER(namcos21_state::slave_port3_w)
WRITE16_MEMBER(namcos21_state::slave_XF_output_w)
{
- if (ENABLE_LOGGING) logerror( "0x%x:slaveXF(%d)\n", space.device().safe_pc(), data );
+ if (ENABLE_LOGGING) logerror( "%s :slaveXF(%d)\n", machine().describe_context(), data );
}
READ16_MEMBER(namcos21_state::slave_portf_r)
diff --git a/src/mame/drivers/naughtyb.cpp b/src/mame/drivers/naughtyb.cpp
index 7f2145e5f66..72d9277a707 100644
--- a/src/mame/drivers/naughtyb.cpp
+++ b/src/mame/drivers/naughtyb.cpp
@@ -159,16 +159,16 @@ READ8_MEMBER(naughtyb_state::popflame_protection_r)/* Not used by bootleg/hack *
return seed00[m_prot_count] | seedxx;
#if 0
- if ( space.device().safe_pc() == (0x26F2 + 0x03) )
+ if ( m_maincpu->pc() == (0x26F2 + 0x03) )
{
popflame_prot_count = 0;
return 0x01;
} /* Must not carry when rotated left */
- if ( space.device().safe_pc() == (0x26F9 + 0x03) )
+ if ( m_maincpu->pc() == (0x26F9 + 0x03) )
return 0x80; /* Must carry when rotated left */
- if ( space.device().safe_pc() == (0x270F + 0x03) )
+ if ( m_maincpu->pc() == (0x270F + 0x03) )
{
switch( popflame_prot_count++ )
{
@@ -178,7 +178,7 @@ READ8_MEMBER(naughtyb_state::popflame_protection_r)/* Not used by bootleg/hack *
case 3: return 0x38; /* x011 1xxx, matches 0x07 at $2693, stored in $400D */
}
}
- logerror("CPU #0 PC %06x: unmapped protection read\n", space.device().safe_pc());
+ logerror("CPU #0 PC %06x: unmapped protection read\n", m_maincpu->pc());
return 0x00;
#endif
}
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index 334d857cd80..fd00212fe24 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -869,14 +869,14 @@ WRITE16_MEMBER(neogeo_state::write_banksel)
uint32_t len = (!m_slots[m_curr_slot] || m_slots[m_curr_slot]->get_rom_size() == 0) ? m_region_maincpu->bytes() : m_slots[m_curr_slot]->get_rom_size();
if ((len <= 0x100000) && (data & 0x07))
- logerror("PC %06x: warning: bankswitch to %02x but no banks available\n", space.device().safe_pc(), data);
+ logerror("PC %06x: warning: bankswitch to %02x but no banks available\n", m_maincpu->pc(), data);
else
{
int bank = data & 0x07;
if ((bank + 1) * 0x100000 >= len)
{
- logerror("PC %06x: warning: bankswitch to empty bank %02x\n", space.device().safe_pc(), data);
+ logerror("PC %06x: warning: bankswitch to empty bank %02x\n", m_maincpu->pc(), data);
bank = 0;
}
uint8_t *ROM = (!m_slots[m_curr_slot] || m_slots[m_curr_slot]->get_rom_size() == 0) ? m_region_maincpu->base() : (uint8_t *)m_slots[m_curr_slot]->get_rom_base();
@@ -985,7 +985,7 @@ WRITE16_MEMBER(neogeo_state::write_bankprot_kf2k3bl)
WRITE16_MEMBER(neogeo_state::write_bankprot_ms5p)
{
- logerror("ms5plus bankswitch - offset: %06x PC %06x: set banking %04x\n", offset, space.device().safe_pc(), data);
+ logerror("ms5plus bankswitch - offset: %06x PC %06x: set banking %04x\n", offset, m_maincpu->pc(), data);
if ((offset == 0) && (data == 0xa0))
{
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index b8385285167..f9c0e7c5b89 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -81,24 +81,6 @@ uint32_t next_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
return 0;
}
-/* Dummy catcher for any unknown r/w */
-READ8_MEMBER( next_state::io_r )
-{
- if(!machine().side_effect_disabled())
- printf("io_r %08x (%08x)\n",offset+0x02000000, space.device().safe_pc());
-
- if(offset == 0xc0)
- return 0;
-
- return 0xff;
-}
-
-WRITE8_MEMBER( next_state::io_w )
-{
- if(!machine().side_effect_disabled())
- printf("io_w %08x, %02x (%08x)\n",offset+0x02000000,data, space.device().safe_pc());
-}
-
/* map ROM at 0x01000000-0x0101ffff? */
READ32_MEMBER( next_state::rom_map_r )
{
diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp
index 417d6f5d812..7c65e1ea141 100644
--- a/src/mame/drivers/ninjakd2.cpp
+++ b/src/mame/drivers/ninjakd2.cpp
@@ -1658,7 +1658,7 @@ DRIVER_INIT_MEMBER(ninjakd2_state,mnight)
READ8_MEMBER(ninjakd2_state::robokid_motion_error_verbose_r)
{
popmessage("%s MOTION ERROR, contact MAMEdev", machine().system().name);
- logerror("maincpu %04x MOTION ERROR\n", space.device().safe_pc());
+ logerror("maincpu %04x MOTION ERROR\n", m_maincpu->pc());
return 0xe6;
}
diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp
index 8f681000347..463034b3090 100644
--- a/src/mame/drivers/offtwall.cpp
+++ b/src/mame/drivers/offtwall.cpp
@@ -166,7 +166,7 @@ READ16_MEMBER(offtwall_state::bankrom_r)
READ16_MEMBER(offtwall_state::spritecache_count_r)
{
- int prevpc = space.device().safe_pcbase();
+ int prevpc = m_maincpu->pcbase();
/* if this read is coming from $99f8 or $9992, it's in the sprite copy loop */
if (prevpc == 0x99f8 || prevpc == 0x9992)
@@ -220,7 +220,7 @@ READ16_MEMBER(offtwall_state::spritecache_count_r)
READ16_MEMBER(offtwall_state::unknown_verify_r)
{
- int prevpc = space.device().safe_pcbase();
+ int prevpc = m_maincpu->pcbase();
if (prevpc < 0x5c5e || prevpc > 0xc432)
return m_unknown_verify_base[offset];
else
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index 7b8d993c29d..4e376f3b777 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -578,7 +578,7 @@ READ8_MEMBER(pacman_state::alibaba_mystery_2_r)
READ8_MEMBER(pacman_state::maketrax_special_port2_r)
{
int data = ioport("DSW1")->read();
- int pc = space.device().safe_pcbase();
+ int pc = m_maincpu->pcbase();
if ((pc == 0x1973) || (pc == 0x2389)) return data | 0x40;
@@ -598,7 +598,7 @@ READ8_MEMBER(pacman_state::maketrax_special_port2_r)
READ8_MEMBER(pacman_state::maketrax_special_port3_r)
{
- int pc = space.device().safe_pcbase();
+ int pc = m_maincpu->pcbase();
if (pc == 0x040e) return 0x20;
@@ -620,7 +620,7 @@ READ8_MEMBER(pacman_state::maketrax_special_port3_r)
READ8_MEMBER(pacman_state::korosuke_special_port2_r)
{
int data = ioport("DSW1")->read();
- int pc = space.device().safe_pcbase();
+ int pc = m_maincpu->pcbase();
if ((pc == 0x196e) || (pc == 0x2387)) return data | 0x40;
@@ -640,7 +640,7 @@ READ8_MEMBER(pacman_state::korosuke_special_port2_r)
READ8_MEMBER(pacman_state::korosuke_special_port3_r)
{
- int pc = space.device().safe_pcbase();
+ int pc = m_maincpu->pcbase();
if (pc == 0x0445) return 0x20;
@@ -7195,7 +7195,7 @@ READ8_MEMBER(pacman_state::cannonbp_protection_r)
switch (offset)
{
default:
- logerror("CPU0 %04x: Unhandled protection read, offset %04x\n", space.device().safe_pc(), offset);
+ logerror("CPU0 %04x: Unhandled protection read, offset %04x\n", m_maincpu->pc(), offset);
return 0x00;
case 0x0000: // unknown
@@ -7218,7 +7218,7 @@ READ8_MEMBER(pacman_state::cannonbp_protection_r)
m_cannonb_bit_to_read = 7;
return 0x00;
case 0x0001: // affects the ball hitting the blocks as well as jump address after bonus round
- if (space.device().safe_pc() == 0x2b97)
+ if (m_maincpu->pc() == 0x2b97)
return (BIT(0x46, m_cannonb_bit_to_read--) << 7);
else
return 0xff; /* value taken from the bootlegs */
diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp
index cc5004bb52c..6a439e18c91 100644
--- a/src/mame/drivers/pasha2.cpp
+++ b/src/mame/drivers/pasha2.cpp
@@ -473,8 +473,8 @@ ROM_END
READ16_MEMBER(pasha2_state::pasha2_speedup_r)
{
- if(space.device().safe_pc() == 0x8302)
- space.device().execute().spin_until_interrupt();
+ if(m_maincpu->pc() == 0x8302)
+ m_maincpu->spin_until_interrupt();
return m_wram[(0x95744 / 2) + offset];
}
diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp
index 20e3944aff3..d163c427e6e 100644
--- a/src/mame/drivers/pbaction.cpp
+++ b/src/mame/drivers/pbaction.cpp
@@ -480,7 +480,7 @@ ROM_END
READ8_MEMBER(pbaction_state::pbactio3_prot_kludge_r)
{
/* on startup, the game expect this location to NOT act as RAM */
- if (space.device().safe_pc() == 0xab80)
+ if (m_maincpu->pc() == 0xab80)
return 0;
return m_work_ram[0];
diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp
index 3ff308bd93d..76fcb24e60f 100644
--- a/src/mame/drivers/pgm2.cpp
+++ b/src/mame/drivers/pgm2.cpp
@@ -1138,11 +1138,11 @@ static void sprite_colour_decode(uint16_t* rom, int len)
READ32_MEMBER(pgm2_state::orleg2_speedup_r)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
if ((pc == 0x1002faec) || (pc == 0x1002f9b8))
{
if ((m_mainram[0x20114 / 4] == 0x00) && (m_mainram[0x20118 / 4] == 0x00))
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
/*else
{
@@ -1154,12 +1154,12 @@ READ32_MEMBER(pgm2_state::orleg2_speedup_r)
READ32_MEMBER(pgm2_state::kov2nl_speedup_r)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
if ((pc == 0x10053a94) || (pc == 0x1005332c) || (pc == 0x1005327c))
{
if ((m_mainram[0x20470 / 4] == 0x00) && (m_mainram[0x20474 / 4] == 0x00))
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
/*
else
@@ -1173,12 +1173,12 @@ READ32_MEMBER(pgm2_state::kov2nl_speedup_r)
READ32_MEMBER(pgm2_state::kof98umh_speedup_r)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
if (pc == 0x100028f6)
{
if ((m_mainram[0x00060 / 4] == 0x00) && (m_mainram[0x00064 / 4] == 0x00))
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
/*
else
@@ -1192,12 +1192,12 @@ READ32_MEMBER(pgm2_state::kof98umh_speedup_r)
READ32_MEMBER(pgm2_state::kov3_speedup_r)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
if ((pc == 0x1000729a) || (pc == 0x1000729e))
{
if ((m_mainram[0x000b4 / 4] == 0x00) && (m_mainram[0x000b8 / 4] == 0x00))
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
/*
else
@@ -1214,12 +1214,12 @@ READ32_MEMBER(pgm2_state::kov3_speedup_r)
READ32_MEMBER(pgm2_state::ddpdojh_speedup_r)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
if (pc == 0x10001a7e)
{
if ((m_mainram[0x00060 / 4] == 0x00) && (m_mainram[0x00064 / 4] == 0x00))
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
/*
else
@@ -1233,12 +1233,12 @@ READ32_MEMBER(pgm2_state::ddpdojh_speedup_r)
READ32_MEMBER(pgm2_state::ddpdojh_speedup2_r)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
if (pc == 0x1008fefe || pc == 0x1008fbe8)
{
if ((m_mainram[0x21e04 / 4] & 0x00ff0000) != 0) // not sure if this endian safe ?
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
/*
else
@@ -1273,20 +1273,20 @@ void pgm2_state::common_encryption_init()
DRIVER_INIT_MEMBER(pgm2_state,orleg2)
{
common_encryption_init();
- machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20020114, 0x20020117, read32_delegate(FUNC(pgm2_state::orleg2_speedup_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20020114, 0x20020117, read32_delegate(FUNC(pgm2_state::orleg2_speedup_r),this));
}
DRIVER_INIT_MEMBER(pgm2_state,kov2nl)
{
common_encryption_init();
- machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20020470, 0x20020473, read32_delegate(FUNC(pgm2_state::kov2nl_speedup_r), this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20020470, 0x20020473, read32_delegate(FUNC(pgm2_state::kov2nl_speedup_r), this));
}
DRIVER_INIT_MEMBER(pgm2_state,ddpdojh)
{
common_encryption_init();
- machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20000060, 0x20000063, read32_delegate(FUNC(pgm2_state::ddpdojh_speedup_r), this));
- machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20021e04, 0x20021e07, read32_delegate(FUNC(pgm2_state::ddpdojh_speedup2_r), this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20000060, 0x20000063, read32_delegate(FUNC(pgm2_state::ddpdojh_speedup_r), this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20021e04, 0x20021e07, read32_delegate(FUNC(pgm2_state::ddpdojh_speedup2_r), this));
}
static const uint8_t kov3_100_key[] = { 0xde, 0x29, 0x52, 0x84, 0x71, 0x9e, 0xed, 0x66 };
@@ -1296,7 +1296,7 @@ static const uint8_t kov3_104_key[] = { 0xaf, 0x35, 0x5f, 0xf9, 0x63, 0x78, 0xe8
DRIVER_INIT_MEMBER(pgm2_state,kov3)
{
common_encryption_init();
- machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200000b4, 0x200000b7, read32_delegate(FUNC(pgm2_state::kov3_speedup_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000b4, 0x200000b7, read32_delegate(FUNC(pgm2_state::kov3_speedup_r),this));
}
void pgm2_state::decrypt_kov3_module(uint32_t addrxor, uint16_t dataxor)
diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp
index 48ea5abdc22..9cdf16b70e4 100644
--- a/src/mame/drivers/playmark.cpp
+++ b/src/mame/drivers/playmark.cpp
@@ -207,7 +207,7 @@ READ8_MEMBER(playmark_state::playmark_snd_flag_r)
WRITE8_MEMBER(playmark_state::playmark_oki_banking_w)
{
- logerror("PC$%03x Writing %02x to PortA (OKI bank select)\n",space.device().safe_pcbase(),data);
+ logerror("%s Writing %02x to PortA (OKI bank select)\n",machine().describe_context(),data);
int bank = data & 7;
diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp
index c23ee30b51c..2e025dbca6f 100644
--- a/src/mame/drivers/plygonet.cpp
+++ b/src/mame/drivers/plygonet.cpp
@@ -220,13 +220,13 @@ WRITE32_MEMBER(polygonet_state::shared_ram_write)
{
logerror("68k WRITING %04x to shared ram %x (@%x)\n", (m_shared_ram[offset] & 0xffff0000) >> 16,
0xc000 + (offset<<1),
- space.device().safe_pc());
+ m_maincpu->pc());
}
else if (mem_mask == 0x0000ffff)
{
logerror("68k WRITING %04x to shared ram %x (@%x)\n", (m_shared_ram[offset] & 0x0000ffff),
0xc000 +((offset<<1)+1),
- space.device().safe_pc());
+ m_maincpu->pc());
}
else
{
@@ -235,7 +235,7 @@ WRITE32_MEMBER(polygonet_state::shared_ram_write)
0xc000 + (offset<<1),
0xc000 +((offset<<1)+1),
mem_mask,
- space.device().safe_pc());
+ m_maincpu->pc());
}
/* write to the current dsp56k word */
diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp
index 092e8149ea9..32d0866105b 100644
--- a/src/mame/drivers/policetr.cpp
+++ b/src/mame/drivers/policetr.cpp
@@ -213,7 +213,7 @@ WRITE32_MEMBER(policetr_state::speedup_w)
COMBINE_DATA(m_speedup_data);
/* see if the PC matches */
- if ((space.device().safe_pcbase() & 0x1fffffff) == m_speedup_pc)
+ if ((m_maincpu->pcbase() & 0x1fffffff) == m_speedup_pc)
{
uint64_t curr_cycles = m_maincpu->total_cycles();
@@ -224,7 +224,7 @@ WRITE32_MEMBER(policetr_state::speedup_w)
/* more than 2 in a row and we spin */
if (m_loop_count > 2)
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
else
m_loop_count = 0;
diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp
index 710bb3493de..51437438170 100644
--- a/src/mame/drivers/rastersp.cpp
+++ b/src/mame/drivers/rastersp.cpp
@@ -645,11 +645,11 @@ WRITE32_MEMBER( rastersp_state::dsp_ctrl_w )
WRITE32_MEMBER( rastersp_state::dsp_speedup_w )
{
// 809e90 48fd, 48d5
- if (space.device().safe_pc() == 0x809c23)
+ if (m_dsp->pc() == 0x809c23)
{
- int32_t cycles_left = space.device().execute().cycles_remaining();
+ int32_t cycles_left = m_dsp->cycles_remaining();
data += cycles_left / 6;
- space.device().execute().spin();
+ m_dsp->spin();
}
m_speedup_count = data;
diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp
index 4a568041d13..6e73751509d 100644
--- a/src/mame/drivers/realbrk.cpp
+++ b/src/mame/drivers/realbrk.cpp
@@ -66,7 +66,7 @@ READ16_MEMBER(realbrk_state::realbrk_dsw_r)
((ioport("SW3")->read() & 0x0300) << 4) |
((ioport("SW4")->read() & 0x0300) << 6) ;
- logerror("CPU #0 PC %06X: read with unknown dsw_select = %02x\n",space.device().safe_pc(),m_dsw_select[0]);
+ logerror("CPU #0 PC %06X: read with unknown dsw_select = %02x\n",m_maincpu->pc(),m_dsw_select[0]);
return 0xffff;
}
diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp
index 7bc33e97541..9b8f5f3219c 100644
--- a/src/mame/drivers/route16.cpp
+++ b/src/mame/drivers/route16.cpp
@@ -1047,7 +1047,7 @@ READ8_MEMBER(route16_state::routex_prot_read)
{
if (m_cpu1->pc() == 0x2f) return 0xfb;
- logerror ("cpu '%s' (PC=%08X): unmapped prot read\n", space.device().tag(), space.device().safe_pc());
+ logerror ("cpu '%s' (PC=%08X): unmapped prot read\n", m_cpu1->tag(), m_cpu1->pc());
return 0x00;
}
diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp
index f6a59e4a640..c69e6d6f923 100644
--- a/src/mame/drivers/segaorun.cpp
+++ b/src/mame/drivers/segaorun.cpp
@@ -508,7 +508,7 @@ READ16_MEMBER( segaorun_state::misc_io_r )
if (!m_custom_io_r.isnull())
return m_custom_io_r(space, offset, mem_mask);
- logerror("%06X:misc_io_r - unknown read access to address %04X\n", space.device().safe_pc(), offset * 2);
+ logerror("%06X:misc_io_r - unknown read access to address %04X\n", m_maincpu->pc(), offset * 2);
return open_bus_r(space, 0, mem_mask);
}
@@ -525,7 +525,7 @@ WRITE16_MEMBER( segaorun_state::misc_io_w )
return;
}
- logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", space.device().safe_pc(), offset * 2, data, mem_mask);
+ logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", m_maincpu->pc(), offset * 2, data, mem_mask);
}
@@ -705,7 +705,7 @@ READ16_MEMBER( segaorun_state::outrun_custom_io_r )
break;
}
- logerror("%06X:outrun_custom_io_r - unknown read access to address %04X\n", space.device().safe_pc(), offset * 2);
+ logerror("%06X:outrun_custom_io_r - unknown read access to address %04X\n", m_maincpu->pc(), offset * 2);
return open_bus_r(space, 0, mem_mask);
}
@@ -757,7 +757,7 @@ WRITE16_MEMBER( segaorun_state::outrun_custom_io_w )
break;
}
- logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", space.device().safe_pc(), offset * 2, data, mem_mask);
+ logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", m_maincpu->pc(), offset * 2, data, mem_mask);
}
@@ -788,7 +788,7 @@ READ16_MEMBER( segaorun_state::shangon_custom_io_r )
break;
}
- logerror("%06X:misc_io_r - unknown read access to address %04X\n", space.device().safe_pc(), offset * 2);
+ logerror("%06X:misc_io_r - unknown read access to address %04X\n", m_maincpu->pc(), offset * 2);
return open_bus_r(space,0,mem_mask);
}
@@ -840,7 +840,7 @@ WRITE16_MEMBER( segaorun_state::shangon_custom_io_w )
break;
}
- logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", space.device().safe_pc(), offset * 2, data, mem_mask);
+ logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", m_maincpu->pc(), offset * 2, data, mem_mask);
}
diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp
index 25c6fd976ea..605d79d7530 100644
--- a/src/mame/drivers/segas18.cpp
+++ b/src/mame/drivers/segas18.cpp
@@ -234,7 +234,7 @@ READ16_MEMBER( segas18_state::misc_io_r )
if (!m_custom_io_r.isnull())
return m_custom_io_r(space, offset, mem_mask);
- logerror("%06X:misc_io_r - unknown read access to address %04X\n", space.device().safe_pc(), offset * 2);
+ logerror("%06X:misc_io_r - unknown read access to address %04X\n", m_maincpu->pc(), offset * 2);
return open_bus_r(space, 0, mem_mask);
}
@@ -268,7 +268,7 @@ WRITE16_MEMBER( segas18_state::misc_io_w )
m_custom_io_w(space, offset, data, mem_mask);
return;
}
- logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", space.device().safe_pc(), offset * 2, data, mem_mask);
+ logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", m_maincpu->pc(), offset * 2, data, mem_mask);
}
diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp
index 01355f7d3ca..943cb3e8ab5 100644
--- a/src/mame/drivers/seibuspi.cpp
+++ b/src/mame/drivers/seibuspi.cpp
@@ -2150,14 +2150,14 @@ DRIVER_INIT_MEMBER(seibuspi_state,rfjet)
READ32_MEMBER(seibuspi_state::senkyu_speedup_r)
{
- if (space.device().safe_pc()==0x00305bb2) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x00305bb2) m_maincpu->spin_until_interrupt(); // idle
return m_mainram[0x0018cb4/4];
}
READ32_MEMBER(seibuspi_state::senkyua_speedup_r)
{
- if (space.device().safe_pc()== 0x30582e) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()== 0x30582e) m_maincpu->spin_until_interrupt(); // idle
return m_mainram[0x0018c9c/4];
}
@@ -2167,10 +2167,10 @@ READ32_MEMBER(seibuspi_state::batlball_speedup_r)
// printf("space.device().safe_pc() %06x\n", space.device().safe_pc());
/* batlbalu */
- if (space.device().safe_pc()==0x00305996) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x00305996) m_maincpu->spin_until_interrupt(); // idle
/* batlball */
- if (space.device().safe_pc()==0x003058aa) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x003058aa) m_maincpu->spin_until_interrupt(); // idle
return m_mainram[0x0018db4/4];
}
@@ -2178,13 +2178,13 @@ READ32_MEMBER(seibuspi_state::batlball_speedup_r)
READ32_MEMBER(seibuspi_state::viprp1_speedup_r)
{
/* viprp1 */
- if (space.device().safe_pc()==0x0202769) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0202769) m_maincpu->spin_until_interrupt(); // idle
/* viprp1s */
- if (space.device().safe_pc()==0x02027e9) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x02027e9) m_maincpu->spin_until_interrupt(); // idle
/* viprp1ot */
- if (space.device().safe_pc()==0x02026bd) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x02026bd) m_maincpu->spin_until_interrupt(); // idle
// osd_printf_debug("%08x\n",space.device().safe_pc());
@@ -2194,8 +2194,8 @@ READ32_MEMBER(seibuspi_state::viprp1_speedup_r)
READ32_MEMBER(seibuspi_state::viprp1o_speedup_r)
{
/* viperp1o */
- if (space.device().safe_pc()==0x0201f99) space.device().execute().spin_until_interrupt(); // idle
-// osd_printf_debug("%08x\n",space.device().safe_pc());
+ if (m_maincpu->pc()==0x0201f99) m_maincpu->spin_until_interrupt(); // idle
+// osd_printf_debug("%08x\n",m_maincpu->pc());
return m_mainram[0x001d49c/4];
}
@@ -2203,8 +2203,8 @@ READ32_MEMBER(seibuspi_state::viprp1o_speedup_r)
// causes input problems?
READ32_MEMBER(seibuspi_state::ejanhs_speedup_r)
{
-// osd_printf_debug("%08x\n",space.device().safe_pc());
- if (space.device().safe_pc()==0x03032c7) space.device().execute().spin_until_interrupt(); // idle
+// osd_printf_debug("%08x\n",m_maincpu->pc());
+ if (m_maincpu->pc()==0x03032c7) m_maincpu->spin_until_interrupt(); // idle
return m_mainram[0x002d224/4];
}
#endif
@@ -2212,27 +2212,27 @@ READ32_MEMBER(seibuspi_state::ejanhs_speedup_r)
READ32_MEMBER(seibuspi_state::rdft_speedup_r)
{
/* rdft */
- if (space.device().safe_pc()==0x0203f06) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0203f06) m_maincpu->spin_until_interrupt(); // idle
/* rdftj? */
- if (space.device().safe_pc()==0x0203f0a) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0203f0a) m_maincpu->spin_until_interrupt(); // idle
/* rdftau */
- if (space.device().safe_pc()==0x0203f16) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0203f16) m_maincpu->spin_until_interrupt(); // idle
/* rdftja? */
- if (space.device().safe_pc()==0x0203f22) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0203f22) m_maincpu->spin_until_interrupt(); // idle
/* rdfta, rdftadi, rdftam, rdftit */
- if (space.device().safe_pc()==0x0203f46) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0203f46) m_maincpu->spin_until_interrupt(); // idle
/* rdftu */
- if (space.device().safe_pc()==0x0203f3a) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0203f3a) m_maincpu->spin_until_interrupt(); // idle
/* rdftauge */
- if (space.device().safe_pc()==0x0203f6e) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0203f6e) m_maincpu->spin_until_interrupt(); // idle
-// osd_printf_debug("%08x\n",space.device().safe_pc());
+// osd_printf_debug("%08x\n",m_maincpu->pc());
return m_mainram[0x00298d0/4];
}
@@ -2240,18 +2240,18 @@ READ32_MEMBER(seibuspi_state::rdft_speedup_r)
READ32_MEMBER(seibuspi_state::rf2_speedup_r)
{
/* rdft22kc */
- if (space.device().safe_pc()==0x0203926) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0203926) m_maincpu->spin_until_interrupt(); // idle
/* rdft2, rdft2j */
- if (space.device().safe_pc()==0x0204372) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0204372) m_maincpu->spin_until_interrupt(); // idle
/* rdft2us */
- if (space.device().safe_pc()==0x020420e) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x020420e) m_maincpu->spin_until_interrupt(); // idle
/* rdft2a */
- if (space.device().safe_pc()==0x0204366) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0204366) m_maincpu->spin_until_interrupt(); // idle
-// osd_printf_debug("%08x\n",space.device().safe_pc());
+// osd_printf_debug("%08x\n",m_maincpu->pc());
return m_mainram[0x0282ac/4];
}
@@ -2259,22 +2259,22 @@ READ32_MEMBER(seibuspi_state::rf2_speedup_r)
READ32_MEMBER(seibuspi_state::rfjet_speedup_r)
{
/* rfjet, rfjetu, rfjeta */
- if (space.device().safe_pc()==0x0206082) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0206082) m_maincpu->spin_until_interrupt(); // idle
/* rfjetus */
- if (space.device().safe_pc()==0x0205b39)
+ if (m_maincpu->pc()==0x0205b39)
{
uint32_t r;
- space.device().execute().spin_until_interrupt(); // idle
+ m_maincpu->spin_until_interrupt(); // idle
// Hack to enter test mode
r = m_mainram[0x002894c/4] & (~0x400);
return r | (((ioport("SYSTEM")->read() ^ 0xff)<<8) & 0x400);
}
/* rfjetj */
- if (space.device().safe_pc()==0x0205f2e) space.device().execute().spin_until_interrupt(); // idle
+ if (m_maincpu->pc()==0x0205f2e) m_maincpu->spin_until_interrupt(); // idle
-// osd_printf_debug("%08x\n",space.device().safe_pc());
+// osd_printf_debug("%08x\n",m_maincpu->pc());
return m_mainram[0x002894c/4];
}
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp
index 300458637e7..55080c3ddf8 100644
--- a/src/mame/drivers/seta.cpp
+++ b/src/mame/drivers/seta.cpp
@@ -11697,12 +11697,12 @@ READ16_MEMBER(seta_state::twineagl_debug_r)
READ16_MEMBER(seta_state::twineagl_200100_r)
{
// protection check at boot
- logerror("%04x: twineagl_200100_r %d\n",space.device().safe_pc(),offset);
+ logerror("%04x: twineagl_200100_r %d\n",m_maincpu->pc(),offset);
return m_twineagl_xram[offset];
}
WRITE16_MEMBER(seta_state::twineagl_200100_w)
{
- logerror("%04x: twineagl_200100_w %d = %02x\n",space.device().safe_pc(),offset,data);
+ logerror("%04x: twineagl_200100_w %d = %02x\n",m_maincpu->pc(),offset,data);
if (ACCESSING_BITS_0_7)
{
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index 2763cf66521..cab41d4cfea 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -956,7 +956,7 @@ READ16_MEMBER(seta2_state::funcube_coins_r)
else
{
if (!(ret & 1))
- m_funcube_coin_start_cycles = downcast<cpu_device *>(&space.device())->total_cycles();
+ m_funcube_coin_start_cycles = m_sub->total_cycles();
}
return (ret & ~7) | (hopper_bit << 2) | (coin_bit1 << 1) | coin_bit0;
diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp
index 4abff40457a..0cc4ee135e5 100644
--- a/src/mame/drivers/simpl156.cpp
+++ b/src/mame/drivers/simpl156.cpp
@@ -1067,8 +1067,8 @@ DRIVER_INIT_MEMBER(simpl156_state,simpl156)
/* Everything seems more stable if we run the CPU speed x4 and use Idle skips.. maybe it has an internal multipler? */
READ32_MEMBER(simpl156_state::joemacr_speedup_r)
{
- if (space.device().safe_pc() == 0x284)
- space.device().execute().spin_until_time(attotime::from_usec(400));
+ if (m_maincpu->pc() == 0x284)
+ m_maincpu->spin_until_time(attotime::from_usec(400));
return m_systemram[0x18/4];
}
@@ -1081,8 +1081,8 @@ DRIVER_INIT_MEMBER(simpl156_state,joemacr)
READ32_MEMBER(simpl156_state::chainrec_speedup_r)
{
- if (space.device().safe_pc() == 0x2d4)
- space.device().execute().spin_until_time(attotime::from_usec(400));
+ if (m_maincpu->pc() == 0x2d4)
+ m_maincpu->spin_until_time(attotime::from_usec(400));
return m_systemram[0x18/4];
}
@@ -1094,8 +1094,8 @@ DRIVER_INIT_MEMBER(simpl156_state,chainrec)
READ32_MEMBER(simpl156_state::prtytime_speedup_r)
{
- if (space.device().safe_pc() == 0x4f0)
- space.device().execute().spin_until_time(attotime::from_usec(400));
+ if (m_maincpu->pc() == 0x4f0)
+ m_maincpu->spin_until_time(attotime::from_usec(400));
return m_systemram[0xae0/4];
}
@@ -1108,8 +1108,8 @@ DRIVER_INIT_MEMBER(simpl156_state,prtytime)
READ32_MEMBER(simpl156_state::charlien_speedup_r)
{
- if (space.device().safe_pc() == 0xc8c8)
- space.device().execute().spin_until_time(attotime::from_usec(400));
+ if (m_maincpu->pc() == 0xc8c8)
+ m_maincpu->spin_until_time(attotime::from_usec(400));
return m_systemram[0x10/4];
}
@@ -1121,8 +1121,8 @@ DRIVER_INIT_MEMBER(simpl156_state,charlien)
READ32_MEMBER(simpl156_state::osman_speedup_r)
{
- if (space.device().safe_pc() == 0x5974)
- space.device().execute().spin_until_time(attotime::from_usec(400));
+ if (m_maincpu->pc() == 0x5974)
+ m_maincpu->spin_until_time(attotime::from_usec(400));
return m_systemram[0x10/4];
}
diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp
index 5b5461421cd..277d445f285 100644
--- a/src/mame/drivers/snesb.cpp
+++ b/src/mame/drivers/snesb.cpp
@@ -219,14 +219,14 @@ READ8_MEMBER(snesb_state::sb2b_6a6xxx_r)
case 0xfb7: return 0x47;
}
- logerror("Unknown protection read read %x @ %x\n",offset, space.device().safe_pc());
+ logerror("Unknown protection read read %x @ %x\n",offset, m_maincpu->pc());
return 0;
}
READ8_MEMBER(snesb_state::sb2b_7xxx_r)
{
- return space.read_byte(0xc07000 + offset);
+ return m_maincpu->space(AS_PROGRAM).read_byte(0xc07000 + offset);
}
@@ -243,7 +243,7 @@ READ8_MEMBER(snesb_state::endless_580xxx_r)
case 0xe83: return 0x6b;
}
- logerror("Unknown protection read read %x @ %x\n",offset, space.device().safe_pc());
+ logerror("Unknown protection read read %x @ %x\n",offset, m_maincpu->pc());
return 0;
}
diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp
index 464800fad8f..a7f4050b11e 100644
--- a/src/mame/drivers/snowbros.cpp
+++ b/src/mame/drivers/snowbros.cpp
@@ -184,7 +184,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(snowbros_state::snowbros3_irq)
READ16_MEMBER(snowbros_state::toto_read)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
if ((pc!= 0x3f010) && (pc!= 0x38008)) printf("toto prot %08x %04x\n", pc, mem_mask);
return 0x0700;
}
diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp
index 445a5ed2e72..b2deed988c9 100644
--- a/src/mame/drivers/spaceg.cpp
+++ b/src/mame/drivers/spaceg.cpp
@@ -289,8 +289,8 @@ WRITE8_MEMBER(spaceg_state::zvideoram_w)
break;
default:
- logerror("mode = %02x pc = %04x\n", *m_io9401, space.device().safe_pc());
- popmessage("mode = %02x pc = %04x\n", *m_io9401, space.device().safe_pc());
+ logerror("mode = %02x pc = %04x\n", *m_io9401, m_maincpu->pc());
+ popmessage("mode = %02x pc = %04x\n", *m_io9401, m_maincpu->pc());
return;
}
diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp
index 4e6155d1d83..9029fe457f2 100644
--- a/src/mame/drivers/splash.cpp
+++ b/src/mame/drivers/splash.cpp
@@ -1085,7 +1085,7 @@ DRIVER_INIT_MEMBER(splash_state,rebus)
READ16_MEMBER(funystrp_state::protection_r)
{
- int pc = space.device().safe_pc();
+ int pc = m_maincpu->pc();
int ofst = offset+(0x100000/2);
@@ -1368,7 +1368,7 @@ WRITE16_MEMBER(funystrp_state::protection_w)
{
int ofst = (0x100000/2)+offset;
-// logerror ("PROTW: %5.5x, %4.4x, PC: %5.5x m: %4.4x\n", ofst*2, data, space.device().safe_pc(), mem_mask);
+// logerror ("PROTW: %5.5x, %4.4x, PC: %5.5x m: %4.4x\n", ofst*2, data, m_maincpu->pc(), mem_mask);
// if (ACCESSING_BITS_0_7) // ??
{
diff --git a/src/mame/drivers/strnskil.cpp b/src/mame/drivers/strnskil.cpp
index 1b3f4b99ab7..9a791c9aa50 100644
--- a/src/mame/drivers/strnskil.cpp
+++ b/src/mame/drivers/strnskil.cpp
@@ -50,7 +50,7 @@ READ8_MEMBER(strnskil_state::pettanp_protection_r)
{
int res;
- switch (space.device().safe_pc())
+ switch (m_maincpu->pc())
{
case 0x6066: res = 0xa5; break;
case 0x60dc: res = 0x20; break; /* bits 0-3 unknown */
@@ -61,7 +61,7 @@ READ8_MEMBER(strnskil_state::pettanp_protection_r)
default: res = 0xff; break;
}
- logerror("%04x: protection_r -> %02x\n",space.device().safe_pc(),res);
+ logerror("%04x: protection_r -> %02x\n",m_maincpu->pc(),res);
return res;
}
@@ -69,7 +69,7 @@ READ8_MEMBER(strnskil_state::banbam_protection_r)
{
int res;
- switch (space.device().safe_pc())
+ switch (m_maincpu->pc())
{
case 0x6094: res = 0xa5; break;
case 0x6118: res = 0x20; break; /* bits 0-3 unknown */
@@ -80,13 +80,13 @@ READ8_MEMBER(strnskil_state::banbam_protection_r)
default: res = 0xff; break;
}
- logerror("%04x: protection_r -> %02x\n",space.device().safe_pc(),res);
+ logerror("%04x: protection_r -> %02x\n",m_maincpu->pc(),res);
return res;
}
WRITE8_MEMBER(strnskil_state::protection_w)
{
- logerror("%04x: protection_w %02x\n",space.device().safe_pc(),data);
+ logerror("%04x: protection_w %02x\n",m_maincpu->pc(),data);
}
/****************************************************************************/
diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp
index 5d779197bd4..d419f91d2df 100644
--- a/src/mame/drivers/stv.cpp
+++ b/src/mame/drivers/stv.cpp
@@ -463,16 +463,16 @@ DRIVER_INIT_MEMBER(stv_state,critcrsh)
READ32_MEMBER(stv_state::magzun_hef_hack_r)
{
- if(space.device().safe_pc()==0x604bf20) return 0x00000001; //HWEF
+ if(m_maincpu->pc()==0x604bf20) return 0x00000001; //HWEF
- if(space.device().safe_pc()==0x604bfbe) return 0x00000002; //HREF
+ if(m_maincpu->pc()==0x604bfbe) return 0x00000002; //HREF
return m_workram_h[0x08e830/4];
}
READ32_MEMBER(stv_state::magzun_rx_hack_r)
{
- if(space.device().safe_pc()==0x604c006) return 0x40;
+ if(m_maincpu->pc()==0x604c006) return 0x40;
return m_workram_h[0x0ff3b4/4];
}
diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp
index 36f3ea5cb85..3bdb3739b39 100644
--- a/src/mame/drivers/suna8.cpp
+++ b/src/mame/drivers/suna8.cpp
@@ -526,7 +526,7 @@ READ8_MEMBER(suna8_state::hardhead_ip_r)
case 2: return ioport("DSW1")->read();
case 3: return ioport("DSW2")->read();
default:
- logerror("CPU #0 - PC %04X: Unknown IP read: %02X\n", space.device().safe_pc(), *m_hardhead_ip);
+ logerror("CPU #0 - PC %04X: Unknown IP read: %02X\n", m_maincpu->pc(), *m_hardhead_ip);
return 0xff;
}
}
diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp
index 16db2e5c6e2..0e4d7026daf 100644
--- a/src/mame/drivers/superchs.cpp
+++ b/src/mame/drivers/superchs.cpp
@@ -568,16 +568,16 @@ ROM_END
READ32_MEMBER(superchs_state::main_cycle_r)
{
- if (space.device().safe_pc()==0x702)
- space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x702)
+ m_maincpu->spin_until_interrupt();
return m_ram[0];
}
READ16_MEMBER(superchs_state::sub_cycle_r)
{
- if (space.device().safe_pc()==0x454)
- space.device().execute().spin_until_interrupt();
+ if (m_subcpu->pc()==0x454)
+ m_subcpu->spin_until_interrupt();
return m_ram[2]&0xffff;
}
diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp
index 3808243b2d8..6fbcd7c21a2 100644
--- a/src/mame/drivers/superqix.cpp
+++ b/src/mame/drivers/superqix.cpp
@@ -308,7 +308,7 @@ WRITE8_MEMBER(superqix_state::z80_ay1_sync_address_w)
READ8_MEMBER(superqix_state::z80_ay2_iob_r)
{
-// logerror("%04x: read mcu answer (%02x)\n",space.device().safe_pc(),m_fromMCU);
+// logerror("%0s: read mcu answer (%02x)\n",machine().describe_context(),m_fromMCU);
return m_fromMCU;
}
@@ -404,7 +404,7 @@ WRITE8_MEMBER(superqix_state::mcu_port2_w)
READ8_MEMBER(superqix_state::mcu_port3_r)
{
-// logerror("%04x: read Z80 command %02x\n",space.device().safe_pc(),m_fromZ80);
+// logerror("%s: read Z80 command %02x\n",machine().describe_context(),m_fromZ80);
return m_fromZ80;
}
@@ -811,7 +811,7 @@ WRITE8_MEMBER(hotsmash_state::hotsmash_68705_portC_w)
{
u8 const changed_m_portC_out = m_portC_out ^ data;
m_portC_out = data;
- //logerror("%04x: MCU setting MUX port to %d\n", space.device().safe_pc(), m_portC_out & 0x07);
+ //logerror("%s: MCU setting MUX port to %d\n", machine().describe_context(), m_portC_out & 0x07);
// maybe on the RISING edge of the latch bit, the semaphores are updated, like TaitoSJ?
/*if (BIT(changed_m_portC_out, 3) && BIT(m_portC_out, 3))
{
@@ -838,7 +838,7 @@ WRITE8_MEMBER(hotsmash_state::hotsmash_68705_portC_w)
break;
case 0x3: // Read command from Z80 to MCU, the z80->mcu semaphore is cleared on the rising edge
- //logerror("%04x: command %02x read by MCU; Z80HasWritten: %d (and will be 0 after this); MCUHasWritten: %d\n",space.device().safe_pc(),m_fromZ80,m_Z80HasWritten, m_MCUHasWritten);
+ //logerror("%s: command %02x read by MCU; Z80HasWritten: %d (and will be 0 after this); MCUHasWritten: %d\n",machine().describe_context(),m_fromZ80,m_Z80HasWritten, m_MCUHasWritten);
m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE);
m_portA_in = m_fromZ80;
m_Z80HasWritten = 0;
@@ -846,7 +846,7 @@ WRITE8_MEMBER(hotsmash_state::hotsmash_68705_portC_w)
case 0x5: // latch response from MCU to Z80; the mcu->z80 semaphore is set on the rising edge
m_fromMCU = m_portB_out;
- //logerror("%04x: response %02x written by MCU; Z80HasWritten: %d; MCUHasWritten: %d (and will be 1 after this)\n",space.device().safe_pc(),m_fromMCU,m_Z80HasWritten, m_MCUHasWritten);
+ //logerror("%s: response %02x written by MCU; Z80HasWritten: %d; MCUHasWritten: %d (and will be 1 after this)\n",machine().describe_context(),m_fromMCU,m_Z80HasWritten, m_MCUHasWritten);
m_MCUHasWritten = 1;
m_portA_in = 0xff;
break;
@@ -857,11 +857,11 @@ WRITE8_MEMBER(hotsmash_state::hotsmash_68705_portC_w)
break;
default: // cases 2 and 4 presumably latch open bus/0xFF; implication from the superqix bootleg is that reading port 4 may clear the m_MCUHasWritten flag, but the hotsmash MCU never touches it. Needs hardware tests/tracing to prove.
- logerror("%04x: MCU attempted to read mux port %d which is invalid!\n", space.device().safe_pc(), m_portC_out & 0x07);
+ logerror("%s: MCU attempted to read mux port %d which is invalid!\n", machine().describe_context(), m_portC_out & 0x07);
m_portA_in = 0xff;
break;
}
- //if ((m_portC_out & 0x07) < 6) logerror("%04x: MCU latched %02x from mux input %d m_portA_in\n", space.device().safe_pc(), m_portA_in, m_portC_out & 0x07);
+ //if ((m_portC_out & 0x07) < 6) logerror("%s: MCU latched %02x from mux input %d m_portA_in\n", machine().describe_context(), m_portA_in, m_portC_out & 0x07);
}
}
@@ -869,7 +869,7 @@ WRITE8_MEMBER(hotsmash_state::hotsmash_Z80_mcu_w)
{
m_fromZ80 = data;
//if ((m_fromZ80 != 0x04) && (m_fromZ80 != 0x08))
- // logerror("%04x: z80 write to MCU %02x; Z80HasWritten: %d (and will be 1 after this); MCUHasWritten: %d\n",space.device().safe_pc(),m_fromZ80, m_Z80HasWritten, m_MCUHasWritten);
+ // logerror("%s: z80 write to MCU %02x; Z80HasWritten: %d (and will be 1 after this); MCUHasWritten: %d\n",machine().describe_context(),m_fromZ80, m_Z80HasWritten, m_MCUHasWritten);
m_Z80HasWritten = 1; // set the semaphore, and assert interrupt on the mcu
machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(250)); //boost the interleave temporarily, or the game will crash.
m_mcu->set_input_line(M68705_IRQ_LINE, ASSERT_LINE);
@@ -880,7 +880,7 @@ READ8_MEMBER(hotsmash_state::hotsmash_Z80_mcu_r)
if(!machine().side_effect_disabled())
{
//if ((m_fromZ80 != 0x04) && (m_fromZ80 != 0x08))
- // logerror("%04x: z80 read from MCU %02x; Z80HasWritten: %d; MCUHasWritten: %d (and will be 0 after this)\n",space.device().safe_pc(),m_fromMCU, m_Z80HasWritten, m_MCUHasWritten);
+ // logerror("%s: z80 read from MCU %02x; Z80HasWritten: %d; MCUHasWritten: %d (and will be 0 after this)\n",machine().describe_context(),m_fromMCU, m_Z80HasWritten, m_MCUHasWritten);
m_MCUHasWritten = 0;
}
// return the last value the 68705 wrote, but do not mark that we've read it
diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp
index 6f03fe110e0..502d889b45a 100644
--- a/src/mame/drivers/suprnova.cpp
+++ b/src/mame/drivers/suprnova.cpp
@@ -887,35 +887,35 @@ READ32_MEMBER(skns_state::gutsn_speedup_r)
04022072: CMP/EQ R2,R3
04022074: BT $0402206C
*/
- if (space.device().safe_pc()==0x402206e)
+ if (m_maincpu->pc()==0x402206e)
{
if(m_main_ram[0x00078/4] == m_main_ram[0x0c780/4])
- space.device().execute().spin_until_interrupt();
+ m_maincpu->spin_until_interrupt();
}
return m_main_ram[0x0c780/4];
}
READ32_MEMBER(skns_state::cyvern_speedup_r)
{
- if (space.device().safe_pc()==0x402ebd2) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x402ebd2) m_maincpu->spin_until_interrupt();
return m_main_ram[0x4d3c8/4];
}
READ32_MEMBER(skns_state::puzzloopj_speedup_r)
{
- if (space.device().safe_pc()==0x401dca0) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x401dca0) m_maincpu->spin_until_interrupt();
return m_main_ram[0x86714/4];
}
READ32_MEMBER(skns_state::puzzloopa_speedup_r)
{
- if (space.device().safe_pc()==0x401d9d4) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x401d9d4) m_maincpu->spin_until_interrupt();
return m_main_ram[0x85bcc/4];
}
READ32_MEMBER(skns_state::puzzloopu_speedup_r)
{
- if (space.device().safe_pc()==0x401dab0) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x401dab0) m_maincpu->spin_until_interrupt();
return m_main_ram[0x85cec/4];
}
@@ -928,61 +928,61 @@ READ32_MEMBER(skns_state::puzzloope_speedup_r)
0401DA18: BF $0401DA26
0401DA26: BRA $0401DA12
*/
- if (space.device().safe_pc()==0x401da14) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x401da14) m_maincpu->spin_until_interrupt();
return m_main_ram[0x81d38/4];
}
READ32_MEMBER(skns_state::senknow_speedup_r)
{
- if (space.device().safe_pc()==0x4017dce) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x4017dce) m_maincpu->spin_until_interrupt();
return m_main_ram[0x0000dc/4];
}
READ32_MEMBER(skns_state::teljan_speedup_r)
{
- if (space.device().safe_pc()==0x401ba32) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x401ba32) m_maincpu->spin_until_interrupt();
return m_main_ram[0x002fb4/4];
}
READ32_MEMBER(skns_state::jjparads_speedup_r)
{
- if (space.device().safe_pc()==0x4015e84) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x4015e84) m_maincpu->spin_until_interrupt();
return m_main_ram[0x000994/4];
}
READ32_MEMBER(skns_state::jjparad2_speedup_r)
{
- if (space.device().safe_pc()==0x401620a) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x401620a) m_maincpu->spin_until_interrupt();
return m_main_ram[0x000984/4];
}
READ32_MEMBER(skns_state::ryouran_speedup_r)
{
- if (space.device().safe_pc()==0x40182ce) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x40182ce) m_maincpu->spin_until_interrupt();
return m_main_ram[0x000a14/4];
}
READ32_MEMBER(skns_state::galpans2_speedup_r)
{
- if (space.device().safe_pc()==0x4049ae2) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x4049ae2) m_maincpu->spin_until_interrupt();
return m_main_ram[0x0fb6bc/4];
}
READ32_MEMBER(skns_state::panicstr_speedup_r)
{
- if (space.device().safe_pc()==0x404e68a) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x404e68a) m_maincpu->spin_until_interrupt();
return m_main_ram[0x0f19e4/4];
}
READ32_MEMBER(skns_state::sengekis_speedup_r)// 60006ee 600308e
{
- if (space.device().safe_pc()==0x60006ec) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x60006ec) m_maincpu->spin_until_interrupt();
return m_main_ram[0xb74bc/4];
}
READ32_MEMBER(skns_state::sengekij_speedup_r)// 60006ee 600308e
{
- if (space.device().safe_pc()==0x60006ec) space.device().execute().spin_until_interrupt();
+ if (m_maincpu->pc()==0x60006ec) m_maincpu->spin_until_interrupt();
return m_main_ram[0xb7380/4];
}
diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp
index 20ed0108707..beb843a2ca4 100644
--- a/src/mame/drivers/system1.cpp
+++ b/src/mame/drivers/system1.cpp
@@ -710,25 +710,25 @@ READ8_MEMBER(system1_state::nob_mcu_status_r)
READ8_MEMBER(system1_state::nobb_inport1c_r)
{
-// logerror("IN $1c : pc = %04x - data = 0x80\n",space.device().safe_pc());
+// logerror("IN $1c : pc = %04x - data = 0x80\n",m_maincpu->pc());
return(0x80); // infinite loop (at 0x0fb3) until bit 7 is set
}
READ8_MEMBER(system1_state::nobb_inport22_r)
{
-// logerror("IN $22 : pc = %04x - data = %02x\n",space.device().safe_pc(),nobb_inport17_step);
+// logerror("IN $22 : pc = %04x - data = %02x\n",m_maincpu->pc(),nobb_inport17_step);
return(0);//nobb_inport17_step);
}
READ8_MEMBER(system1_state::nobb_inport23_r)
{
-// logerror("IN $23 : pc = %04x - step = %02x\n",space.device().safe_pc(),m_nobb_inport23_step);
+// logerror("IN $23 : pc = %04x - step = %02x\n",m_maincpu->pc(),m_nobb_inport23_step);
return(m_nobb_inport23_step);
}
WRITE8_MEMBER(system1_state::nobb_outport24_w)
{
-// logerror("OUT $24 : pc = %04x - data = %02x\n",space.device().safe_pc(),data);
+// logerror("OUT $24 : pc = %04x - data = %02x\n",m_maincpu->pc(),data);
m_nobb_inport23_step = data;
}
@@ -5322,7 +5322,7 @@ DRIVER_INIT_MEMBER(system1_state,dakkochn)
READ8_MEMBER(system1_state::nob_start_r)
{
/* in reality, it's likely some M1-dependent behavior */
- return (space.device().safe_pc() <= 0x0003) ? 0x80 : m_maincpu_region->base()[1];
+ return (m_maincpu->pc() <= 0x0003) ? 0x80 : m_maincpu_region->base()[1];
}
DRIVER_INIT_MEMBER(system1_state,nob)
diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp
index 47a671f4b20..88d63860f7b 100644
--- a/src/mame/drivers/taito_l.cpp
+++ b/src/mame/drivers/taito_l.cpp
@@ -425,14 +425,6 @@ READ8_MEMBER(taitol_state::mcu_control_r)
return 0x1;
}
-#if 0
-WRITE8_MEMBER(taitol_state::sound_w)
-{
- logerror("Sound_w %02x (%04x)\n", data, space.device().safe_pc());
-}
-#endif
-
-
WRITE_LINE_MEMBER(champwr_state::msm5205_vck)
{
if (m_adpcm_data != -1)
diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp
index dacdfc0f585..e7e6a29a8d0 100644
--- a/src/mame/drivers/taitoair.cpp
+++ b/src/mame/drivers/taitoair.cpp
@@ -251,7 +251,7 @@ WRITE16_MEMBER(taitoair_state::dspram_w)
READ16_MEMBER(taitoair_state::dsp_HOLD_signal_r)
{
/* HOLD signal is active low */
- // logerror("TMS32025:%04x Reading %01x level from HOLD signal\n", space.device().safe_pcbase(), m_dsp_hold_signal);
+ // logerror("TMS32025:%04x Reading %01x level from HOLD signal\n", m_dsp->pcbase(), m_dsp_hold_signal);
return m_dsp_hold_signal;
}
@@ -259,7 +259,7 @@ READ16_MEMBER(taitoair_state::dsp_HOLD_signal_r)
WRITE16_MEMBER(taitoair_state::dsp_HOLDA_signal_w)
{
if (offset)
- logerror("TMS32025:%04x Writing %01x level to HOLD-Acknowledge signal\n", space.device().safe_pcbase(), data);
+ logerror("TMS32025:%04x Writing %01x level to HOLD-Acknowledge signal\n", m_dsp->pcbase(), data);
}
diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp
index 6e707973212..2e0a878e395 100644
--- a/src/mame/drivers/taitojc.cpp
+++ b/src/mame/drivers/taitojc.cpp
@@ -1139,16 +1139,16 @@ MACHINE_CONFIG_END
READ16_MEMBER(taitojc_state::taitojc_dsp_idle_skip_r)
{
- if (space.device().safe_pc() == 0x404c)
- space.device().execute().spin_until_time(attotime::from_usec(500));
+ if (m_dsp->pc() == 0x404c)
+ m_dsp->spin_until_time(attotime::from_usec(500));
return m_dsp_shared_ram[0x7f0];
}
READ16_MEMBER(taitojc_state::dendego2_dsp_idle_skip_r)
{
- if (space.device().safe_pc() == 0x402e)
- space.device().execute().spin_until_time(attotime::from_usec(500));
+ if (m_dsp->pc() == 0x402e)
+ m_dsp->spin_until_time(attotime::from_usec(500));
return m_dsp_shared_ram[0x7f0];
}
diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp
index cb068c27f03..0f25e399485 100644
--- a/src/mame/drivers/travrusa.cpp
+++ b/src/mame/drivers/travrusa.cpp
@@ -604,7 +604,7 @@ DRIVER_INIT_MEMBER(travrusa_state,shtridra)
READ8_MEMBER(travrusa_state::shtridrb_port11_r)
{
- printf("shtridrb_port11_r %04x\n", space.device().safe_pc());
+ printf("shtridrb_port11_r %04x\n", m_maincpu->pc());
// reads, masks with 0xa8, checks for 0x88, resets game if not happy with value?
return 0x88;
}
diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp
index 46461a1de1e..91d0b090c4e 100644
--- a/src/mame/drivers/trvmadns.cpp
+++ b/src/mame/drivers/trvmadns.cpp
@@ -239,7 +239,7 @@ WRITE8_MEMBER(trvmadns_state::trvmadns_tileram_w)
{
if(offset==0)
{
- if(space.device().safe_pcbase()==0x29e9)// || space.device().safe_pcbase()==0x1b3f) //29f5
+ if(m_maincpu->pcbase()==0x29e9)// || space.device().safe_pcbase()==0x1b3f) //29f5
{
m_maincpu->set_input_line(0, HOLD_LINE);
}
diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp
index a0357b522f6..d3ce1189c14 100644
--- a/src/mame/drivers/tumbleb.cpp
+++ b/src/mame/drivers/tumbleb.cpp
@@ -3504,7 +3504,7 @@ READ16_MEMBER(tumbleb_state::bcstory_1a0_read)
{
//osd_printf_debug("bcstory_io %06x\n",space.device().safe_pc());
- if (space.device().safe_pc()==0x0560) return 0x1a0;
+ if (m_maincpu->pc()==0x0560) return 0x1a0;
else return ioport("SYSTEM")->read();
}