summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp4
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp4
-rw-r--r--src/devices/bus/isa/svga_s3.cpp8
-rw-r--r--src/devices/bus/isa/svga_trident.cpp2
-rw-r--r--src/devices/bus/isa/svga_tseng.cpp2
-rw-r--r--src/devices/bus/isa/vga.cpp2
-rw-r--r--src/devices/bus/isa/vga_ati.cpp6
-rw-r--r--src/devices/bus/megadrive/rom.cpp32
-rw-r--r--src/devices/bus/spc1000/fdd.cpp4
-rw-r--r--src/devices/cpu/es5510/es5510.cpp2
-rw-r--r--src/devices/machine/68307bus.cpp8
-rw-r--r--src/devices/machine/68340sim.cpp2
-rw-r--r--src/devices/machine/autoconfig.cpp4
-rw-r--r--src/devices/machine/e05a03.cpp4
-rw-r--r--src/devices/machine/e05a30.cpp4
-rw-r--r--src/devices/machine/mc146818.cpp2
-rw-r--r--src/devices/machine/mc6846.cpp28
-rw-r--r--src/devices/machine/mc6854.cpp18
-rw-r--r--src/devices/machine/mos6530.cpp2
-rw-r--r--src/devices/machine/v3021.cpp2
-rw-r--r--src/devices/sound/scsp.cpp6
-rw-r--r--src/devices/video/epic12.cpp4
-rw-r--r--src/devices/video/imagetek_i4100.cpp2
-rw-r--r--src/devices/video/pc_vga.cpp10
-rw-r--r--src/devices/video/tms34061.cpp16
-rw-r--r--src/emu/debug/debugcpu.cpp4
-rw-r--r--src/emu/emumem.cpp10
-rw-r--r--src/mame/audio/atarijsa.cpp4
-rw-r--r--src/mame/audio/exidy.cpp8
-rw-r--r--src/mame/audio/exidy440.cpp4
-rw-r--r--src/mame/audio/hng64.cpp2
-rw-r--r--src/mame/audio/leland.cpp2
-rw-r--r--src/mame/audio/m72.cpp4
-rw-r--r--src/mame/audio/mario.cpp13
-rw-r--r--src/mame/audio/segasnd.cpp6
-rw-r--r--src/mame/audio/seibu.cpp4
-rw-r--r--src/mame/audio/snes_snd.cpp2
-rw-r--r--src/mame/audio/svis_snd.cpp6
-rw-r--r--src/mame/audio/trackfld.cpp2
-rw-r--r--src/mame/audio/tx1.cpp10
-rw-r--r--src/mame/audio/wswan.cpp2
-rw-r--r--src/mame/drivers/agat.cpp8
-rw-r--r--src/mame/drivers/apple2.cpp8
-rw-r--r--src/mame/drivers/apple2e.cpp14
-rw-r--r--src/mame/drivers/bmcpokr.cpp2
-rw-r--r--src/mame/drivers/cdi.cpp4
-rw-r--r--src/mame/drivers/cobra.cpp4
-rw-r--r--src/mame/drivers/coolridr.cpp2
-rw-r--r--src/mame/drivers/ddenlovr.cpp8
-rw-r--r--src/mame/drivers/eolith.cpp2
-rw-r--r--src/mame/drivers/fcrash.cpp6
-rw-r--r--src/mame/drivers/fitfight.cpp2
-rw-r--r--src/mame/drivers/fmtowns.cpp2
-rw-r--r--src/mame/drivers/ghosteo.cpp8
-rw-r--r--src/mame/drivers/hyprduel.cpp2
-rw-r--r--src/mame/drivers/laser3k.cpp4
-rw-r--r--src/mame/drivers/mac128.cpp4
-rw-r--r--src/mame/drivers/magictg.cpp10
-rw-r--r--src/mame/drivers/model2.cpp4
-rw-r--r--src/mame/drivers/neogeocd.cpp4
-rw-r--r--src/mame/drivers/proconn.cpp2
-rw-r--r--src/mame/drivers/r9751.cpp76
-rw-r--r--src/mame/drivers/segac2.cpp14
-rw-r--r--src/mame/drivers/segaxbd.cpp2
-rw-r--r--src/mame/drivers/snes.cpp2
-rw-r--r--src/mame/drivers/taito_x.cpp14
-rw-r--r--src/mame/drivers/tandy1t.cpp4
-rw-r--r--src/mame/drivers/tasman.cpp4
-rw-r--r--src/mame/drivers/vega.cpp2
-rw-r--r--src/mame/drivers/xtheball.cpp4
-rw-r--r--src/mame/drivers/z80dev.cpp2
-rw-r--r--src/mame/includes/mario.h1
-rw-r--r--src/mame/machine/amiga.cpp20
-rw-r--r--src/mame/machine/apple2.cpp12
-rw-r--r--src/mame/machine/apple2gs.cpp4
-rw-r--r--src/mame/machine/bbc.cpp2
-rw-r--r--src/mame/machine/decocass.cpp112
-rw-r--r--src/mame/machine/gaelcrpt.cpp2
-rw-r--r--src/mame/machine/harddriv.cpp20
-rw-r--r--src/mame/machine/hp48.cpp24
-rw-r--r--src/mame/machine/inder_sb.cpp10
-rw-r--r--src/mame/machine/kaneko_calc3.cpp4
-rw-r--r--src/mame/machine/konppc.cpp40
-rw-r--r--src/mame/machine/mac.cpp10
-rw-r--r--src/mame/machine/macpci.cpp6
-rw-r--r--src/mame/machine/mega32x.cpp28
-rw-r--r--src/mame/machine/megacdcd.cpp10
-rw-r--r--src/mame/machine/megadriv.cpp8
-rw-r--r--src/mame/machine/micropolis.cpp2
-rw-r--r--src/mame/machine/midwayic.cpp12
-rw-r--r--src/mame/machine/mpu4.cpp4
-rw-r--r--src/mame/machine/namco06.cpp2
-rw-r--r--src/mame/machine/namcos2.cpp6
-rw-r--r--src/mame/machine/nb1413m3.cpp30
-rw-r--r--src/mame/machine/sgi.cpp170
-rw-r--r--src/mame/machine/slapstic.cpp2
-rw-r--r--src/mame/machine/snes.cpp2
-rw-r--r--src/mame/machine/stvprot.cpp2
-rw-r--r--src/mame/machine/thomflop.cpp2
-rw-r--r--src/mame/video/antic.cpp4
-rw-r--r--src/mame/video/fmtowns.cpp6
-rw-r--r--src/mame/video/k001006.cpp2
-rw-r--r--src/mame/video/k001604.cpp4
-rw-r--r--src/mame/video/k007121.cpp2
-rw-r--r--src/mame/video/k007342.cpp2
-rw-r--r--src/mame/video/k051316.cpp6
-rw-r--r--src/mame/video/k053244_k053245.cpp2
-rw-r--r--src/mame/video/k053246_k053247_k055673.cpp14
-rw-r--r--src/mame/video/k053251.cpp4
-rw-r--r--src/mame/video/leland.cpp8
-rw-r--r--src/mame/video/mitchell.cpp2
-rw-r--r--src/mame/video/namcos2.cpp2
112 files changed, 545 insertions, 545 deletions
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index c51fec97fde..6c4fd311f4b 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -231,7 +231,7 @@ READ8_MEMBER( epson_tf20_device::rom_disable_r )
READ8_MEMBER( epson_tf20_device::upd765_tc_r )
{
- logerror("%s: upd765_tc_r\n", space.machine().describe_context());
+ logerror("%s: upd765_tc_r\n", machine().describe_context());
// toggle tc on read
m_fdc->tc_w(true);
@@ -242,7 +242,7 @@ READ8_MEMBER( epson_tf20_device::upd765_tc_r )
WRITE8_MEMBER( epson_tf20_device::fdc_control_w )
{
- logerror("%s: tf20_fdc_control_w(%02x)\n", space.machine().describe_context(), data);
+ logerror("%s: tf20_fdc_control_w(%02x)\n", machine().describe_context(), data);
// bit 0, motor on signal
m_fd0->mon_w(!BIT(data, 0));
diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp
index f1cf4c936b1..a946af78b03 100644
--- a/src/devices/bus/isa/svga_cirrus.cpp
+++ b/src/devices/bus/isa/svga_cirrus.cpp
@@ -67,7 +67,7 @@ isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa16_svga_cirrus_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_svga_cirrus_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa16_svga_cirrus_device::device_start()
{
@@ -148,7 +148,7 @@ isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_c
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa16_svga_cirrus_gd542x_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_svga_cirrus_gd542x_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa16_svga_cirrus_gd542x_device::device_start()
{
diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp
index 6bd0f7815de..d290dbe6b91 100644
--- a/src/devices/bus/isa/svga_s3.cpp
+++ b/src/devices/bus/isa/svga_s3.cpp
@@ -77,7 +77,7 @@ isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa16_svga_s3_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_svga_s3_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa16_svga_s3_device::device_start()
{
@@ -184,7 +184,7 @@ isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa16_s3virge_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_s3virge_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa16_s3virge_device::device_start()
{
@@ -266,7 +266,7 @@ isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, co
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa16_s3virgedx_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_s3virgedx_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa16_s3virgedx_device::device_start()
{
@@ -349,7 +349,7 @@ isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &m
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa16_stealth3d2kpro_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_stealth3d2kpro_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa16_stealth3d2kpro_device::device_start()
{
diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp
index 39eba2e5c95..88223bff1a1 100644
--- a/src/devices/bus/isa/svga_trident.cpp
+++ b/src/devices/bus/isa/svga_trident.cpp
@@ -67,7 +67,7 @@ isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mco
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa16_svga_tgui9680_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_svga_tgui9680_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa16_svga_tgui9680_device::device_start()
{
diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp
index 52ac79c832b..91a88416c20 100644
--- a/src/devices/bus/isa/svga_tseng.cpp
+++ b/src/devices/bus/isa/svga_tseng.cpp
@@ -66,7 +66,7 @@ isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, cons
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa8_svga_et4k_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa8_svga_et4k_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa8_svga_et4k_device::device_start()
{
diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp
index 8919e742c94..604d2b13eb7 100644
--- a/src/devices/bus/isa/vga.cpp
+++ b/src/devices/bus/isa/vga.cpp
@@ -56,7 +56,7 @@ isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag,
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER( isa8_vga_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER( isa8_vga_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa8_vga_device::device_start()
{
diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp
index 02143c9c4ad..b9cf8af71a1 100644
--- a/src/devices/bus/isa/vga_ati.cpp
+++ b/src/devices/bus/isa/vga_ati.cpp
@@ -157,9 +157,9 @@ isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig,
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
-READ8_MEMBER(isa16_vga_gfxultra_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
-READ8_MEMBER(isa16_vga_gfxultrapro_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
-READ8_MEMBER(isa16_vga_mach64_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_vga_gfxultra_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_vga_gfxultrapro_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
+READ8_MEMBER(isa16_vga_mach64_device::input_port_0_r ) { return 0xff; } //return machine().root_device().ioport("IN0")->read(); }
void isa16_vga_gfxultra_device::device_start()
{
diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp
index 962033ab5c9..b508b67a036 100644
--- a/src/devices/bus/megadrive/rom.cpp
+++ b/src/devices/bus/megadrive/rom.cpp
@@ -628,47 +628,47 @@ READ16_MEMBER(md_rom_chinf3_device::read)
04dc10 chifi3, prot_r? 2800
04cefa chifi3, prot_r? 65262
*/
- if (space.machine().device("maincpu")->safe_pc() == 0x01782) // makes 'VS' screen appear
+ if (machine().device("maincpu")->safe_pc() == 0x01782) // makes 'VS' screen appear
{
- retdat = space.machine().device("maincpu")->state().state_int(M68K_D3) & 0xff;
+ retdat = machine().device("maincpu")->state().state_int(M68K_D3) & 0xff;
retdat <<= 8;
return retdat;
}
- else if (space.machine().device("maincpu")->safe_pc() == 0x1c24) // background gfx etc.
+ else if (machine().device("maincpu")->safe_pc() == 0x1c24) // background gfx etc.
{
- retdat = space.machine().device("maincpu")->state().state_int(M68K_D3) & 0xff;
+ retdat = machine().device("maincpu")->state().state_int(M68K_D3) & 0xff;
retdat <<= 8;
return retdat;
}
- else if (space.machine().device("maincpu")->safe_pc() == 0x10c4a) // unknown
+ else if (machine().device("maincpu")->safe_pc() == 0x10c4a) // unknown
{
- return space.machine().rand();
+ return machine().rand();
}
- else if (space.machine().device("maincpu")->safe_pc() == 0x10c50) // unknown
+ else if (machine().device("maincpu")->safe_pc() == 0x10c50) // unknown
{
- return space.machine().rand();
+ return machine().rand();
}
- else if (space.machine().device("maincpu")->safe_pc() == 0x10c52) // relates to the game speed..
+ else if (machine().device("maincpu")->safe_pc() == 0x10c52) // relates to the game speed..
{
- retdat = space.machine().device("maincpu")->state().state_int(M68K_D4) & 0xff;
+ retdat = machine().device("maincpu")->state().state_int(M68K_D4) & 0xff;
retdat <<= 8;
return retdat;
}
- else if (space.machine().device("maincpu")->safe_pc() == 0x061ae)
+ else if (machine().device("maincpu")->safe_pc() == 0x061ae)
{
- retdat = space.machine().device("maincpu")->state().state_int(M68K_D3) & 0xff;
+ retdat = machine().device("maincpu")->state().state_int(M68K_D3) & 0xff;
retdat <<= 8;
return retdat;
}
- else if (space.machine().device("maincpu")->safe_pc() == 0x061b0)
+ else if (machine().device("maincpu")->safe_pc() == 0x061b0)
{
- retdat = space.machine().device("maincpu")->state().state_int(M68K_D3) & 0xff;
+ retdat = machine().device("maincpu")->state().state_int(M68K_D3) & 0xff;
retdat <<= 8;
return retdat;
}
else
{
- logerror("%06x chifi3, prot_r? %04x\n", space.machine().device("maincpu")->safe_pc(), offset);
+ logerror("%06x chifi3, prot_r? %04x\n", machine().device("maincpu")->safe_pc(), offset);
}
return 0;
}
@@ -1304,7 +1304,7 @@ READ16_MEMBER(md_rom_topf_device::read)
if (offset == 0x6f5344/2)
{
if (space.device().safe_pc()==0x4C94E)
- return space.machine().device("maincpu")->state().state_int((M68K_D0)) & 0xff;
+ return machine().device("maincpu")->state().state_int((M68K_D0)) & 0xff;
else
{
m_latch++;
diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp
index 3156e6814ec..fe0f4e4ac80 100644
--- a/src/devices/bus/spc1000/fdd.cpp
+++ b/src/devices/bus/spc1000/fdd.cpp
@@ -35,7 +35,7 @@ WRITE8_MEMBER(spc1000_fdd_exp_device::i8255_c_w)
READ8_MEMBER( spc1000_fdd_exp_device::tc_r )
{
- logerror("%s: tc_r\n", space.machine().describe_context());
+ logerror("%s: tc_r\n", machine().describe_context());
// toggle tc on read
m_fdc->tc_w(true);
@@ -46,7 +46,7 @@ READ8_MEMBER( spc1000_fdd_exp_device::tc_r )
WRITE8_MEMBER( spc1000_fdd_exp_device::control_w )
{
- logerror("%s: control_w(%02x)\n", space.machine().describe_context(), data);
+ logerror("%s: control_w(%02x)\n", machine().describe_context(), data);
// bit 0, motor on signal
if (m_fd0)
diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp
index 61a94d8316f..cc9918ac111 100644
--- a/src/devices/cpu/es5510/es5510.cpp
+++ b/src/devices/cpu/es5510/es5510.cpp
@@ -360,7 +360,7 @@ READ8_MEMBER(es5510_device::host_r)
// printf("%06x: DSP read offset %04x (data is %04x)\n",space.device().safe_pc(),offset,dsp_ram[offset]);
// VFX hack
- if (core_stricmp(space.machine().system().name, "vfx") == 0)
+ if (core_stricmp(machine().system().name, "vfx") == 0)
{
if (space.device().safe_pc() == 0xc091f0)
{
diff --git a/src/devices/machine/68307bus.cpp b/src/devices/machine/68307bus.cpp
index dc1571087d8..f06f586fb7e 100644
--- a/src/devices/machine/68307bus.cpp
+++ b/src/devices/machine/68307bus.cpp
@@ -23,15 +23,15 @@ READ8_MEMBER( m68307_cpu_device::m68307_internal_mbus_r )
{
case m68307BUS_MADR:
logerror("%08x m68307_internal_mbus_r %08x (MADR - M-Bus Address Register)\n", m_ppc, offset);
- return space.machine().rand();
+ return machine().rand();
case m68307BUS_MFDR:
logerror("%08x m68307_internal_mbus_r %08x (MFDR - M-Bus Frequency Divider Register)\n", m_ppc, offset);
- return space.machine().rand();
+ return machine().rand();
case m68307BUS_MBCR:
logerror("%08x m68307_internal_mbus_r %08x (MFCR - M-Bus Control Register)\n", m_ppc, offset);
- return mbus.m_MFCR;//space.machine().rand();
+ return mbus.m_MFCR;//machine().rand();
case m68307BUS_MBSR:
logerror("%08x m68307_internal_mbus_r %08x (MBSR - M-Bus Status Register)\n", m_ppc, offset);
@@ -44,7 +44,7 @@ READ8_MEMBER( m68307_cpu_device::m68307_internal_mbus_r )
case m68307BUS_MBDR:
logerror("%08x m68307_internal_mbus_r %08x (MBDR - M-Bus Data I/O Register)\n", m_ppc, offset);
mbus.m_intpend = true;
- return 0xff;//space.machine().rand();
+ return 0xff;//machine().rand();
default:
logerror("%08x m68307_internal_mbus_r %08x (UNKNOWN / ILLEGAL)\n", m_ppc, offset);
diff --git a/src/devices/machine/68340sim.cpp b/src/devices/machine/68340sim.cpp
index 601830f7515..a9506f32944 100644
--- a/src/devices/machine/68340sim.cpp
+++ b/src/devices/machine/68340sim.cpp
@@ -200,7 +200,7 @@ READ8_MEMBER( m68340_cpu_device::m68340_internal_sim_ports_r )
assert(m_m68340SIM);
m68340_sim &sim = *m_m68340SIM;
- int val = space.machine().rand();
+ int val = machine().rand();
switch (offset)
{
diff --git a/src/devices/machine/autoconfig.cpp b/src/devices/machine/autoconfig.cpp
index 8125272ee83..2b272f814cc 100644
--- a/src/devices/machine/autoconfig.cpp
+++ b/src/devices/machine/autoconfig.cpp
@@ -124,7 +124,7 @@ READ16_MEMBER( amiga_autoconfig::autoconfig_read )
{
uint16_t data = m_cfg[offset] | 0x0fff;
- if (VERBOSE && !space.machine().side_effect_disabled())
+ if (VERBOSE && !dynamic_cast<device_t *>(this)->machine().side_effect_disabled())
space.device().logerror("autoconfig_read %04x @ %02x [mask = %04x]\n", data, offset, mem_mask);
return data;
@@ -132,7 +132,7 @@ READ16_MEMBER( amiga_autoconfig::autoconfig_read )
WRITE16_MEMBER( amiga_autoconfig::autoconfig_write )
{
- if (VERBOSE && !space.machine().side_effect_disabled())
+ if (VERBOSE && !dynamic_cast<device_t *>(this)->machine().side_effect_disabled())
space.device().logerror("autoconfig_write %04x @ %02x [mask = %04x]\n", data, offset, mem_mask);
switch (offset)
diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp
index e20e1b94cb6..3b5ca84b556 100644
--- a/src/devices/machine/e05a03.cpp
+++ b/src/devices/machine/e05a03.cpp
@@ -92,7 +92,7 @@ void e05a03_device::device_reset()
WRITE8_MEMBER( e05a03_device::write )
{
- logerror("%s: e05a03_w(%02x): %02x\n", space.machine().describe_context(), offset, data);
+ logerror("%s: e05a03_w(%02x): %02x\n", machine().describe_context(), offset, data);
switch (offset)
{
@@ -131,7 +131,7 @@ READ8_MEMBER( e05a03_device::read )
{
uint8_t result = 0;
- logerror("%s: e05a03_r(%02x)\n", space.machine().describe_context(), offset);
+ logerror("%s: e05a03_r(%02x)\n", machine().describe_context(), offset);
switch (offset)
{
diff --git a/src/devices/machine/e05a30.cpp b/src/devices/machine/e05a30.cpp
index a9b59f41d02..4857c75bc3d 100644
--- a/src/devices/machine/e05a30.cpp
+++ b/src/devices/machine/e05a30.cpp
@@ -164,7 +164,7 @@ WRITE_LINE_MEMBER( e05a30_device::centronics_input_strobe )
WRITE8_MEMBER( e05a30_device::write )
{
- LOG("%s: e05a30_w([0xC0%02x]): %02x\n", space.machine().describe_context(), offset, data);
+ LOG("%s: e05a30_w([0xC0%02x]): %02x\n", machine().describe_context(), offset, data);
switch (offset) {
case 0x04:
@@ -194,7 +194,7 @@ READ8_MEMBER( e05a30_device::read )
{
uint8_t result = 0;
- LOG("%s: e05a30_r([0xC0%02x]): ", space.machine().describe_context(), offset);
+ LOG("%s: e05a30_r([0xC0%02x]): ", machine().describe_context(), offset);
switch (offset) {
case 0x02:
diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp
index afe912a7d0d..8780643c2e3 100644
--- a/src/devices/machine/mc146818.cpp
+++ b/src/devices/machine/mc146818.cpp
@@ -528,7 +528,7 @@ READ8_MEMBER( mc146818_device::read )
// Update In Progress (UIP) time for 32768 Hz is 244+1984usec
/// TODO: support other dividers
/// TODO: don't set this if update is stopped
- if ((space.machine().time() - m_last_refresh) < attotime::from_usec(244+1984))
+ if ((machine().time() - m_last_refresh) < attotime::from_usec(244+1984))
data |= REG_A_UIP;
break;
diff --git a/src/devices/machine/mc6846.cpp b/src/devices/machine/mc6846.cpp
index 2c2c1abb497..56b2a49f786 100644
--- a/src/devices/machine/mc6846.cpp
+++ b/src/devices/machine/mc6846.cpp
@@ -290,7 +290,7 @@ READ8_MEMBER(mc6846_device::read)
case 0:
case 4:
LOG( "%s %f: mc6846 CSR read $%02X intr=%i (timer=%i, cp1=%i, cp2=%i)\n",
- machine().describe_context(), space.machine().time().as_double(),
+ machine().describe_context(), machine().time().as_double(),
m_csr, (m_csr >> 7) & 1,
m_csr & 1, (m_csr >> 1) & 1, (m_csr >> 2) & 1 );
m_csr0_to_be_cleared = m_csr & 1;
@@ -299,15 +299,15 @@ READ8_MEMBER(mc6846_device::read)
return m_csr;
case 1:
- LOG( "%s %f: mc6846 PCR read $%02X\n", machine().describe_context(), space.machine().time().as_double(), m_pcr );
+ LOG( "%s %f: mc6846 PCR read $%02X\n", machine().describe_context(), machine().time().as_double(), m_pcr );
return m_pcr;
case 2:
- LOG( "%s %f: mc6846 DDR read $%02X\n", machine().describe_context(), space.machine().time().as_double(), m_ddr );
+ LOG( "%s %f: mc6846 DDR read $%02X\n", machine().describe_context(), machine().time().as_double(), m_ddr );
return m_ddr;
case 3:
- LOG( "%s %f: mc6846 PORT read $%02X\n", machine().describe_context(), space.machine().time().as_double(), PORT );
+ LOG( "%s %f: mc6846 PORT read $%02X\n", machine().describe_context(), machine().time().as_double(), PORT );
if ( ! (m_pcr & 0x80) )
{
if ( m_csr1_to_be_cleared )
@@ -321,11 +321,11 @@ READ8_MEMBER(mc6846_device::read)
return PORT;
case 5:
- LOG( "%s %f: mc6846 TCR read $%02X\n",machine().describe_context(), space.machine().time().as_double(), m_tcr );
+ LOG( "%s %f: mc6846 TCR read $%02X\n",machine().describe_context(), machine().time().as_double(), m_tcr );
return m_tcr;
case 6:
- LOG( "%s %f: mc6846 COUNTER hi read $%02X\n", machine().describe_context(), space.machine().time().as_double(), counter() >> 8 );
+ LOG( "%s %f: mc6846 COUNTER hi read $%02X\n", machine().describe_context(), machine().time().as_double(), counter() >> 8 );
if ( m_csr0_to_be_cleared )
{
m_csr &= ~1;
@@ -335,7 +335,7 @@ READ8_MEMBER(mc6846_device::read)
return counter() >> 8;
case 7:
- LOG( "%s %f: mc6846 COUNTER low read $%02X\n", machine().describe_context(), space.machine().time().as_double(), counter() & 0xff );
+ LOG( "%s %f: mc6846 COUNTER low read $%02X\n", machine().describe_context(), machine().time().as_double(), counter() & 0xff );
if ( m_csr0_to_be_cleared )
{
m_csr &= ~1;
@@ -375,7 +375,7 @@ WRITE8_MEMBER(mc6846_device::write)
"latcged,pos-edge", "latcged,pos-edge,intr"
};
LOG( "%s %f: mc6846 PCR write $%02X reset=%i cp2=%s cp1=%s\n",
- machine().describe_context(), space.machine().time().as_double(), data,
+ machine().describe_context(), machine().time().as_double(), data,
(data >> 7) & 1, cp2[ (data >> 3) & 7 ], cp1[ data & 7 ] );
}
@@ -403,7 +403,7 @@ WRITE8_MEMBER(mc6846_device::write)
break;
case 2:
- LOG( "%s %f: mc6846 DDR write $%02X\n", machine().describe_context(), space.machine().time().as_double(), data );
+ LOG( "%s %f: mc6846 DDR write $%02X\n", machine().describe_context(), machine().time().as_double(), data );
if ( ! (m_pcr & 0x80) )
{
m_ddr = data;
@@ -413,7 +413,7 @@ WRITE8_MEMBER(mc6846_device::write)
break;
case 3:
- LOG( "%s %f: mc6846 PORT write $%02X (mask=$%02X)\n", machine().describe_context(), space.machine().time().as_double(), data,m_ddr );
+ LOG( "%s %f: mc6846 PORT write $%02X (mask=$%02X)\n", machine().describe_context(), machine().time().as_double(), data,m_ddr );
if ( ! (m_pcr & 0x80) )
{
m_pdr = data;
@@ -422,12 +422,12 @@ WRITE8_MEMBER(mc6846_device::write)
if ( m_csr1_to_be_cleared && (m_csr & 2) )
{
m_csr &= ~2;
- LOG( "%s %f: mc6846 CP1 intr reset\n", machine().describe_context(), space.machine().time().as_double() );
+ LOG( "%s %f: mc6846 CP1 intr reset\n", machine().describe_context(), machine().time().as_double() );
}
if ( m_csr2_to_be_cleared && (m_csr & 4) )
{
m_csr &= ~4;
- LOG( "%s %f: mc6846 CP2 intr reset\n", machine().describe_context(), space.machine().time().as_double() );
+ LOG( "%s %f: mc6846 CP2 intr reset\n", machine().describe_context(), machine().time().as_double() );
}
m_csr1_to_be_cleared = 0;
m_csr2_to_be_cleared = 0;
@@ -443,7 +443,7 @@ WRITE8_MEMBER(mc6846_device::write)
"freq-cmp", "freq-cmp", "pulse-cmp", "pulse-cmp"
};
LOG( "%s %f: mc6846 TCR write $%02X reset=%i clock=%s scale=%i mode=%s out=%s\n",
- machine().describe_context(), space.machine().time().as_double(), data,
+ machine().describe_context(), machine().time().as_double(), data,
(data >> 7) & 1, (data & 0x40) ? "extern" : "sys",
(data & 0x40) ? 1 : 8, mode[ (data >> 1) & 7 ],
(data & 1) ? "enabled" : "0" );
@@ -477,7 +477,7 @@ WRITE8_MEMBER(mc6846_device::write)
case 7:
m_latch = ( ((uint16_t) m_time_MSB) << 8 ) + data;
- LOG( "%s %f: mc6846 COUNT write %i\n", machine().describe_context(), space.machine().time().as_double(), m_latch );
+ LOG( "%s %f: mc6846 COUNT write %i\n", machine().describe_context(), machine().time().as_double(), m_latch );
if (!(m_tcr & 0x38))
{
/* timer initialization */
diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp
index c5789cd0e39..43e09eba5d2 100644
--- a/src/devices/machine/mc6854.cpp
+++ b/src/devices/machine/mc6854.cpp
@@ -816,7 +816,7 @@ READ8_MEMBER( mc6854_device::read )
case 0: /* status register 1 */
update_sr1( );
LOG( "%f %s mc6854_r: get SR1=$%02X (rda=%i,s2rq=%i,fd=%i,cts=%i,tu=%i,tdra=%i,irq=%i)\n",
- space.machine().time().as_double(), machine().describe_context(), m_sr1,
+ machine().time().as_double(), machine().describe_context(), m_sr1,
( m_sr1 & RDA) ? 1 : 0, ( m_sr1 & S2RQ) ? 1 : 0,
( m_sr1 & FD ) ? 1 : 0, ( m_sr1 & CTS ) ? 1 : 0,
( m_sr1 & TU ) ? 1 : 0, ( m_sr1 & TDRA) ? 1 : 0,
@@ -826,7 +826,7 @@ READ8_MEMBER( mc6854_device::read )
case 1: /* status register 2 */
update_sr2( );
LOG( "%f %s mc6854_r: get SR2=$%02X (ap=%i,fv=%i,ridle=%i,rabt=%i,err=%i,dcd=%i,ovrn=%i,rda2=%i)\n",
- space.machine().time().as_double(), machine().describe_context(), m_sr2,
+ machine().time().as_double(), machine().describe_context(), m_sr2,
( m_sr2 & AP ) ? 1 : 0, ( m_sr2 & FV ) ? 1 : 0,
( m_sr2 & RIDLE) ? 1 : 0, ( m_sr2 & RABT) ? 1 : 0,
( m_sr2 & ERR ) ? 1 : 0, ( m_sr2 & DCD ) ? 1 : 0,
@@ -838,7 +838,7 @@ READ8_MEMBER( mc6854_device::read )
{
uint8_t data = rfifo_pop( );
LOG( "%f %s mc6854_r: get data $%02X\n",
- space.machine().time().as_double(), machine().describe_context(), data );
+ machine().time().as_double(), machine().describe_context(), data );
return data;
}
@@ -857,7 +857,7 @@ WRITE8_MEMBER( mc6854_device::write )
case 0: /* control register 1 */
m_cr1 = data;
LOG( "%f %s mc6854_w: set CR1=$%02X (ac=%i,irq=%c%c,%sreset=%c%c)\n",
- space.machine().time().as_double(), machine().describe_context(), m_cr1,
+ machine().time().as_double(), machine().describe_context(), m_cr1,
AC ? 1 : 0,
RIE ? 'r' : '-', TIE ? 't' : '-',
DISCONTINUE ? "discontinue," : "",
@@ -893,7 +893,7 @@ WRITE8_MEMBER( mc6854_device::write )
/* control register 3 */
m_cr3 = data;
LOG( "%f %s mc6854_w: set CR3=$%02X (lcf=%i,aex=%i,idl=%i,fdse=%i,loop=%i,tst=%i,dtr=%i)\n",
- space.machine().time().as_double(), machine().describe_context(), m_cr3,
+ machine().time().as_double(), machine().describe_context(), m_cr3,
LCF ? (CEX ? 16 : 8) : 0, AEX ? 1 : 0,
IDL0 ? 0 : 1, FDSE ? 1 : 0, LOOP ? 1 : 0,
TST ? 1 : 0, DTR ? 1 : 0 );
@@ -910,7 +910,7 @@ WRITE8_MEMBER( mc6854_device::write )
/* control register 2 */
m_cr2 = data;
LOG( "%f %s mc6854_w: set CR2=$%02X (pse=%i,bytes=%i,fmidle=%i,%s,tlast=%i,clr=%c%c,rts=%i)\n",
- space.machine().time().as_double(), machine().describe_context(), m_cr2,
+ machine().time().as_double(), machine().describe_context(), m_cr2,
PSE ? 1 : 0, TWOBYTES ? 2 : 1, FMIDLE ? 1 : 0,
FCTDRA ? "fc" : "tdra", TLAST ? 1 : 0,
data & 0x20 ? 'r' : '-', data & 0x40 ? 't' : '-',
@@ -940,7 +940,7 @@ WRITE8_MEMBER( mc6854_device::write )
break;
case 2: /* transmitter data: continue data */
- LOG( "%f %smc6854_w: push data=$%02X\n", space.machine().time().as_double(), machine().describe_context(), data );
+ LOG( "%f %smc6854_w: push data=$%02X\n", machine().time().as_double(), machine().describe_context(), data );
tfifo_push( data );
break;
@@ -949,7 +949,7 @@ WRITE8_MEMBER( mc6854_device::write )
{
/* control register 4 */
m_cr4 = data;
- LOG( "%f %s mc6854_w: set CR4=$%02X (interframe=%i,tlen=%i,rlen=%i,%s%s)\n", space.machine().time().as_double(), machine().describe_context(), m_cr4,
+ LOG( "%f %s mc6854_w: set CR4=$%02X (interframe=%i,tlen=%i,rlen=%i,%s%s)\n", machine().time().as_double(), machine().describe_context(), m_cr4,
TWOINTER ? 2 : 1,
TWL, RWL,
ABT ? ( ABTEX ? "abort-ext," : "abort,") : "",
@@ -964,7 +964,7 @@ WRITE8_MEMBER( mc6854_device::write )
else
{
/* transmitter data: last data */
- LOG( "%f %s mc6854_w: push last-data=$%02X\n", space.machine().time().as_double(), machine().describe_context(), data );
+ LOG( "%f %s mc6854_w: push last-data=$%02X\n", machine().time().as_double(), machine().describe_context(), data );
tfifo_push( data );
tfifo_terminate( );
}
diff --git a/src/devices/machine/mos6530.cpp b/src/devices/machine/mos6530.cpp
index fab2f925d70..2b50efd9b47 100644
--- a/src/devices/machine/mos6530.cpp
+++ b/src/devices/machine/mos6530.cpp
@@ -199,7 +199,7 @@ WRITE8_MEMBER( mos6530_device::write )
if (offset & 0x04)
{
static const uint8_t timershift[4] = { 0, 3, 6, 10 };
- attotime curtime = space.machine().time();
+ attotime curtime = machine().time();
int64_t target;
/* A0-A1 contain the timer divisor */
diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp
index 3af94decb70..7909f56ee80 100644
--- a/src/devices/machine/v3021.cpp
+++ b/src/devices/machine/v3021.cpp
@@ -174,7 +174,7 @@ WRITE8_MEMBER( v3021_device::write )
break;
case 0xf: //Load Date
- //space.machine().base_datetime(m_systime);
+ //machine().base_datetime(m_systime);
break;
}
}
diff --git a/src/devices/sound/scsp.cpp b/src/devices/sound/scsp.cpp
index 9ca21c9db55..78ea2dc3d77 100644
--- a/src/devices/sound/scsp.cpp
+++ b/src/devices/sound/scsp.cpp
@@ -1056,9 +1056,9 @@ unsigned short scsp_device::r16(address_space &space, unsigned int addr)
*/
logerror("SCSP: Reading from EXTS register %08x\n",addr);
if(addr == 0xee0)
- v = space.machine().device<cdda_device>("cdda")->get_channel_volume(0);
+ v = machine().device<cdda_device>("cdda")->get_channel_volume(0);
if(addr == 0xee2)
- v = space.machine().device<cdda_device>("cdda")->get_channel_volume(1);
+ v = machine().device<cdda_device>("cdda")->get_channel_volume(1);
}
}
return v;
@@ -1376,7 +1376,7 @@ void scsp_device::exec_dma(address_space &space)
if(m_udata.data[0x1e/2] & 0x10)
{
popmessage("SCSP DMA IRQ triggered, contact MAMEdev");
- space.machine().device("audiocpu")->execute().set_input_line(DecodeSCI(SCIDMA),HOLD_LINE);
+ machine().device("audiocpu")->execute().set_input_line(DecodeSCI(SCIDMA),HOLD_LINE);
}
}
diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp
index b0ca59b160a..71fbe5b80a6 100644
--- a/src/devices/video/epic12.cpp
+++ b/src/devices/video/epic12.cpp
@@ -828,7 +828,7 @@ READ32_MEMBER( epic12_device::blitter_r )
return 0xffffffff;
case 0x50:
- return space.machine().root_device().ioport(":DSW")->read();
+ return machine().root_device().ioport(":DSW")->read();
default:
logerror("unknownblitter_r %08x %08x\n", offset*4, mem_mask);
@@ -852,7 +852,7 @@ READ32_MEMBER( epic12_device::blitter_r_unsafe )
return 0xffffffff;
case 0x50:
- return space.machine().root_device().ioport(":DSW")->read();
+ return machine().root_device().ioport(":DSW")->read();
default:
logerror("unknownblitter_r %08x %08x\n", offset*4, mem_mask);
diff --git a/src/devices/video/imagetek_i4100.cpp b/src/devices/video/imagetek_i4100.cpp
index 1897f5951fc..ea9d1ad46ff 100644
--- a/src/devices/video/imagetek_i4100.cpp
+++ b/src/devices/video/imagetek_i4100.cpp
@@ -623,7 +623,7 @@ void imagetek_i4100_device::blt_write( address_space &space, const int tmap, con
case 2: vram_1_w(space, offs, data, mask); break;
case 3: vram_2_w(space, offs, data, mask); break;
}
-// logerror("%s : Blitter %X] %04X <- %04X & %04X\n", space.machine().describe_context(), tmap, offs, data, mask);
+// logerror("%s : Blitter %X] %04X <- %04X & %04X\n", machine().describe_context(), tmap, offs, data, mask);
}
/***************************************************************************
diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp
index daf617a445b..249ebc6a0fd 100644
--- a/src/devices/video/pc_vga.cpp
+++ b/src/devices/video/pc_vga.cpp
@@ -1611,8 +1611,8 @@ READ8_MEMBER(vga_device::vga_crtc_r)
vga.attribute.state = 0;
data = 0;
- hsync = space.machine().first_screen()->hblank() & 1;
- vsync = vga_vblank(); //space.machine().first_screen()->vblank() & 1;
+ hsync = machine().first_screen()->hblank() & 1;
+ vsync = vga_vblank(); //machine().first_screen()->vblank() & 1;
data |= (hsync | vsync) & 1; // DD - display disable register
data |= (vsync & 1) << 3; // VRetrace register
@@ -1663,10 +1663,10 @@ WRITE8_MEMBER(vga_device::vga_crtc_w)
}
crtc_reg_write(vga.crtc.index,data);
- //space.machine().first_screen()->update_partial(space.machine().first_screen()->vpos());
+ //machine().first_screen()->update_partial(machine().first_screen()->vpos());
#if 0
if((vga.crtc.index & 0xfe) != 0x0e)
- printf("%02x %02x %d\n",vga.crtc.index,data,space.machine().first_screen()->vpos());
+ printf("%02x %02x %d\n",vga.crtc.index,data,machine().first_screen()->vpos());
#endif
break;
@@ -2591,7 +2591,7 @@ WRITE8_MEMBER(tseng_vga_device::port_03d0_w)
vga.crtc.data[vga.crtc.index] = data;
tseng_crtc_reg_write(vga.crtc.index,data);
//if((vga.crtc.index & 0xfe) != 0x0e)
- // printf("%02x %02x %d\n",vga.crtc.index,data,space.machine().first_screen()->vpos());
+ // printf("%02x %02x %d\n",vga.crtc.index,data,machine().first_screen()->vpos());
break;
case 8:
et4k.reg_3d8 = data;
diff --git a/src/devices/video/tms34061.cpp b/src/devices/video/tms34061.cpp
index 7947dd59875..e2d47731921 100644
--- a/src/devices/video/tms34061.cpp
+++ b/src/devices/video/tms34061.cpp
@@ -191,7 +191,7 @@ void tms34061_device::register_w(address_space &space, offs_t offset, uint8_t da
}
/* log it */
- LOG("%s:tms34061 %s = %04x\n", space.machine().describe_context(), regnames[regnum], m_regs[regnum]);
+ LOG("%s:tms34061 %s = %04x\n", machine().describe_context(), regnames[regnum], m_regs[regnum]);
/* update the state of things */
switch (regnum)
@@ -269,7 +269,7 @@ uint8_t tms34061_device::register_r(address_space &space, offs_t offset)
}
/* log it */
- LOG("%s:tms34061 %s read = %04X\n", space.machine().describe_context(), regnames[regnum], result);
+ LOG("%s:tms34061 %s read = %04X\n", machine().describe_context(), regnames[regnum], result);
return (offset & 0x02) ? (result >> 8) : result;
}
@@ -376,7 +376,7 @@ void tms34061_device::xypixel_w(address_space &space, int offset, uint8_t data)
/* mask to the VRAM size */
pixeloffs &= m_vrammask;
- LOG("%s:tms34061 xy (%04x) = %02x/%02x\n", space.machine().describe_context(), pixeloffs, data, m_latchdata);
+ LOG("%s:tms34061 xy (%04x) = %02x/%02x\n", machine().describe_context(), pixeloffs, data, m_latchdata);
/* set the pixel data */
m_vram[pixeloffs] = data;
@@ -432,7 +432,7 @@ void tms34061_device::write(address_space &space, int col, int row, int func, ui
offs = ((row << m_rowshift) | col) & m_vrammask;
if (m_regs[TMS34061_CONTROL2] & 0x0040)
offs |= (m_regs[TMS34061_CONTROL2] & 3) << 16;
- LOG("%s:tms34061 direct (%04x) = %02x/%02x\n", space.machine().describe_context(), offs, data, m_latchdata);
+ LOG("%s:tms34061 direct (%04x) = %02x/%02x\n", machine().describe_context(), offs, data, m_latchdata);
if (m_vram[offs] != data || m_latchram[offs] != m_latchdata)
{
m_vram[offs] = data;
@@ -446,7 +446,7 @@ void tms34061_device::write(address_space &space, int col, int row, int func, ui
if (m_regs[TMS34061_CONTROL2] & 0x0040)
offs |= (m_regs[TMS34061_CONTROL2] & 3) << 16;
offs &= m_vrammask;
- LOG("%s:tms34061 shiftreg write (%04x)\n", space.machine().describe_context(), offs);
+ LOG("%s:tms34061 shiftreg write (%04x)\n", machine().describe_context(), offs);
memcpy(&m_vram[offs], m_shiftreg, (size_t)1 << m_rowshift);
memset(&m_latchram[offs], m_latchdata, (size_t)1 << m_rowshift);
@@ -458,14 +458,14 @@ void tms34061_device::write(address_space &space, int col, int row, int func, ui
if (m_regs[TMS34061_CONTROL2] & 0x0040)
offs |= (m_regs[TMS34061_CONTROL2] & 3) << 16;
offs &= m_vrammask;
- LOG("%s:tms34061 shiftreg read (%04x)\n", space.machine().describe_context(), offs);
+ LOG("%s:tms34061 shiftreg read (%04x)\n", machine().describe_context(), offs);
m_shiftreg = &m_vram[offs];
break;
/* log anything else */
default:
- logerror("%s:Unsupported TMS34061 function %d\n", space.machine().describe_context(), func);
+ logerror("%s:Unsupported TMS34061 function %d\n", machine().describe_context(), func);
break;
}
}
@@ -519,7 +519,7 @@ uint8_t tms34061_device::read(address_space &space, int col, int row, int func)
/* log anything else */
default:
- logerror("%s:Unsupported TMS34061 function %d\n", space.machine().describe_context(),
+ logerror("%s:Unsupported TMS34061 function %d\n", machine().describe_context(),
func);
break;
}
diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
index 17c26191186..3c58a2168c5 100644
--- a/src/emu/debug/debugcpu.cpp
+++ b/src/emu/debug/debugcpu.cpp
@@ -2711,7 +2711,7 @@ void device_debug::watchpoint_update_flags(address_space &space)
void device_debug::watchpoint_check(address_space& space, int type, offs_t address, u64 value_to_write, u64 mem_mask)
{
- space.machine().debugger().cpu().watchpoint_check(space, type, address, value_to_write, mem_mask, m_wplist);
+ m_device.machine().debugger().cpu().watchpoint_check(space, type, address, value_to_write, mem_mask, m_wplist);
}
void debugger_cpu::watchpoint_check(address_space& space, int type, offs_t address, u64 value_to_write, u64 mem_mask, std::vector<device_debug::watchpoint *> &wplist)
@@ -2829,7 +2829,7 @@ void device_debug::hotspot_check(address_space &space, offs_t address)
// if the bottom of the list is over the threshold, print it
hotspot_entry &spot = m_hotspots[m_hotspots.size() - 1];
if (spot.m_count > m_hotspot_threshhold)
- space.machine().debugger().console().printf("Hotspot @ %s %08X (PC=%08X) hit %d times (fell off bottom)\n", space.name(), spot.m_access, spot.m_pc, spot.m_count);
+ m_device.machine().debugger().console().printf("Hotspot @ %s %08X (PC=%08X) hit %d times (fell off bottom)\n", space.name(), spot.m_access, spot.m_pc, spot.m_count);
// move everything else down and insert this one at the top
memmove(&m_hotspots[1], &m_hotspots[0], sizeof(m_hotspots[0]) * (m_hotspots.size() - 1));
diff --git a/src/emu/emumem.cpp b/src/emu/emumem.cpp
index bbbf3b59fda..8997c418c9c 100644
--- a/src/emu/emumem.cpp
+++ b/src/emu/emumem.cpp
@@ -4219,7 +4219,7 @@ template class direct_read_data<-3>;
//-------------------------------------------------
memory_block::memory_block(address_space &space, offs_t addrstart, offs_t addrend, void *memory)
- : m_machine(space.machine()),
+ : m_machine(machine()),
m_space(space),
m_addrstart(addrstart),
m_addrend(addrend),
@@ -4252,7 +4252,7 @@ memory_block::memory_block(address_space &space, offs_t addrstart, offs_t addren
{
int bytes_per_element = space.data_width() / 8;
std::string name = string_format("%08x-%08x", addrstart, addrend);
- space.machine().save().save_memory(&space.device(), "memory", space.device().tag(), space.spacenum(), name.c_str(), m_data, bytes_per_element, (u32)length / bytes_per_element);
+ machine().save().save_memory(&space.device(), "memory", space.device().tag(), space.spacenum(), name.c_str(), m_data, bytes_per_element, (u32)length / bytes_per_element);
}
}
@@ -4276,7 +4276,7 @@ memory_block::~memory_block()
//-------------------------------------------------
memory_bank::memory_bank(address_space &space, int index, offs_t addrstart, offs_t addrend, const char *tag)
- : m_machine(space.machine()),
+ : m_machine(machine()),
m_baseptr(space.manager().bank_pointer_addr(index)),
m_index(index),
m_anonymous(tag == nullptr),
@@ -4296,8 +4296,8 @@ memory_bank::memory_bank(address_space &space, int index, offs_t addrstart, offs
m_name = string_format("Bank '%s'", tag);
}
- if (!m_anonymous && space.machine().save().registration_allowed())
- space.machine().save().save_item(&space.device(), "memory", m_tag.c_str(), 0, NAME(m_curentry));
+ if (!m_anonymous && machine().save().registration_allowed())
+ machine().save().save_item(&space.device(), "memory", m_tag.c_str(), 0, NAME(m_curentry));
}
diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp
index 77248c18140..1c8a3dd38f9 100644
--- a/src/mame/audio/atarijsa.cpp
+++ b/src/mame/audio/atarijsa.cpp
@@ -408,8 +408,8 @@ WRITE8_MEMBER( atari_jsa_oki_base_device::wrio_w )
m_cpu_bank->set_entry((data >> 6) & 3);
// coin counters
- space.machine().bookkeeping().coin_counter_w(1, (data >> 5) & 1);
- space.machine().bookkeeping().coin_counter_w(0, (data >> 4) & 1);
+ machine().bookkeeping().coin_counter_w(1, (data >> 5) & 1);
+ machine().bookkeeping().coin_counter_w(0, (data >> 4) & 1);
// update the OKI frequency
if (m_oki1 != nullptr)
diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp
index aa425ab0767..a40869dd62d 100644
--- a/src/mame/audio/exidy.cpp
+++ b/src/mame/audio/exidy.cpp
@@ -406,11 +406,11 @@ void exidy_sound_device::r6532_irq(int state)
WRITE8_MEMBER( exidy_sound_device::r6532_porta_w )
{
if (m_cvsd != nullptr)
- space.machine().device("cvsdcpu")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
+ machine().device("cvsdcpu")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
if (m_tms != nullptr)
{
- logerror("(%f)%s:TMS5220 data write = %02X\n", space.machine().time().as_double(), space.machine().describe_context(), m_riot->porta_out_get());
+ logerror("(%f)%s:TMS5220 data write = %02X\n", machine().time().as_double(), machine().describe_context(), m_riot->porta_out_get());
m_tms->data_w(space, 0, data);
}
}
@@ -419,7 +419,7 @@ READ8_MEMBER( exidy_sound_device::r6532_porta_r )
{
if (m_tms != nullptr)
{
- logerror("(%f)%s:TMS5220 status read = %02X\n", space.machine().time().as_double(), space.machine().describe_context(), m_tms->status_r(space, 0));
+ logerror("(%f)%s:TMS5220 status read = %02X\n", machine().time().as_double(), machine().describe_context(), m_tms->status_r(space, 0));
return m_tms->status_r(space, 0);
}
else
@@ -874,7 +874,7 @@ WRITE8_MEMBER( victory_sound_device::command_w )
{
if (VICTORY_LOG_SOUND) logerror("%04X:!!!! Sound command = %02X\n", m_maincpu->pcbase(), data);
- space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(victory_sound_device::delayed_command_w), this), data);
+ machine().scheduler().synchronize(timer_expired_delegate(FUNC(victory_sound_device::delayed_command_w), this), data);
}
diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp
index d625f75f717..313be4ebb15 100644
--- a/src/mame/audio/exidy440.cpp
+++ b/src/mame/audio/exidy440.cpp
@@ -217,7 +217,7 @@ void exidy440_sound_device::mix_to_16(int length, stream_sample_t *dest_left, st
READ8_MEMBER( exidy440_sound_device::sound_command_r )
{
/* clear the FIRQ that got us here and acknowledge the read to the main CPU */
- space.machine().device("audiocpu")->execute().set_input_line(1, CLEAR_LINE);
+ machine().device("audiocpu")->execute().set_input_line(1, CLEAR_LINE);
m_sound_command_ack = 1;
return m_sound_command;
@@ -272,7 +272,7 @@ WRITE8_MEMBER( exidy440_sound_device::sound_volume_w )
WRITE8_MEMBER( exidy440_sound_device::sound_interrupt_clear_w )
{
- space.machine().device("audiocpu")->execute().set_input_line(0, CLEAR_LINE);
+ machine().device("audiocpu")->execute().set_input_line(0, CLEAR_LINE);
}
diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp
index 877c11ebf82..d08bb3b4ead 100644
--- a/src/mame/audio/hng64.cpp
+++ b/src/mame/audio/hng64.cpp
@@ -91,7 +91,7 @@ WRITE32_MEMBER(hng64_state::hng64_soundram_w)
logerror("dumping sound program in m_soundram\n");
FILE *fp;
char filename[256];
- sprintf(filename,"soundram_%s", space.machine().system().name);
+ sprintf(filename,"soundram_%s", machine().system().name);
fp=fopen(filename, "w+b");
if (fp)
{
diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp
index 3013f95dcd5..2a42453fbd1 100644
--- a/src/mame/audio/leland.cpp
+++ b/src/mame/audio/leland.cpp
@@ -452,7 +452,7 @@ WRITE8_MEMBER( leland_80186_sound_device::leland_80186_control_w )
the next command, it uses an NMI to force the issue; unfortunately, this
seems to really screw up the sound system. It turns out it's better to
just wait for the original interrupt to occur naturally */
-/* space.machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE);*/
+/* machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE);*/
/* INT0 */
m_audiocpu->int0_w(data & 0x20);
diff --git a/src/mame/audio/m72.cpp b/src/mame/audio/m72.cpp
index d7a30e94673..ba5f99bd90f 100644
--- a/src/mame/audio/m72.cpp
+++ b/src/mame/audio/m72.cpp
@@ -128,12 +128,12 @@ WRITE_LINE_MEMBER(m72_audio_device::ym2151_irq_handler)
WRITE8_MEMBER( m72_audio_device::sound_command_w )
{
m_soundlatch->write(*m_space, offset, data);
- space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(m72_audio_device::setvector_callback), this), Z80_ASSERT);
+ machine().scheduler().synchronize(timer_expired_delegate(FUNC(m72_audio_device::setvector_callback), this), Z80_ASSERT);
}
WRITE8_MEMBER( m72_audio_device::sound_irq_ack_w )
{
- space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(m72_audio_device::setvector_callback), this), Z80_CLEAR);
+ machine().scheduler().synchronize(timer_expired_delegate(FUNC(m72_audio_device::setvector_callback), this), Z80_CLEAR);
}
diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp
index d309c8f7402..504c372a6bb 100644
--- a/src/mame/audio/mario.cpp
+++ b/src/mame/audio/mario.cpp
@@ -33,7 +33,7 @@
#if (USE_8039)
#define I8035_P2_W(M,D) do { m_soundlatch4->write(M,0,D); } while (0)
#else
-#define I8035_P2_W(M,D) do { set_ea(M, ((D) & 0x20) ? 0 : 1); m_soundlatch4->write(M,0,D); } while (0)
+#define I8035_P2_W(M,D) do { set_ea(((D) & 0x20) ? 0 : 1); m_soundlatch4->write(M,0,D); } while (0)
#endif
#define I8035_P1_W_AH(M,B,D) I8035_P1_W(M,ACTIVEHIGH_PORT_BIT(I8035_P1_R(M),B,(D)))
@@ -402,13 +402,12 @@ DISCRETE_SOUND_END
*
****************************************************************/
-static void set_ea(address_space &space, int ea)
+void mario_state::set_ea(int ea)
{
- mario_state *state = space.machine().driver_data<mario_state>();
//printf("ea: %d\n", ea);
- //machine.device("audiocpu")->execute().set_input_line(MCS48_INPUT_EA, (ea) ? ASSERT_LINE : CLEAR_LINE);
- if (state->m_eabank != nullptr)
- state->membank(state->m_eabank)->set_entry(ea);
+ //machine().device("audiocpu")->execute().set_input_line(MCS48_INPUT_EA, (ea) ? ASSERT_LINE : CLEAR_LINE);
+ if (m_eabank != nullptr)
+ membank(m_eabank)->set_entry(ea);
}
/****************************************************************
@@ -445,7 +444,7 @@ void mario_state::sound_reset()
address_space &space = machine().device("audiocpu")->memory().space(AS_PROGRAM);
#if USE_8039
- set_ea(space, 1);
+ set_ea(1);
#endif
/* FIXME: convert to latch8 */
diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp
index 8feb39e98df..1671c23c25f 100644
--- a/src/mame/audio/segasnd.cpp
+++ b/src/mame/audio/segasnd.cpp
@@ -173,7 +173,7 @@ TIMER_CALLBACK_MEMBER( speech_sound_device::delayed_speech_w )
WRITE8_MEMBER( speech_sound_device::data_w )
{
- space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(speech_sound_device::delayed_speech_w), this), data);
+ machine().scheduler().synchronize(timer_expired_delegate(FUNC(speech_sound_device::delayed_speech_w), this), data);
}
@@ -418,10 +418,10 @@ TIMER_CALLBACK_MEMBER( usb_sound_device::delayed_usb_data_w )
WRITE8_MEMBER( usb_sound_device::data_w )
{
LOG("%04X:usb_data_w = %02X\n", m_maincpu->safe_pc(), data);
- space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(usb_sound_device::delayed_usb_data_w), this), data);
+ machine().scheduler().synchronize(timer_expired_delegate(FUNC(usb_sound_device::delayed_usb_data_w), this), data);
/* boost the interleave so that sequences can be sent */
- space.machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(250));
+ machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(250));
}
diff --git a/src/mame/audio/seibu.cpp b/src/mame/audio/seibu.cpp
index 8a13fd94f5b..d6534dec5e2 100644
--- a/src/mame/audio/seibu.cpp
+++ b/src/mame/audio/seibu.cpp
@@ -217,8 +217,8 @@ WRITE8_MEMBER( seibu_sound_device::bank_w )
WRITE8_MEMBER( seibu_sound_device::coin_w )
{
- space.machine().bookkeeping().coin_counter_w(0, data & 1);
- space.machine().bookkeeping().coin_counter_w(1, data & 2);
+ machine().bookkeeping().coin_counter_w(0, data & 1);
+ machine().bookkeeping().coin_counter_w(1, data & 2);
}
READ8_MEMBER( seibu_sound_device::soundlatch_r )
diff --git a/src/mame/audio/snes_snd.cpp b/src/mame/audio/snes_snd.cpp
index 65c746dfbf6..86f6fb80536 100644
--- a/src/mame/audio/snes_snd.cpp
+++ b/src/mame/audio/snes_snd.cpp
@@ -1134,7 +1134,7 @@ WRITE8_MEMBER( snes_sound_device::spc_io_w )
case 0x7: /* Port 3 */
// osd_printf_debug("SPC: %02x to APU @ %d (PC=%x)\n", data, offset & 3, space.device().safe_pc());
m_port_out[offset - 4] = data;
- space.machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(20));
+ machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(20));
break;
case 0xa: /* Timer 0 */
case 0xb: /* Timer 1 */
diff --git a/src/mame/audio/svis_snd.cpp b/src/mame/audio/svis_snd.cpp
index 8d1f30aa204..2f881e9db95 100644
--- a/src/mame/audio/svis_snd.cpp
+++ b/src/mame/audio/svis_snd.cpp
@@ -161,7 +161,7 @@ void svision_sound_device::sound_stream_update(sound_stream &stream, stream_samp
WRITE8_MEMBER( svision_sound_device::sounddma_w )
{
- logerror("%.6f svision snddma write %04x %02x\n", space.machine().time().as_double(),offset+0x18,data);
+ logerror("%.6f svision snddma write %04x %02x\n", machine().time().as_double(),offset+0x18,data);
m_dma.reg[offset] = data;
switch (offset)
{
@@ -173,7 +173,7 @@ WRITE8_MEMBER( svision_sound_device::sounddma_w )
m_dma.size = (data ? data : 0x100) * 32;
break;
case 3:
- m_dma.step = space.machine().device("maincpu")->unscaled_clock() / (256.0 * space.machine().sample_rate() * (1 + (data & 3)));
+ m_dma.step = machine().device("maincpu")->unscaled_clock() / (256.0 * machine().sample_rate() * (1 + (data & 3)));
m_dma.right = data & 4;
m_dma.left = data & 8;
m_dma.ca14to16 = ((data & 0x70) >> 4) << 14;
@@ -197,7 +197,7 @@ WRITE8_MEMBER( svision_sound_device::noise_w )
{
case 0:
m_noise.volume=data&0xf;
- m_noise.step= space.machine().device("maincpu")->unscaled_clock() / (256.0*space.machine().sample_rate()*(1+(data>>4)));
+ m_noise.step= machine().device("maincpu")->unscaled_clock() / (256.0*machine().sample_rate()*(1+(data>>4)));
break;
case 1:
m_noise.count = data + 1;
diff --git a/src/mame/audio/trackfld.cpp b/src/mame/audio/trackfld.cpp
index 5e979f97b48..44a0dee3b03 100644
--- a/src/mame/audio/trackfld.cpp
+++ b/src/mame/audio/trackfld.cpp
@@ -58,7 +58,7 @@ void trackfld_audio_device::device_reset()
READ8_MEMBER( trackfld_audio_device::trackfld_sh_timer_r )
{
- uint32_t clock = space.machine().device<cpu_device>("audiocpu")->total_cycles() / TIMER_RATE;
+ uint32_t clock = machine().device<cpu_device>("audiocpu")->total_cycles() / TIMER_RATE;
return clock & 0xF;
}
diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp
index 486da6330e6..8c6da07ca78 100644
--- a/src/mame/audio/tx1.cpp
+++ b/src/mame/audio/tx1.cpp
@@ -435,18 +435,18 @@ WRITE8_MEMBER( buggyboy_sound_device::ym2_a_w )
WRITE8_MEMBER( buggyboy_sound_device::ym2_b_w )
{
- device_t *ym1 = space.machine().device("ym1");
- device_t *ym2 = space.machine().device("ym2");
+ device_t *ym1 = machine().device("ym1");
+ device_t *ym2 = machine().device("ym2");
double gain;
m_stream->update();
m_ym2_outputb = data ^ 0xff;
- if (!strcmp(space.machine().system().name, "buggyboyjr"))
+ if (!strcmp(machine().system().name, "buggyboyjr"))
{
- space.machine().bookkeeping().coin_counter_w(0, data & 0x01);
- space.machine().bookkeeping().coin_counter_w(1, data & 0x02);
+ machine().bookkeeping().coin_counter_w(0, data & 0x01);
+ machine().bookkeeping().coin_counter_w(1, data & 0x02);
}
/*
diff --git a/src/mame/audio/wswan.cpp b/src/mame/audio/wswan.cpp
index 37f7c6288ab..f86afd635af 100644
--- a/src/mame/audio/wswan.cpp
+++ b/src/mame/audio/wswan.cpp
@@ -326,7 +326,7 @@ WRITE8_MEMBER( wswan_sound_device::port_w )
break;
case 0x8D: /* Sweep time */
- m_sweep_time = space.machine().sample_rate() / ( 3072000 / ( 8192 * (data + 1) ) );
+ m_sweep_time = machine().sample_rate() / ( 3072000 / ( 8192 * (data + 1) ) );
break;
case 0x8E: /* Noise control */
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index 9299a474805..c4790652148 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -425,16 +425,16 @@ READ8_MEMBER(agat7_state::flags_r)
return ((m_joybuttons->read() & 0x40) || !(m_kbspecial->read() & 0x06)) ? 0x80 : 0;
case 4: // joy 1 X axis
- return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
case 5: // joy 1 Y axis
- return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
case 6: // joy 2 X axis
- return (space.machine().time().as_double() < m_joystick_x2_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_x2_time) ? 0x80 : 0;
case 7: // joy 2 Y axis
- return (space.machine().time().as_double() < m_joystick_y2_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_y2_time) ? 0x80 : 0;
}
// this is never reached
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index 0527d461daf..12e44b49892 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -636,16 +636,16 @@ READ8_MEMBER(napple2_state::flags_r)
return (m_joybuttons->read() & 0x40) ? 0x80 : 0;
case 4: // joy 1 X axis
- return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
case 5: // joy 1 Y axis
- return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
case 6: // joy 2 X axis
- return (space.machine().time().as_double() < m_joystick_x2_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_x2_time) ? 0x80 : 0;
case 7: // joy 2 Y axis
- return (space.machine().time().as_double() < m_joystick_y2_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_y2_time) ? 0x80 : 0;
}
// this is never reached
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index cd97f6e4a0d..8eb1f04fb0b 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -1528,7 +1528,7 @@ READ8_MEMBER(apple2e_state::c000_r)
return m_80store ? 0x80 : 0x00;
case 0x19: // read VBLBAR
- return space.machine().first_screen()->vblank() ? 0x00 : 0x80;
+ return machine().first_screen()->vblank() ? 0x00 : 0x80;
case 0x1a: // read TEXT
return m_video->m_graphics ? 0x00 : 0x80;
@@ -1570,19 +1570,19 @@ READ8_MEMBER(apple2e_state::c000_r)
case 0x64: // joy 1 X axis
case 0x6c:
- return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
case 0x65: // joy 1 Y axis
case 0x6d:
- return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
case 0x66: // joy 2 X axis
case 0x6e:
- return (space.machine().time().as_double() < m_joystick_x2_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_x2_time) ? 0x80 : 0;
case 0x67: // joy 2 Y axis
case 0x6f:
- return (space.machine().time().as_double() < m_joystick_y2_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_y2_time) ? 0x80 : 0;
case 0x7e: // read IOUDIS
return m_ioudis ? 0x80 : 0x00;
@@ -1838,11 +1838,11 @@ READ8_MEMBER(apple2e_state::c000_iic_r)
case 0x64: // joy 1 X axis
case 0x6c:
- return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
case 0x65: // joy 1 Y axis
case 0x6d:
- return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
+ return (machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
case 0x66: // mouse X1 (IIc only)
case 0x6e:
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index ea5d9a8e4a6..41f89e0c2e9 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -301,7 +301,7 @@ uint32_t bmcpokr_state::screen_update_bmcpokr(screen_device &screen, bitmap_ind1
READ16_MEMBER(bmcpokr_state::unk_r)
{
- return space.machine().rand();
+ return machine().rand();
}
// Hack!
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index f4aab089c3e..d7083bbb429 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -370,7 +370,7 @@ MACHINE_RESET_MEMBER( cdi_state, quizard4 )
READ8_MEMBER( cdi_state::servo_io_r )
{
- if (space.machine().side_effect_disabled())
+ if (machine().side_effect_disabled())
{
return 0;
}
@@ -570,7 +570,7 @@ WRITE8_MEMBER( cdi_state::servo_io_w )
READ8_MEMBER( cdi_state::slave_io_r )
{
- if (space.machine().side_effect_disabled())
+ if (machine().side_effect_disabled())
{
return 0;
}
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index 3f03cdbc884..117571c8cb4 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -1670,7 +1670,7 @@ WRITE64_MEMBER(cobra_state::main_fifo_w)
if (m_main_debug_state == 0x6b)
{
// install HD patches for bujutsu
- if (strcmp(space.machine().system().name, "bujutsu") == 0)
+ if (strcmp(machine().system().name, "bujutsu") == 0)
{
uint32_t *main_ram = (uint32_t*)(uint64_t*)m_main_ram;
uint32_t *sub_ram = (uint32_t*)m_sub_ram;
@@ -1685,7 +1685,7 @@ WRITE64_MEMBER(cobra_state::main_fifo_w)
gfx_ram[(0x38632c^4) / 4] = 0x38600000; // skip check_one_scene()
}
// racjamdx
- else if (strcmp(space.machine().system().name, "racjamdx") == 0)
+ else if (strcmp(machine().system().name, "racjamdx") == 0)
{
}
}
diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp
index 4fdeb9a63a0..0e55422b88b 100644
--- a/src/mame/drivers/coolridr.cpp
+++ b/src/mame/drivers/coolridr.cpp
@@ -1355,7 +1355,7 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
if (b2colorNumber != b1colorNumber)
{
- // b1colorNumber = space.machine().rand()&0xfff;
+ // b1colorNumber = machine().rand()&0xfff;
}
// if(b1colorNumber > 0x60 || b2colorNumber)
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index 1129d1aef94..98ed50d17de 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -1806,8 +1806,8 @@ READ8_MEMBER(ddenlovr_state::quiz365_input_r )
if (!BIT(m_dsw_sel, 0)) return ioport("DSW1")->read();
if (!BIT(m_dsw_sel, 1)) return ioport("DSW2")->read();
if (!BIT(m_dsw_sel, 2)) return ioport("DSW3")->read();
- if (!BIT(m_dsw_sel, 3)) return 0xff;//space.machine().rand();
- if (!BIT(m_dsw_sel, 4)) return 0xff;//space.machine().rand();
+ if (!BIT(m_dsw_sel, 3)) return 0xff;//machine().rand();
+ if (!BIT(m_dsw_sel, 4)) return 0xff;//machine().rand();
return 0xff;
}
@@ -3159,7 +3159,7 @@ READ8_MEMBER(ddenlovr_state::hginga_dsw_r )
if (!BIT(m_dsw_sel, 3)) return ioport("DSW1")->read();
if (!BIT(m_dsw_sel, 4)) return ioport("DSW5")->read();
- logerror("%s: warning, unknown bits read, ddenlovr_select = %02x\n", space.machine().describe_context(), m_dsw_sel);
+ logerror("%s: warning, unknown bits read, ddenlovr_select = %02x\n", machine().describe_context(), m_dsw_sel);
return 0xff;
}
@@ -4054,7 +4054,7 @@ READ8_MEMBER(ddenlovr_state::seljan2_dsw_r )
if (!BIT(m_dsw_sel, 3)) return ioport("DSW4")->read();
if (!BIT(m_dsw_sel, 4)) return ioport("DSWTOP")->read();
- logerror("%s: warning, unknown bits read, ddenlovr_select = %02x\n", space.machine().describe_context(), m_dsw_sel);
+ logerror("%s: warning, unknown bits read, ddenlovr_select = %02x\n", machine().describe_context(), m_dsw_sel);
return 0xff;
}
diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp
index 51c36f22378..d046e0e777d 100644
--- a/src/mame/drivers/eolith.cpp
+++ b/src/mame/drivers/eolith.cpp
@@ -1613,7 +1613,7 @@ void eolith_state::speedup_read()
{
/* for debug */
//if ((space.device().safe_pc()!=m_speedup_address) && (m_speedup_vblank!=1) )
- // printf("%s:eolith speedup_read data %02x\n",space.machine().describe_context(), m_speedup_vblank);
+ // printf("%s:eolith speedup_read data %02x\n",machine().describe_context(), m_speedup_vblank);
if (m_speedup_vblank==0 && m_speedup_scanline < m_speedup_resume_scanline)
{
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp
index c40715b13cc..1bc85c6beb6 100644
--- a/src/mame/drivers/fcrash.cpp
+++ b/src/mame/drivers/fcrash.cpp
@@ -196,7 +196,7 @@ WRITE16_MEMBER(cps_state::dinopic_layer_w)
m_cps_a_regs[0x14 / 2] = data;
break;
default:
- logerror("%s: Unknown layer cmd %X %X\n",space.machine().describe_context(),offset<<1,data);
+ logerror("%s: Unknown layer cmd %X %X\n",machine().describe_context(),offset<<1,data);
}
}
@@ -321,7 +321,7 @@ WRITE16_MEMBER(cps_state::punipic_layer_w)
// unknown
break;
default:
- logerror("%s: Unknown layer cmd %X %X\n",space.machine().describe_context(),offset<<1,data);
+ logerror("%s: Unknown layer cmd %X %X\n",machine().describe_context(),offset<<1,data);
}
}
@@ -379,7 +379,7 @@ WRITE16_MEMBER(cps_state::sf2m1_layer_w)
m_cps_a_regs[0x06 / 2] = data;
break;
default:
- logerror("%s: Unknown layer cmd %X %X\n",space.machine().describe_context(),offset<<1,data);
+ logerror("%s: Unknown layer cmd %X %X\n",machine().describe_context(),offset<<1,data);
}
}
diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp
index d1ee97d6419..63bcdc943d5 100644
--- a/src/mame/drivers/fitfight.cpp
+++ b/src/mame/drivers/fitfight.cpp
@@ -96,7 +96,7 @@ Stephh's notes :
READ16_MEMBER( fitfight_state::hotmindff_unk_r )
{
// won't boot unless things in here change, this is p1/p2 inputs in fitfight
- return space.machine().rand();
+ return machine().rand();
}
READ16_MEMBER(fitfight_state::fitfight_700000_r)
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index 2a831e969b2..c5ef4ff682d 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -1850,7 +1850,7 @@ READ8_MEMBER(towns_state::towns_cdrom_r)
m_towns_cd.cmd_status_ptr = 0;
/* if(m_towns_cd.extra_status != 0)
{
- towns_cdrom_set_irq(space.machine(),TOWNS_CD_IRQ_MPU,1);
+ towns_cdrom_set_irq(machine(),TOWNS_CD_IRQ_MPU,1);
m_towns_cd.status |= 0x02;
}*/
}
diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp
index 27d6c3eb1cc..b984c977d1c 100644
--- a/src/mame/drivers/ghosteo.cpp
+++ b/src/mame/drivers/ghosteo.cpp
@@ -271,7 +271,7 @@ READ32_MEMBER(ghosteo_state::s3c2410_core_pin_r)
WRITE8_MEMBER(ghosteo_state::s3c2410_nand_command_w )
{
struct nand_t &nand = m_nand;
-// device_t *nand = space.machine().device( "nand");
+// device_t *nand = machine().device( "nand");
#if NAND_LOG
logerror( "s3c2410_nand_command_w %02X\n", data);
#endif
@@ -296,7 +296,7 @@ WRITE8_MEMBER(ghosteo_state::s3c2410_nand_command_w )
WRITE8_MEMBER(ghosteo_state::s3c2410_nand_address_w )
{
struct nand_t &nand = m_nand;
-// device_t *nand = space.machine().device( "nand");
+// device_t *nand = machine().device( "nand");
#if NAND_LOG
logerror( "s3c2410_nand_address_w %02X\n", data);
#endif
@@ -331,7 +331,7 @@ WRITE8_MEMBER(ghosteo_state::s3c2410_nand_address_w )
READ8_MEMBER(ghosteo_state::s3c2410_nand_data_r )
{
struct nand_t &nand = m_nand;
-// device_t *nand = space.machine().device( "nand");
+// device_t *nand = machine().device( "nand");
uint8_t data = 0;
switch (nand.mode)
{
@@ -377,7 +377,7 @@ READ8_MEMBER(ghosteo_state::s3c2410_nand_data_r )
WRITE8_MEMBER(ghosteo_state::s3c2410_nand_data_w )
{
-// device_t *nand = space.machine().device( "nand");
+// device_t *nand = machine().device( "nand");
#if NAND_LOG
logerror( "s3c2410_nand_data_w %02X\n", data);
#endif
diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp
index 18ff03e7846..4d31a179bc8 100644
--- a/src/mame/drivers/hyprduel.cpp
+++ b/src/mame/drivers/hyprduel.cpp
@@ -276,7 +276,7 @@ void hyprduel_state::blt_write( address_space &space, const int tmap, const offs
case 2: vram_1_w(space, offs, data, mask); break;
case 3: vram_2_w(space, offs, data, mask); break;
}
-// logerror("%s : Blitter %X] %04X <- %04X & %04X\n", space.machine().describe_context(), tmap, offs, data, mask);
+// logerror("%s : Blitter %X] %04X <- %04X & %04X\n", machine().describe_context(), tmap, offs, data, mask);
}
diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp
index 147122baf07..665693ce2e2 100644
--- a/src/mame/drivers/laser3k.cpp
+++ b/src/mame/drivers/laser3k.cpp
@@ -465,10 +465,10 @@ READ8_MEMBER( laser3k_state::io2_r )
switch (offset)
{
case 0xc2: // h-blank status
- return space.machine().first_screen()->hblank() ? 0x80 : 0x00;
+ return machine().first_screen()->hblank() ? 0x80 : 0x00;
case 0xc3: // v-blank status
- return space.machine().first_screen()->vblank() ? 0x80 : 0x00;
+ return machine().first_screen()->vblank() ? 0x80 : 0x00;
case 0xc5: // CPU 1/2 MHz status?
return 0x00;
diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp
index 66321691122..d3404856ef2 100644
--- a/src/mame/drivers/mac128.cpp
+++ b/src/mame/drivers/mac128.cpp
@@ -636,7 +636,7 @@ READ16_MEMBER ( mac128_state::mac_iwm_r )
*/
uint16_t result = 0;
- applefdc_base_device *fdc = space.machine().device<applefdc_base_device>("fdc");
+ applefdc_base_device *fdc = machine().device<applefdc_base_device>("fdc");
result = fdc->read(offset >> 8);
@@ -648,7 +648,7 @@ READ16_MEMBER ( mac128_state::mac_iwm_r )
WRITE16_MEMBER ( mac128_state::mac_iwm_w )
{
- applefdc_base_device *fdc = space.machine().device<applefdc_base_device>("fdc");
+ applefdc_base_device *fdc = machine().device<applefdc_base_device>("fdc");
if (LOG_MAC_IWM)
printf("mac_iwm_w: offset=0x%08x data=0x%04x mask %04x (PC=%x)\n", offset, data, mem_mask, space.device().safe_pc());
diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp
index c5c8b27649a..02d87412bf9 100644
--- a/src/mame/drivers/magictg.cpp
+++ b/src/mame/drivers/magictg.cpp
@@ -351,7 +351,7 @@ static void voodoo_0_pci_w(device_t *busdevice, device_t *device, int function,
#if defined(USE_TWO_3DFX)
static uint32_t voodoo_1_pci_r(device_t *busdevice, device_t *device, int function, int reg, uint32_t mem_mask)
{
- magictg_state* state = space.machine().driver_data<magictg_state>();
+ magictg_state* state = machine().driver_data<magictg_state>();
uint32_t val = 0;
switch (reg)
@@ -373,7 +373,7 @@ static uint32_t voodoo_1_pci_r(device_t *busdevice, device_t *device, int functi
static void voodoo_1_pci_w(device_t *busdevice, device_t *device, int function, int reg, uint32_t data, uint32_t mem_mask)
{
- magictg_state* state = space.machine().driver_data<magictg_state>();
+ magictg_state* state = machine().driver_data<magictg_state>();
switch (reg)
{
@@ -490,7 +490,7 @@ READ32_MEMBER( magictg_state::zr36120_r )
else
{
/* Post office */
- res = 0;//mame_rand(space.machine);//m_zr36120.as_regs[0x48/4];
+ res = 0;//mame_rand(machine);//m_zr36120.as_regs[0x48/4];
}
osd_printf_debug("PINKEYE_R[%x]\n", offset);
return res;
@@ -728,7 +728,7 @@ WRITE32_MEMBER( magictg_state::adsp_idma_addr_w )
READ32_MEMBER( magictg_state::adsp_status_r )
{
// ADSP_IACK = Bit 2
- return (0 << 2) | (space.machine().rand() & 1);
+ return (0 << 2) | (machine().rand() & 1);
}
READ16_MEMBER( magictg_state::adsp_control_r )
@@ -741,7 +741,7 @@ READ16_MEMBER( magictg_state::adsp_control_r )
res = m_adsp_regs.bdma_word_count;
break;
case 0x5:
- res = space.machine().rand() & 0xff;
+ res = machine().rand() & 0xff;
break;
default:
osd_printf_debug("Unhandled register: %x\n", 0x3fe0 + offset);
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index 87168015871..b7c3ad3230c 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -261,11 +261,11 @@ uint32_t model2_state::copro_fifoout_pop(address_space &space,uint32_t offset, u
{
if (m_copro_fifoout_num == COPRO_FIFOOUT_SIZE)
{
- space.machine().device<adsp21062_device>("dsp")->set_flag_input(1, ASSERT_LINE);
+ machine().device<adsp21062_device>("dsp")->set_flag_input(1, ASSERT_LINE);
}
else
{
- space.machine().device<adsp21062_device>("dsp")->set_flag_input(1, CLEAR_LINE);
+ machine().device<adsp21062_device>("dsp")->set_flag_input(1, CLEAR_LINE);
}
}
diff --git a/src/mame/drivers/neogeocd.cpp b/src/mame/drivers/neogeocd.cpp
index 1a5cb72ceaf..ad036ce7699 100644
--- a/src/mame/drivers/neogeocd.cpp
+++ b/src/mame/drivers/neogeocd.cpp
@@ -282,7 +282,7 @@ WRITE16_MEMBER(ngcd_state::neocd_control_w)
case 0x0126:
// bprintf(PRINT_NORMAL, _T(" - NGCD Z80 BUSREQ -> 1 (PC: 0x%06X)\n"), SekGetPC(-1));
m_has_z80_bus = false;
- space.machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
m_audiocpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
break;
case 0x0128:
@@ -301,7 +301,7 @@ WRITE16_MEMBER(ngcd_state::neocd_control_w)
case 0x0146:
// bprintf(PRINT_NORMAL, _T(" - NGCD Z80 BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1));
m_has_z80_bus = true;
- space.machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
m_audiocpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
break;
case 0x0148:
diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp
index dc5131cbed5..9b0ab46570c 100644
--- a/src/mame/drivers/proconn.cpp
+++ b/src/mame/drivers/proconn.cpp
@@ -136,7 +136,7 @@ public:
/* PIO 1 */
DECLARE_WRITE_LINE_MEMBER(pio_1_m_out_int_w) { /* logerror("pio_1_m_out_int_w %02x\n", state); */ }
- DECLARE_READ8_MEMBER(pio_1_m_in_pa_r) { logerror("pio_1_m_in_pa_r (INPUT MATRIX)\n"); return space.machine().rand(); }
+ DECLARE_READ8_MEMBER(pio_1_m_in_pa_r) { logerror("pio_1_m_in_pa_r (INPUT MATRIX)\n"); return machine().rand(); }
DECLARE_WRITE8_MEMBER(pio_1_m_out_pa_w) { logerror("pio_1_m_out_pa_w %02x\n", data); }
DECLARE_WRITE_LINE_MEMBER(pio_1_m_out_ardy_w) { logerror("pio_1_m_out_ardy_w %02x\n", state); }
DECLARE_READ8_MEMBER(pio_1_m_in_pb_r) { logerror("pio_1_m_in_pb_r\n"); return 0x00; }
diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp
index 5edb895b736..5ee07ec4398 100644
--- a/src/mame/drivers/r9751.cpp
+++ b/src/mame/drivers/r9751.cpp
@@ -228,7 +228,7 @@ READ32_MEMBER( r9751_state::r9751_mmio_5ff_r )
if(TRACE_DEVICE)
if(((offset << 2) & 0xFF) == TRACE_DEVICE * 4)
- logerror("(!) Device Read: 0x%02X - PC: %08X Register: %08X\n", TRACE_DEVICE, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ logerror("(!) Device Read: 0x%02X - PC: %08X Register: %08X\n", TRACE_DEVICE, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
switch(offset << 2)
{
@@ -237,7 +237,7 @@ READ32_MEMBER( r9751_state::r9751_mmio_5ff_r )
return 0x10;
case 0x3024: /* HDD SCSI command completed successfully */
data = 0x1;
- if(TRACE_HDC) logerror("SCSI HDD command completion status - Read: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_HDC) logerror("SCSI HDD command completion status - Read: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
return data;
/* SMIOC region (0x98, device 26) */
case 0x0898: /* Serial status or DMA status */
@@ -256,10 +256,10 @@ READ32_MEMBER( r9751_state::r9751_mmio_5ff_r )
return 0;
case 0x30B0: /* FDD command completion status */
data = (m_pdc->reg_p5 << 8) + m_pdc->reg_p4;
- if(TRACE_FDC && data != 0) logerror("--- SCSI FDD command completion status - Read: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_FDC && data != 0) logerror("--- SCSI FDD command completion status - Read: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
return data;
default:
- if(TRACE_FDC || TRACE_HDC || TRACE_SMIOC) logerror("Unknown read address: %08X PC: %08X\n", offset << 2 | 0x5FF00000, space.machine().firstcpu->pc());
+ if(TRACE_FDC || TRACE_HDC || TRACE_SMIOC) logerror("Unknown read address: %08X PC: %08X\n", offset << 2 | 0x5FF00000, machine().firstcpu->pc());
return 0;
}
}
@@ -268,36 +268,36 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w )
{
uint8_t data_b0, data_b1;
- //logerror("(!!) 0x5ff Register Write - PC: %08X Register: %08X Data: %08X\n", space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000, data);
+ //logerror("(!!) 0x5ff Register Write - PC: %08X Register: %08X Data: %08X\n", machine().firstcpu->pc(), offset << 2 | 0x5FF00000, data);
if(TRACE_DEVICE)
if(((offset << 2) & 0xFF) == TRACE_DEVICE * 4)
- logerror("(!) Device Write: 0x%02X - PC: %08X Register: %08X Data: %08X\n", TRACE_DEVICE, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000, data);
+ logerror("(!) Device Write: 0x%02X - PC: %08X Register: %08X Data: %08X\n", TRACE_DEVICE, machine().firstcpu->pc(), offset << 2 | 0x5FF00000, data);
/* Unknown mask */
if (mem_mask != 0xFFFFFFFF)
- logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0x5FF00000, space.machine().firstcpu->pc());
+ logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0x5FF00000, machine().firstcpu->pc());
switch(offset << 2)
{
/* PDC HDD region (0x24, device 9 */
case 0x0224: /* HDD SCSI read command */
- if(TRACE_HDC) logerror("@@@ HDD Command: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_HDC) logerror("@@@ HDD Command: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
break;
case 0x8024: /* HDD SCSI read command */
- if(TRACE_HDC) logerror("@@@ HDD Command: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_HDC) logerror("@@@ HDD Command: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
break;
case 0xC024: /* HDD SCSI read command */
- if(TRACE_HDC) logerror("@@@ HDD Command: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_HDC) logerror("@@@ HDD Command: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
break;
/* SMIOC region (0x98, device 26) - Output */
case 0x0298:
m_serial_status = data;
- if(TRACE_SMIOC) logerror("Serial status: %08X PC: %08X\n", data, space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial status: %08X PC: %08X\n", data, machine().firstcpu->pc());
break;
case 0x0270:
m_serial_status2 = data;
- if(TRACE_SMIOC) logerror("Serial status2: %08X PC: %08X\n", data, space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial status2: %08X PC: %08X\n", data, machine().firstcpu->pc());
break;
case 0x4090:
case 0x4098: /* Serial DMA Command */
@@ -306,19 +306,19 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w )
case 0x1000:
m_serial_status = 0x0140;
m_serial_status2 = 0x0140;
- if(TRACE_SMIOC) logerror("Serial DMA command 0x1000 PC: %08X\n", space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial DMA command 0x1000 PC: %08X\n", machine().firstcpu->pc());
break;
case 0x4100: /* Send byte to serial */
for(int i = 0; i < smioc_dma_w_length; i++)
{
- if(TRACE_SMIOC) logerror("Serial byte: %02X PC: %08X\n", m_mem->read_word(smioc_out_addr+i*2), space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial byte: %02X PC: %08X\n", m_mem->read_word(smioc_out_addr+i*2), machine().firstcpu->pc());
m_terminal->write(space,0,m_mem->read_word(smioc_out_addr+i*2));
}
m_serial_status = 0x4140;
break;
case 0x4200: /* Write XON into serial DMA input register (0x5FF0809C) memory location */
m_maincpu->space(AS_PROGRAM).write_byte(smioc_in_addr,0x11);
- if(TRACE_SMIOC) logerror("Serial DMA command 0x4200 (XON) PC: %08X\n", space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial DMA command 0x4200 (XON) PC: %08X\n", machine().firstcpu->pc());
m_serial_status = 0x4440;
break;
default:
@@ -329,39 +329,39 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w )
case 0xC098: /* Serial DMA output address */
//smioc_out_addr = data * 2;
smioc_out_addr = (smioc_dma_bank & 0x7FFFF800) | ((data&0x3FF)<<1);
- if(TRACE_SMIOC) logerror("Serial output address: %08X PC: %08X\n", smioc_out_addr, space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial output address: %08X PC: %08X\n", smioc_out_addr, machine().firstcpu->pc());
break;
/* SMIOC region (0x9C, device 27) - Input */
case 0x409C: /* Serial DMA write length */
smioc_dma_w_length = (~data+1) & 0xFFFF;
- if(TRACE_SMIOC) logerror("Serial DMA write length: %08X PC: %08X\n", smioc_dma_w_length, space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial DMA write length: %08X PC: %08X\n", smioc_dma_w_length, machine().firstcpu->pc());
if(smioc_dma_w_length > 0x400) smioc_dma_w_length = 0x400;
break;
case 0x809C: /* Serial DMA input address */
smioc_in_addr = (smioc_dma_bank & 0x7FFFF800) | ((data&0x3FF)<<1);
- if(TRACE_SMIOC) logerror("Serial input address: %08X PC: %08X\n", smioc_out_addr, space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial input address: %08X PC: %08X\n", smioc_out_addr, machine().firstcpu->pc());
break;
case 0xC09C: /* Serial DMA read length */
smioc_dma_r_length = (~data+1) & 0xFFFF;
- if(TRACE_SMIOC) logerror("Serial DMA read length: %08X PC: %08X\n", smioc_dma_r_length, space.machine().firstcpu->pc());
+ if(TRACE_SMIOC) logerror("Serial DMA read length: %08X PC: %08X\n", smioc_dma_r_length, machine().firstcpu->pc());
if(smioc_dma_r_length > 0x400) smioc_dma_r_length = 0x400;
break;
/* PDC FDD region (0xB0, device 44 */
case 0x01B0: /* FDD SCSI read command */
- if(TRACE_FDC) logerror("--- FDD Command: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_FDC) logerror("--- FDD Command: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
break;
case 0x02B0: /* FDD SCSI read command */
- if(TRACE_FDC) logerror("--- FDD Command: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_FDC) logerror("--- FDD Command: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
break;
case 0x04B0: /* FDD RESET PDC */
- if(TRACE_FDC) logerror("PDC RESET, PC: %08X DATA: %08X\n", space.machine().firstcpu->pc(),data);
+ if(TRACE_FDC) logerror("PDC RESET, PC: %08X DATA: %08X\n", machine().firstcpu->pc(),data);
m_pdc->reset();
break;
case 0x08B0: /* FDD SCSI read command */
- if(TRACE_FDC) logerror("--- FDD Command: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_FDC) logerror("--- FDD Command: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
break;
case 0x41B0: /* Unknown - Probably old style commands */
- if(TRACE_FDC) logerror("--- FDD Command: %08X, From: %08X, Register: %08X\n", data, space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
+ if(TRACE_FDC) logerror("--- FDD Command: %08X, From: %08X, Register: %08X\n", data, machine().firstcpu->pc(), offset << 2 | 0x5FF00000);
/* Clear FDD Command completion status 0x5FF030B0 (PDC 0x4, 0x5) */
m_pdc->reg_p4 = 0;
@@ -377,7 +377,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w )
case 0xC0B0:
case 0xC1B0: /* fdd_dest_address register */
fdd_dest_address = data << 1;
- if(TRACE_FDC) logerror("--- FDD destination address: %08X PC: %08X Register: %08X (A6+4): %08X\n", (fdd_dma_bank & 0x7FFFF800) + (fdd_dest_address&0x3FFFF), space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000, debug_a6());
+ if(TRACE_FDC) logerror("--- FDD destination address: %08X PC: %08X Register: %08X (A6+4): %08X\n", (fdd_dma_bank & 0x7FFFF800) + (fdd_dest_address&0x3FFFF), machine().firstcpu->pc(), offset << 2 | 0x5FF00000, debug_a6());
data_b0 = data & 0xFF;
data_b1 = (data & 0xFF00) >> 8;
m_pdc->reg_p6 = data_b0;
@@ -396,7 +396,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w )
m_pdc->reg_p5 = 0;
/* Send FDD SCSI command location address to PDC 0x2, 0x3 */
- if(TRACE_FDC) logerror("--- FDD command address: %08X PC: %08X Register: %08X (A6+4): %08X A4: %08X (A5): %08X (A5+20): %08X\n", (fdd_dma_bank & 0x7FFFF800) + ((data << 1)&0x3FFFF), space.machine().firstcpu->pc(), offset << 2 | 0x5FF00000, debug_a6(), ptr_m68000->state_int(M68K_A4), debug_a5(), debug_a5_20());
+ if(TRACE_FDC) logerror("--- FDD command address: %08X PC: %08X Register: %08X (A6+4): %08X A4: %08X (A5): %08X (A5+20): %08X\n", (fdd_dma_bank & 0x7FFFF800) + ((data << 1)&0x3FFFF), machine().firstcpu->pc(), offset << 2 | 0x5FF00000, debug_a6(), ptr_m68000->state_int(M68K_A4), debug_a5(), debug_a5_20());
data_b0 = data & 0xFF;
data_b1 = (data & 0xFF00) >> 8;
m_pdc->reg_p2 = data_b0;
@@ -422,7 +422,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_5ff_w )
break;
default:
- if(TRACE_FDC || TRACE_HDC || TRACE_SMIOC) logerror("Unknown write address: %08X Data: %08X PC: %08X\n", offset << 2 | 0x5FF00000, data, space.machine().firstcpu->pc());
+ if(TRACE_FDC || TRACE_HDC || TRACE_SMIOC) logerror("Unknown write address: %08X Data: %08X PC: %08X\n", offset << 2 | 0x5FF00000, data, machine().firstcpu->pc());
}
}
@@ -445,20 +445,20 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_ff01_w )
{
/* Unknown mask */
if (mem_mask != 0xFFFFFFFF)
- logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0xFF010000, space.machine().firstcpu->pc());
+ logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0xFF010000, machine().firstcpu->pc());
switch(offset << 2)
{
case 0x000C: /* FDD DMA Offset */
fdd_dma_bank = data;
- if(TRACE_DMA) logerror("Banking register(FDD): %08X PC: %08X Data: %08X\n", offset << 2 | 0xFF010000, space.machine().firstcpu->pc(), data);
+ if(TRACE_DMA) logerror("Banking register(FDD): %08X PC: %08X Data: %08X\n", offset << 2 | 0xFF010000, machine().firstcpu->pc(), data);
return;
case 0x0010: /* SMIOC DMA Offset */
smioc_dma_bank = data;
- if(TRACE_DMA) logerror("Banking register(SMIOC): %08X PC: %08X Data: %08X\n", offset << 2 | 0xFF010000, space.machine().firstcpu->pc(), data);
+ if(TRACE_DMA) logerror("Banking register(SMIOC): %08X PC: %08X Data: %08X\n", offset << 2 | 0xFF010000, machine().firstcpu->pc(), data);
return;
default:
- if(TRACE_DMA) logerror("Banking register(Unknown): %08X PC: %08X Data: %08X\n", offset << 2 | 0xFF010000, space.machine().firstcpu->pc(), data);
+ if(TRACE_DMA) logerror("Banking register(Unknown): %08X PC: %08X Data: %08X\n", offset << 2 | 0xFF010000, machine().firstcpu->pc(), data);
return;
}
}
@@ -483,7 +483,7 @@ READ32_MEMBER( r9751_state::r9751_mmio_ff05_r )
return 0x80;
default:
data = 0;
- if(TRACE_CPU_REG) logerror("Instruction: %08x READ MMIO(%08x): %08x & %08x\n", space.machine().firstcpu->pc(), offset << 2 | 0xFF050000, data, mem_mask);
+ if(TRACE_CPU_REG) logerror("Instruction: %08x READ MMIO(%08x): %08x & %08x\n", machine().firstcpu->pc(), offset << 2 | 0xFF050000, data, mem_mask);
return data;
}
}
@@ -492,7 +492,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_ff05_w )
{
/* Unknown mask */
if (mem_mask != 0xFFFFFFFF)
- logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0xFF050000, space.machine().firstcpu->pc());
+ logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0xFF050000, machine().firstcpu->pc());
switch(offset << 2)
{
@@ -500,13 +500,13 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_ff05_w )
reg_ff050004 = data;
return;
case 0x000C: /* CPU LED hex display indicator */
- if(TRACE_LED) logerror("\n*** LED: %02x, Instruction: %08x ***\n\n", data, space.machine().firstcpu->pc());
+ if(TRACE_LED) logerror("\n*** LED: %02x, Instruction: %08x ***\n\n", data, machine().firstcpu->pc());
return;
case 0x0320:
timer_32khz_last = machine().time();
return;
default:
- if(TRACE_CPU_REG) logerror("Instruction: %08x WRITE MMIO(%08x): %08x & %08x\n", space.machine().firstcpu->pc(), offset << 2 | 0xFF050000, data, mem_mask);
+ if(TRACE_CPU_REG) logerror("Instruction: %08x WRITE MMIO(%08x): %08x & %08x\n", machine().firstcpu->pc(), offset << 2 | 0xFF050000, data, mem_mask);
return;
}
}
@@ -521,7 +521,7 @@ READ32_MEMBER( r9751_state::r9751_mmio_fff8_r )
return reg_fff80040;
default:
data = 0;
- if(TRACE_CPU_REG) logerror("Instruction: %08x READ MMIO(%08x): %08x & %08x\n", space.machine().firstcpu->pc(), offset << 2 | 0xFFF80000, data, mem_mask);
+ if(TRACE_CPU_REG) logerror("Instruction: %08x READ MMIO(%08x): %08x & %08x\n", machine().firstcpu->pc(), offset << 2 | 0xFFF80000, data, mem_mask);
return data;
}
}
@@ -530,7 +530,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_fff8_w )
{
/* Unknown mask */
if (mem_mask != 0xFFFFFFFF)
- logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0xFFF80000, space.machine().firstcpu->pc());
+ logerror("Mask found: %08X Register: %08X PC: %08X\n", mem_mask, offset << 2 | 0xFFF80000, machine().firstcpu->pc());
switch(offset << 2)
{
@@ -538,7 +538,7 @@ WRITE32_MEMBER( r9751_state::r9751_mmio_fff8_w )
reg_fff80040 = data;
return;
default:
- if(TRACE_CPU_REG) logerror("Instruction: %08x WRITE MMIO(%08x): %08x & %08x\n", space.machine().firstcpu->pc(), offset << 2 | 0xFFF80000, data, mem_mask);
+ if(TRACE_CPU_REG) logerror("Instruction: %08x WRITE MMIO(%08x): %08x & %08x\n", machine().firstcpu->pc(), offset << 2 | 0xFFF80000, data, mem_mask);
}
}
diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp
index fe536d93d3e..75f3a1c900c 100644
--- a/src/mame/drivers/segac2.cpp
+++ b/src/mame/drivers/segac2.cpp
@@ -449,10 +449,10 @@ WRITE8_MEMBER(segac2_state::io_portd_w)
D1 : To CN1 pin J. (Coin meter 2)
D0 : To CN1 pin 8. (Coin meter 1)
*/
- //space.machine().bookkeeping().coin_lockout_w(1, data & 0x08);
- //space.machine().bookkeeping().coin_lockout_w(0, data & 0x04);
- space.machine().bookkeeping().coin_counter_w(1, data & 0x02);
- space.machine().bookkeeping().coin_counter_w(0, data & 0x01);
+ //machine().bookkeeping().coin_lockout_w(1, data & 0x08);
+ //machine().bookkeeping().coin_lockout_w(0, data & 0x04);
+ machine().bookkeeping().coin_counter_w(1, data & 0x02);
+ machine().bookkeeping().coin_counter_w(0, data & 0x01);
}
WRITE8_MEMBER(segac2_state::io_porth_w)
@@ -497,7 +497,7 @@ WRITE8_MEMBER(segac2_state::control_w)
data &= 0x0f;
/* bit 0 controls display enable */
- //segac2_enable_display(space.machine(), ~data & 1);
+ //segac2_enable_display(machine(), ~data & 1);
m_segac2_enable_display = ~data & 1;
/* bit 1 resets the protection */
@@ -587,8 +587,8 @@ WRITE8_MEMBER(segac2_state::counter_timer_w)
break;
case 0x10: /* coin counter */
-// space.machine().bookkeeping().coin_counter_w(0,1);
-// space.machine().bookkeeping().coin_counter_w(0,0);
+// machine().bookkeeping().coin_counter_w(0,1);
+// machine().bookkeeping().coin_counter_w(0,0);
break;
case 0x12: /* set coinage info -- followed by two 4-bit values */
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index 17dd5761480..62fb2b6dae7 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -580,7 +580,7 @@ READ16_MEMBER( segaxbd_state::rascot_excs_r )
//logerror("%06X:rascot_excs_r(%04X)\n", m_maincpu->pc(), offset*2);
// probably receives commands from the server here
- //return space.machine().rand() & 0xff;
+ //return machine().rand() & 0xff;
return 0xff;
}
diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp
index 975de6f953e..668cd72e08e 100644
--- a/src/mame/drivers/snes.cpp
+++ b/src/mame/drivers/snes.cpp
@@ -210,7 +210,7 @@ WRITE8_MEMBER( snes_console_state::snes20_hi_w )
{ m_cartslot->chip_write(space, offset, data); return; }
else if (m_cartslot->get_type() == SNES_CX4
&& (offset < 0x400000 && (offset & 0xffff) >= 0x6000 && (offset & 0xffff) < 0x8000)) // hack until we emulate the real CPU
- { CX4_write(space.machine(), (offset & 0xffff) - 0x6000, data); return; }
+ { CX4_write(machine(), (offset & 0xffff) - 0x6000, data); return; }
else if (m_type == SNES_SUFAMITURBO
&& address >= 0x8000 && ((offset >= 0x600000 && offset < 0x640000) || (offset >= 0x700000 && offset < 0x740000)))
{ m_cartslot->write_h(space, offset, data); return; }
diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp
index a95431396ea..96fca4800d0 100644
--- a/src/mame/drivers/taito_x.cpp
+++ b/src/mame/drivers/taito_x.cpp
@@ -387,10 +387,10 @@ WRITE16_MEMBER( taitox_state::cchip1_ram_w )
{
m_cc_port = data;
- space.machine().bookkeeping().coin_lockout_w(1, data & 0x08);
- space.machine().bookkeeping().coin_lockout_w(0, data & 0x04);
- space.machine().bookkeeping().coin_counter_w(1, data & 0x02);
- space.machine().bookkeeping().coin_counter_w(0, data & 0x01);
+ machine().bookkeeping().coin_lockout_w(1, data & 0x08);
+ machine().bookkeeping().coin_lockout_w(0, data & 0x04);
+ machine().bookkeeping().coin_counter_w(1, data & 0x02);
+ machine().bookkeeping().coin_counter_w(0, data & 0x01);
}
else
{
@@ -421,9 +421,9 @@ READ16_MEMBER( taitox_state::cchip1_ram_r )
{
switch (offset)
{
- case 0x00: return space.machine().root_device().ioport("IN0")->read(); /* Player 1 controls + START1 */
- case 0x01: return space.machine().root_device().ioport("IN1")->read(); /* Player 2 controls + START2 */
- case 0x02: return space.machine().root_device().ioport("IN2")->read(); /* COINn + SERVICE1 + TILT */
+ case 0x00: return machine().root_device().ioport("IN0")->read(); /* Player 1 controls + START1 */
+ case 0x01: return machine().root_device().ioport("IN1")->read(); /* Player 2 controls + START2 */
+ case 0x02: return machine().root_device().ioport("IN2")->read(); /* COINn + SERVICE1 + TILT */
case 0x03: return m_cc_port;
}
}
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index 657dc23b197..174858595ab 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -408,7 +408,7 @@ READ8_MEMBER( tandy1000_state::tandy1000_bank_r )
{
uint8_t data = 0xFF;
- logerror( "%s: tandy1000_bank_r: offset = %x\n", space.machine().describe_context(), offset );
+ logerror( "%s: tandy1000_bank_r: offset = %x\n", machine().describe_context(), offset );
switch( offset )
{
@@ -423,7 +423,7 @@ READ8_MEMBER( tandy1000_state::tandy1000_bank_r )
WRITE8_MEMBER( tandy1000_state::tandy1000_bank_w )
{
- logerror( "%s: tandy1000_bank_w: offset = %x, data = %02x\n", space.machine().describe_context(), offset, data );
+ logerror( "%s: tandy1000_bank_w: offset = %x, data = %02x\n", machine().describe_context(), offset, data );
switch( offset )
{
diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp
index d8c9eac7839..c2ad4663d43 100644
--- a/src/mame/drivers/tasman.cpp
+++ b/src/mame/drivers/tasman.cpp
@@ -186,13 +186,13 @@ WRITE8_MEMBER(kongambl_state::eeprom_w)
READ32_MEMBER(kongambl_state::test_r)
{
- return -1;//space.machine().rand();
+ return -1;//machine().rand();
}
/*
READ32_MEMBER(kongambl_state::rng_r)
{
- return space.machine().rand();
+ return machine().rand();
}
*/
diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp
index fe0fa326fb1..3f24fef6303 100644
--- a/src/mame/drivers/vega.cpp
+++ b/src/mame/drivers/vega.cpp
@@ -315,7 +315,7 @@ READ8_MEMBER(vega_state::extern_r)
{
/* AY 3-8910 */
m_ay8910->data_w(space, 0, offset);
- return 0xff;//mame_rand(space.machine);
+ return 0xff;//mame_rand(machine);
}
case 2: /* 08-0b */
diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp
index 56209fdd64d..b3a1a5ba6f3 100644
--- a/src/mame/drivers/xtheball.cpp
+++ b/src/mame/drivers/xtheball.cpp
@@ -128,7 +128,7 @@ TMS340X0_TO_SHIFTREG_CB_MEMBER(xtheball_state::to_shiftreg)
else if (address >= 0x02000000 && address <= 0x020fffff)
memcpy(shiftreg, &m_vram_fg[(address & 0xff000) >> 4], 0x200);
else
- logerror("%s:to_shiftreg(%08X)\n", space.machine().describe_context(), address);
+ logerror("%s:to_shiftreg(%08X)\n", machine().describe_context(), address);
}
@@ -139,7 +139,7 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(xtheball_state::from_shiftreg)
else if (address >= 0x02000000 && address <= 0x020fffff)
memcpy(&m_vram_fg[(address & 0xff000) >> 4], shiftreg, 0x200);
else
- logerror("%s:from_shiftreg(%08X)\n", space.machine().describe_context(), address);
+ logerror("%s:from_shiftreg(%08X)\n", machine().describe_context(), address);
}
diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp
index f51237299ac..87d1fbb455d 100644
--- a/src/mame/drivers/z80dev.cpp
+++ b/src/mame/drivers/z80dev.cpp
@@ -50,7 +50,7 @@ WRITE8_MEMBER( z80dev_state::display_w )
READ8_MEMBER( z80dev_state::test_r )
{
- return space.machine().rand();
+ return machine().rand();
}
static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, z80dev_state )
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 6bfbe421c62..3bfc327a97d 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -137,6 +137,7 @@ public:
DECLARE_READ8_MEMBER(memory_read_byte);
DECLARE_WRITE8_MEMBER(memory_write_byte);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
+ void set_ea(int ea);
};
/*----------- defined in audio/mario.c -----------*/
diff --git a/src/mame/machine/amiga.cpp b/src/mame/machine/amiga.cpp
index dc279456348..e84416d629b 100644
--- a/src/mame/machine/amiga.cpp
+++ b/src/mame/machine/amiga.cpp
@@ -1042,7 +1042,7 @@ READ16_MEMBER( amiga_state::cia_r )
data |= m_cia_1->read(space, offset >> 7) << 8;
if (LOG_CIA)
- logerror("%s: cia_r(%06x) = %04x & %04x\n", space.machine().describe_context(), offset, data, mem_mask);
+ logerror("%s: cia_r(%06x) = %04x & %04x\n", machine().describe_context(), offset, data, mem_mask);
return data;
}
@@ -1050,7 +1050,7 @@ READ16_MEMBER( amiga_state::cia_r )
WRITE16_MEMBER( amiga_state::cia_w )
{
if (LOG_CIA)
- logerror("%s: cia_w(%06x) = %04x & %04x\n", space.machine().describe_context(), offset, data, mem_mask);
+ logerror("%s: cia_w(%06x) = %04x & %04x\n", machine().describe_context(), offset, data, mem_mask);
if ((offset & 0x1000/2) == 0 && ACCESSING_BITS_0_7)
m_cia_0->write(space, offset >> 7, data & 0xff);
@@ -1232,11 +1232,11 @@ READ16_MEMBER( amiga_state::custom_chip_r )
return CUSTOM_REG(REG_INTREQ);
case REG_COPJMP1:
- amiga_copper_setpc(space.machine(), CUSTOM_REG_LONG(REG_COP1LCH));
+ amiga_copper_setpc(machine(), CUSTOM_REG_LONG(REG_COP1LCH));
break;
case REG_COPJMP2:
- amiga_copper_setpc(space.machine(), CUSTOM_REG_LONG(REG_COP2LCH));
+ amiga_copper_setpc(machine(), CUSTOM_REG_LONG(REG_COP2LCH));
break;
case REG_CLXDAT:
@@ -1393,19 +1393,19 @@ WRITE16_MEMBER( amiga_state::custom_chip_w )
case REG_SPR0PTL: case REG_SPR1PTL: case REG_SPR2PTL: case REG_SPR3PTL:
case REG_SPR4PTL: case REG_SPR5PTL: case REG_SPR6PTL: case REG_SPR7PTL:
- amiga_sprite_dma_reset(space.machine(), (offset - REG_SPR0PTL) / 2);
+ amiga_sprite_dma_reset(machine(), (offset - REG_SPR0PTL) / 2);
break;
case REG_SPR0CTL: case REG_SPR1CTL: case REG_SPR2CTL: case REG_SPR3CTL:
case REG_SPR4CTL: case REG_SPR5CTL: case REG_SPR6CTL: case REG_SPR7CTL:
/* disable comparitor on writes here */
- amiga_sprite_enable_comparitor(space.machine(), (offset - REG_SPR0CTL) / 4, false);
+ amiga_sprite_enable_comparitor(machine(), (offset - REG_SPR0CTL) / 4, false);
break;
case REG_SPR0DATA: case REG_SPR1DATA: case REG_SPR2DATA: case REG_SPR3DATA:
case REG_SPR4DATA: case REG_SPR5DATA: case REG_SPR6DATA: case REG_SPR7DATA:
/* enable comparitor on writes here */
- amiga_sprite_enable_comparitor(space.machine(), (offset - REG_SPR0DATA) / 4, true);
+ amiga_sprite_enable_comparitor(machine(), (offset - REG_SPR0DATA) / 4, true);
break;
case REG_COP1LCH:
@@ -1414,11 +1414,11 @@ WRITE16_MEMBER( amiga_state::custom_chip_w )
break;
case REG_COPJMP1:
- amiga_copper_setpc(space.machine(), CUSTOM_REG_LONG(REG_COP1LCH));
+ amiga_copper_setpc(machine(), CUSTOM_REG_LONG(REG_COP1LCH));
break;
case REG_COPJMP2:
- amiga_copper_setpc(space.machine(), CUSTOM_REG_LONG(REG_COP2LCH));
+ amiga_copper_setpc(machine(), CUSTOM_REG_LONG(REG_COP2LCH));
break;
case REG_DDFSTRT:
@@ -1516,7 +1516,7 @@ WRITE16_MEMBER( amiga_state::custom_chip_w )
case REG_COLOR28: case REG_COLOR29: case REG_COLOR30: case REG_COLOR31:
if (IS_AGA(state))
{
- amiga_aga_palette_write(space.machine(), offset - REG_COLOR00, data);
+ amiga_aga_palette_write(machine(), offset - REG_COLOR00, data);
}
else
{
diff --git a/src/mame/machine/apple2.cpp b/src/mame/machine/apple2.cpp
index 16b99b9c9c1..0995660c1a6 100644
--- a/src/mame/machine/apple2.cpp
+++ b/src/mame/machine/apple2.cpp
@@ -1723,7 +1723,7 @@ READ8_MEMBER( apple2_state::apple2_c01x_r )
case 0x06: result |= (m_flags & VAR_ALTZP) ? 0x80 : 0x00; break;
case 0x07: result |= (m_flags & VAR_SLOTC3ROM) ? 0x80 : 0x00; break;
case 0x08: result |= (m_flags & VAR_80STORE) ? 0x80 : 0x00; break;
- case 0x09: result |= !space.machine().first_screen()->vblank() ? 0x80 : 0x00; break;
+ case 0x09: result |= !machine().first_screen()->vblank() ? 0x80 : 0x00; break;
case 0x0A: result |= (m_flags & VAR_TEXT) ? 0x80 : 0x00; break;
case 0x0B: result |= (m_flags & VAR_MIXED) ? 0x80 : 0x00; break;
case 0x0C: result |= (m_flags & VAR_PAGE2) ? 0x80 : 0x00; break;
@@ -1795,7 +1795,7 @@ READ8_MEMBER ( apple2_state::apple2_c03x_r )
{
if (!offset)
{
- speaker_sound_device *speaker = space.machine().device<speaker_sound_device>("a2speaker");
+ speaker_sound_device *speaker = machine().device<speaker_sound_device>("a2speaker");
m_a2_speaker_state ^= 1;
speaker->level_w(m_a2_speaker_state);
@@ -1902,19 +1902,19 @@ READ8_MEMBER ( apple2_state::apple2_c06x_r )
break;
case 0x04:
/* X Joystick 1 axis */
- result = space.machine().time().as_double() < m_joystick_x1_time;
+ result = machine().time().as_double() < m_joystick_x1_time;
break;
case 0x05:
/* Y Joystick 1 axis */
- result = space.machine().time().as_double() < m_joystick_y1_time;
+ result = machine().time().as_double() < m_joystick_y1_time;
break;
case 0x06:
/* X Joystick 2 axis */
- result = space.machine().time().as_double() < m_joystick_x2_time;
+ result = machine().time().as_double() < m_joystick_x2_time;
break;
case 0x07:
/* Y Joystick 2 axis */
- result = space.machine().time().as_double() < m_joystick_y2_time;
+ result = machine().time().as_double() < m_joystick_y2_time;
break;
default:
/* c060 Empty Cassette head read
diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp
index 5913d958ff6..3c094195d34 100644
--- a/src/mame/machine/apple2gs.cpp
+++ b/src/mame/machine/apple2gs.cpp
@@ -919,7 +919,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r )
#endif
case 0x19: /* C019 - RDVBLBAR */
- result = (space.machine().first_screen()->vpos() >= (192+BORDER_TOP)) ? 0x80 : 0x00;
+ result = (machine().first_screen()->vpos() >= (192+BORDER_TOP)) ? 0x80 : 0x00;
break;
case 0x22: /* C022 - TBCOLOR */
@@ -1020,7 +1020,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r )
break;
case 0x2F: /* C02F - HORIZCNT */
- result = space.machine().first_screen()->hpos() / 11;
+ result = machine().first_screen()->hpos() / 11;
if (result > 0)
{
result += 0x40;
diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp
index 6a99a712bb2..943ae075275 100644
--- a/src/mame/machine/bbc.cpp
+++ b/src/mame/machine/bbc.cpp
@@ -741,7 +741,7 @@ void bbc_state::bbcb_IC32_initialise(bbc_state *state)
void bbc_state::MC146818_set(address_space &space)
{
//logerror ("146181 WR=%d DS=%d AS=%d CE=%d \n",m_MC146818_WR,m_MC146818_DS,m_MC146818_AS,m_MC146818_CE);
- //mc146818_device *rtc = space.machine().device<mc146818_device>("rtc");
+ //mc146818_device *rtc = machine().device<mc146818_device>("rtc");
// if chip enabled
if (m_MC146818_CE)
diff --git a/src/mame/machine/decocass.cpp b/src/mame/machine/decocass.cpp
index 56488a60027..ee81c9d4b7d 100644
--- a/src/mame/machine/decocass.cpp
+++ b/src/mame/machine/decocass.cpp
@@ -164,7 +164,7 @@ READ8_MEMBER(decocass_state::decocass_input_r)
switch (offset & 7)
{
case 0: case 1: case 2:
- data = space.machine().root_device().ioport(portnames[offset & 7])->read();
+ data = machine().root_device().ioport(portnames[offset & 7])->read();
break;
case 3: case 4: case 5: case 6:
data = m_quadrature_decoder[(offset & 7) - 3];
@@ -192,7 +192,7 @@ READ8_MEMBER(decocass_state::decocass_input_r)
WRITE8_MEMBER(decocass_state::decocass_reset_w)
{
- LOG(1,("%10s 6502-PC: %04x decocass_reset_w(%02x): $%02x\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(1,("%10s 6502-PC: %04x decocass_reset_w(%02x): $%02x\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
m_decocass_reset = data;
/* CPU #1 active high reset */
@@ -257,7 +257,7 @@ READ8_MEMBER(decocass_type1_state::decocass_type1_r)
data = (BIT(data, 0) << 0) | (BIT(data, 1) << 1) | 0x7c;
LOG(4,("%10s 6502-PC: %04x decocass_type1_r(%02x): $%02x <- (%s %s)\n",
- space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data,
+ machine().time().as_string(6), space.device().safe_pcbase(), offset, data,
(data & 1) ? "OBF" : "-",
(data & 2) ? "IBF" : "-"));
}
@@ -265,7 +265,7 @@ READ8_MEMBER(decocass_type1_state::decocass_type1_r)
{
offs_t promaddr;
uint8_t save;
- uint8_t *prom = space.machine().root_device().memregion("dongle")->base();
+ uint8_t *prom = machine().root_device().memregion("dongle")->base();
if (m_firsttime)
{
@@ -310,7 +310,7 @@ READ8_MEMBER(decocass_type1_state::decocass_type1_r)
}
LOG(3,("%10s 6502-PC: %04x decocass_type1_r(%02x): $%02x\n",
- space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
m_latch1 = save; /* latch the data for the next A0 == 0 read */
}
@@ -518,7 +518,7 @@ READ8_MEMBER(decocass_type2_state::decocass_type2_r)
{
uint8_t *prom = memregion("dongle")->base();
data = prom[256 * m_type2_d2_latch + m_type2_promaddr];
- LOG(3,("%10s 6502-PC: %04x decocass_type2_r(%02x): $%02x <- prom[%03x]\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, 256 * m_type2_d2_latch + m_type2_promaddr));
+ LOG(3,("%10s 6502-PC: %04x decocass_type2_r(%02x): $%02x <- prom[%03x]\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, 256 * m_type2_d2_latch + m_type2_promaddr));
}
else
{
@@ -532,7 +532,7 @@ READ8_MEMBER(decocass_type2_state::decocass_type2_r)
else
data = offset & 0xff;
- LOG(3,("%10s 6502-PC: %04x decocass_type2_r(%02x): $%02x <- 8041-%s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "STATUS" : "DATA"));
+ LOG(3,("%10s 6502-PC: %04x decocass_type2_r(%02x): $%02x <- 8041-%s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "STATUS" : "DATA"));
}
return data;
}
@@ -543,18 +543,18 @@ WRITE8_MEMBER(decocass_type2_state::decocass_type2_w)
{
if (1 == (offset & 1))
{
- LOG(4,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> set PROM+D2 latch", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> set PROM+D2 latch", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
else
{
m_type2_promaddr = data;
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> set PROM addr $%02x\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_type2_promaddr));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> set PROM addr $%02x\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_type2_promaddr));
return;
}
}
else
{
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s ", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041 DATA"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s ", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041 DATA"));
}
if (1 == (offset & 1))
{
@@ -600,7 +600,7 @@ READ8_MEMBER(decocass_type3_state::decocass_type3_r)
{
uint8_t *prom = memregion("dongle")->base();
data = prom[m_type3_ctrs];
- LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- prom[$%03x]\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_type3_ctrs));
+ LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- prom[$%03x]\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_type3_ctrs));
if (++m_type3_ctrs == 4096)
m_type3_ctrs = 0;
}
@@ -609,12 +609,12 @@ READ8_MEMBER(decocass_type3_state::decocass_type3_r)
if (0 == (offset & E5XX_MASK))
{
data = m_mcu->upi41_master_r(space,1);
- LOG(4,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- 8041 STATUS\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- 8041 STATUS\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
}
@@ -623,7 +623,7 @@ READ8_MEMBER(decocass_type3_state::decocass_type3_r)
if (1 == m_type3_pal_19)
{
save = data = 0xff; /* open data bus? */
- LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- open bus", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- open bus", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
else
{
@@ -765,7 +765,7 @@ READ8_MEMBER(decocass_type3_state::decocass_type3_r)
(BIT(save, 7) << 7);
}
m_type3_d0_latch = save & 1;
- LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x '%c' <- 8041-DATA\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
+ LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x '%c' <- 8041-DATA\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
}
else
{
@@ -779,7 +779,7 @@ READ8_MEMBER(decocass_type3_state::decocass_type3_r)
(BIT(save, 5) << 5) |
(BIT(save, 6) << 7) |
(BIT(save, 7) << 6);
- LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
+ LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
m_type3_d0_latch = save & 1;
}
}
@@ -795,7 +795,7 @@ WRITE8_MEMBER(decocass_type3_state::decocass_type3_w)
if (1 == m_type3_pal_19)
{
m_type3_ctrs = data << 4;
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, "LDCTRS"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, "LDCTRS"));
return;
}
else
@@ -807,11 +807,11 @@ WRITE8_MEMBER(decocass_type3_state::decocass_type3_w)
if (1 == m_type3_pal_19)
{
/* write nowhere?? */
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, "nowhere?"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, "nowhere?"));
return;
}
}
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
m_mcu->upi41_master_w(space,offset, data);
}
@@ -837,22 +837,22 @@ READ8_MEMBER(decocass_type4_state::decocass_type4_r)
if (0 == (offset & E5XX_MASK))
{
data = m_mcu->upi41_master_r(space,1);
- LOG(4,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x <- 8041 STATUS\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x <- 8041 STATUS\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
else
{
if (m_type4_latch)
{
- uint8_t *prom = space.machine().root_device().memregion("dongle")->base();
+ uint8_t *prom = machine().root_device().memregion("dongle")->base();
data = prom[m_type4_ctrs];
- LOG(3,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x '%c' <- PROM[%04x]\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.', m_type4_ctrs));
+ LOG(3,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x '%c' <- PROM[%04x]\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.', m_type4_ctrs));
m_type4_ctrs = (m_type4_ctrs + 1) & 0x7fff;
}
else
@@ -860,12 +860,12 @@ READ8_MEMBER(decocass_type4_state::decocass_type4_r)
if (0 == (offset & E5XX_MASK))
{
data = m_mcu->upi41_master_r(space,0);
- LOG(3,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
+ LOG(3,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
}
@@ -880,7 +880,7 @@ WRITE8_MEMBER(decocass_type4_state::decocass_type4_w)
if (1 == m_type4_latch)
{
m_type4_ctrs = (m_type4_ctrs & 0x00ff) | ((data & 0x7f) << 8);
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> CTRS MSB (%04x)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_type4_ctrs));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> CTRS MSB (%04x)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_type4_ctrs));
return;
}
else
@@ -894,11 +894,11 @@ WRITE8_MEMBER(decocass_type4_state::decocass_type4_w)
if (m_type4_latch)
{
m_type4_ctrs = (m_type4_ctrs & 0xff00) | data;
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> CTRS LSB (%04x)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_type4_ctrs));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> CTRS LSB (%04x)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_type4_ctrs));
return;
}
}
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
m_mcu->upi41_master_w(space,offset, data);
}
@@ -920,12 +920,12 @@ READ8_MEMBER(decocass_type5_state::decocass_type5_r)
if (0 == (offset & E5XX_MASK))
{
data = m_mcu->upi41_master_r(space,1);
- LOG(4,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x <- 8041 STATUS\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x <- 8041 STATUS\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
else
@@ -933,19 +933,19 @@ READ8_MEMBER(decocass_type5_state::decocass_type5_r)
if (m_type5_latch)
{
data = 0x55; /* Only a fixed value? It looks like this is all we need to do */
- LOG(3,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x '%c' <- fixed value???\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
+ LOG(3,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x '%c' <- fixed value???\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
}
else
{
if (0 == (offset & E5XX_MASK))
{
data = m_mcu->upi41_master_r(space,0);
- LOG(3,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
+ LOG(3,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_type5_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
}
@@ -959,7 +959,7 @@ WRITE8_MEMBER(decocass_type5_state::decocass_type5_w)
{
if (1 == m_type5_latch)
{
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, "latch #2??"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, "latch #2??"));
return;
}
else
@@ -971,11 +971,11 @@ WRITE8_MEMBER(decocass_type5_state::decocass_type5_w)
if (m_type5_latch)
{
/* write nowhere?? */
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, "nowhere?"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, "nowhere?"));
return;
}
}
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
m_mcu->upi41_master_w(space,offset, data);
}
@@ -996,12 +996,12 @@ READ8_MEMBER(decocass_nodong_state::decocass_nodong_r)
if (0 == (offset & E5XX_MASK))
{
data = m_mcu->upi41_master_r(space,1);
- LOG(4,("%10s 6502-PC: %04x decocass_nodong_r(%02x): $%02x <- 8041 STATUS\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_nodong_r(%02x): $%02x <- 8041 STATUS\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_nodong_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_nodong_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
else
@@ -1009,12 +1009,12 @@ READ8_MEMBER(decocass_nodong_state::decocass_nodong_r)
if (0 == (offset & E5XX_MASK))
{
data = m_mcu->upi41_master_r(space,0);
- LOG(3,("%10s 6502-PC: %04x decocass_nodong_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
+ LOG(3,("%10s 6502-PC: %04x decocass_nodong_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_nodong_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_nodong_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
@@ -1040,22 +1040,22 @@ READ8_MEMBER(decocass_widel_state::decocass_widel_r)
if (m_widel_latch && !machine().side_effect_disabled())
m_widel_ctrs = (m_widel_ctrs + 0x100) & 0xfffff;
data = m_mcu->upi41_master_r(space,1);
- LOG(4,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x <- 8041 STATUS\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x <- 8041 STATUS\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
else
{
if (m_widel_latch)
{
- uint8_t *prom = space.machine().root_device().memregion("dongle")->base();
+ uint8_t *prom = machine().root_device().memregion("dongle")->base();
data = prom[m_widel_ctrs];
- LOG(3,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x '%c' <- PROM[%04x]\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.', m_widel_ctrs));
+ LOG(3,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x '%c' <- PROM[%04x]\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.', m_widel_ctrs));
if (!machine().side_effect_disabled())
m_widel_ctrs = (m_widel_ctrs + 1) & 0xfffff;
@@ -1065,12 +1065,12 @@ READ8_MEMBER(decocass_widel_state::decocass_widel_r)
if (0 == (offset & E5XX_MASK))
{
data = m_mcu->upi41_master_r(space,0);
- LOG(3,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
+ LOG(3,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x '%c' <- open bus (D0 replaced with latch)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, (data >= 32) ? data : '.'));
}
else
{
data = 0xff; /* open data bus? */
- LOG(4,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x <- open bus\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(4,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x <- open bus\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
}
@@ -1089,7 +1089,7 @@ WRITE8_MEMBER(decocass_widel_state::decocass_widel_w)
// Counterintuitive though it may seem, the value written is probably just ignored.
// Treasure Island depends on this clearing the lower bits as well.
m_widel_ctrs = 0;
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> CTRS MSB (%04x)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_widel_ctrs));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> CTRS MSB (%04x)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_widel_ctrs));
return;
}
else
@@ -1103,11 +1103,11 @@ WRITE8_MEMBER(decocass_widel_state::decocass_widel_w)
if (m_widel_latch)
{
m_widel_ctrs = (m_widel_ctrs & 0xfff00) | data;
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> CTRS LSB (%04x)\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_widel_ctrs));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> CTRS LSB (%04x)\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, m_widel_ctrs));
return;
}
}
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
m_mcu->upi41_master_w(space,offset, data);
}
@@ -1137,7 +1137,7 @@ READ8_MEMBER(decocass_state::decocass_e5xx_r)
(!m_cassette->is_present() << 7); /* D7 = cassette present */
LOG(4,("%10s 6502-PC: %04x decocass_e5xx_r(%02x): $%02x <- STATUS (%s%s%s%s%s%s%s%s)\n",
- space.machine().time().as_string(6),
+ machine().time().as_string(6),
space.device().safe_pcbase(),
offset, data,
data & 0x01 ? "" : "REQ/",
@@ -1169,7 +1169,7 @@ WRITE8_MEMBER(decocass_state::decocass_e5xx_w)
if (0 == (offset & E5XX_MASK))
{
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> %s\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data, offset & 1 ? "8041-CMND" : "8041-DATA"));
m_mcu->upi41_master_w(space,offset & 1, data);
#ifdef MAME_DEBUG
decocass_fno(offset, data);
@@ -1177,7 +1177,7 @@ WRITE8_MEMBER(decocass_state::decocass_e5xx_w)
}
else
{
- LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> dongle\n", space.machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
+ LOG(3,("%10s 6502-PC: %04x decocass_e5xx_w(%02x): $%02x -> dongle\n", machine().time().as_string(6), space.device().safe_pcbase(), offset, data));
}
}
@@ -1641,7 +1641,7 @@ WRITE8_MEMBER(decocass_state::i8041_p1_w)
if (data != m_i8041_p1_write_latch)
{
LOG(4,("%10s 8041-PC: %03x i8041_p1_w: $%02x (%s%s%s%s%s%s%s%s)\n",
- space.machine().time().as_string(6),
+ machine().time().as_string(6),
space.device().safe_pcbase(),
data,
data & 0x01 ? "" : "DATA-WRT",
@@ -1677,7 +1677,7 @@ READ8_MEMBER(decocass_state::i8041_p1_r)
if (data != m_i8041_p1_read_latch)
{
LOG(4,("%10s 8041-PC: %03x i8041_p1_r: $%02x (%s%s%s%s%s%s%s%s)\n",
- space.machine().time().as_string(6),
+ machine().time().as_string(6),
space.device().safe_pcbase(),
data,
data & 0x01 ? "" : "DATA-WRT",
@@ -1698,7 +1698,7 @@ WRITE8_MEMBER(decocass_state::i8041_p2_w)
if (data != m_i8041_p2_write_latch)
{
LOG(4,("%10s 8041-PC: %03x i8041_p2_w: $%02x (%s%s%s%s%s%s%s%s)\n",
- space.machine().time().as_string(6),
+ machine().time().as_string(6),
space.device().safe_pcbase(),
data,
data & 0x01 ? "" : "FNO/",
@@ -1723,7 +1723,7 @@ READ8_MEMBER(decocass_state::i8041_p2_r)
if (data != m_i8041_p2_read_latch)
{
LOG(4,("%10s 8041-PC: %03x i8041_p2_r: $%02x (%s%s%s%s%s%s%s%s)\n",
- space.machine().time().as_string(6),
+ machine().time().as_string(6),
space.device().safe_pcbase(),
data,
data & 0x01 ? "" : "FNO/",
diff --git a/src/mame/machine/gaelcrpt.cpp b/src/mame/machine/gaelcrpt.cpp
index 32166390e02..63733b18b11 100644
--- a/src/mame/machine/gaelcrpt.cpp
+++ b/src/mame/machine/gaelcrpt.cpp
@@ -148,7 +148,7 @@ uint16_t gaelco_decrypt(address_space &space, int offset, int data, int param1,
lastdecword = data;
-// logerror("%s : data1 = %4x > %4x @ %8x\n",space.machine().describe_context(),savedata,data,lastoffset);
+// logerror("%s : data1 = %4x > %4x @ %8x\n",machine().describe_context(),savedata,data,lastoffset);
}
return data;
}
diff --git a/src/mame/machine/harddriv.cpp b/src/mame/machine/harddriv.cpp
index 396264b5573..3a1756aecb5 100644
--- a/src/mame/machine/harddriv.cpp
+++ b/src/mame/machine/harddriv.cpp
@@ -272,7 +272,7 @@ READ16_MEMBER( harddriv_state::hdc68k_wheel_r )
uint16_t new_wheel = m_12badc[0].read_safe(0xffff);
/* hack to display the wheel position */
- if (space.machine().input().code_pressed(KEYCODE_LSHIFT))
+ if (machine().input().code_pressed(KEYCODE_LSHIFT))
popmessage("%04X", new_wheel);
/* if we crossed the center line, latch the edge bit */
@@ -356,7 +356,7 @@ WRITE16_MEMBER( harddriv_state::hd68k_wr0_write )
case 6: /* CC1 */
case 7: /* CC2 */
- space.machine().bookkeeping().coin_counter_w(offset - 6, data);
+ machine().bookkeeping().coin_counter_w(offset - 6, data);
break;
default:
@@ -612,7 +612,7 @@ WRITE16_MEMBER( harddriv_state::hd68k_adsp_data_w )
if (offset == 0x1fff)
{
logerror("%06X:ADSP sync address written (%04X)\n", space.device().safe_pcbase(), data);
- space.machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
m_adsp->signal_interrupt_trigger();
}
else
@@ -714,7 +714,7 @@ WRITE16_MEMBER( harddriv_state::hd68k_adsp_control_w )
case 3:
logerror("ADSP bank = %d (deferred)\n", val);
- space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(harddriv_state::deferred_adsp_bank_switch),this), val);
+ machine().scheduler().synchronize(timer_expired_delegate(FUNC(harddriv_state::deferred_adsp_bank_switch),this), val);
break;
case 5:
@@ -1022,7 +1022,7 @@ READ16_MEMBER( harddriv_state::hd68k_ds3_gdata_r )
/* it is important that all the CPUs be in sync before we continue, so spin a little */
/* while to let everyone else catch up */
space.device().execute().spin_until_trigger(DS3_TRIGGER);
- space.machine().scheduler().trigger(DS3_TRIGGER, attotime::from_usec(5));
+ machine().scheduler().trigger(DS3_TRIGGER, attotime::from_usec(5));
return m_ds3_gdata;
}
@@ -1075,7 +1075,7 @@ READ16_MEMBER( harddriv_state::hd68k_ds3_sdata_r )
/* it is important that all the CPUs be in sync before we continue, so spin a little */
/* while to let everyone else catch up */
space.device().execute().spin_until_trigger(DS3_STRIGGER);
- space.machine().scheduler().trigger(DS3_STRIGGER, attotime::from_usec(5));
+ machine().scheduler().trigger(DS3_STRIGGER, attotime::from_usec(5));
return m_ds3_sdata;
}
@@ -1141,7 +1141,7 @@ WRITE16_MEMBER( harddriv_state::hdds3_sdsp_special_w )
update_ds3_sirq();
/* once we've written data, trigger the main CPU to wake up again */
- space.machine().scheduler().trigger(DS3_STRIGGER);
+ machine().scheduler().trigger(DS3_STRIGGER);
break;
case 1:
@@ -1431,7 +1431,7 @@ WRITE16_MEMBER( harddriv_state::hdds3_special_w )
update_ds3_irq();
/* once we've written data, trigger the main CPU to wake up again */
- space.machine().scheduler().trigger(DS3_TRIGGER);
+ machine().scheduler().trigger(DS3_TRIGGER);
break;
case 1:
@@ -1650,7 +1650,7 @@ WRITE32_MEMBER( harddriv_state::rddsp32_sync0_w )
COMBINE_DATA(&newdata);
m_dataptr[m_next_msp_sync % MAX_MSP_SYNC] = dptr;
m_dataval[m_next_msp_sync % MAX_MSP_SYNC] = newdata;
- space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(harddriv_state::rddsp32_sync_cb),this), m_next_msp_sync++ % MAX_MSP_SYNC);
+ machine().scheduler().synchronize(timer_expired_delegate(FUNC(harddriv_state::rddsp32_sync_cb),this), m_next_msp_sync++ % MAX_MSP_SYNC);
}
else
COMBINE_DATA(&m_rddsp32_sync[0][offset]);
@@ -1666,7 +1666,7 @@ WRITE32_MEMBER( harddriv_state::rddsp32_sync1_w )
COMBINE_DATA(&newdata);
m_dataptr[m_next_msp_sync % MAX_MSP_SYNC] = dptr;
m_dataval[m_next_msp_sync % MAX_MSP_SYNC] = newdata;
- space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(harddriv_state::rddsp32_sync_cb),this), m_next_msp_sync++ % MAX_MSP_SYNC);
+ machine().scheduler().synchronize(timer_expired_delegate(FUNC(harddriv_state::rddsp32_sync_cb),this), m_next_msp_sync++ % MAX_MSP_SYNC);
}
else
COMBINE_DATA(&m_rddsp32_sync[1][offset]);
diff --git a/src/mame/machine/hp48.cpp b/src/mame/machine/hp48.cpp
index 1dfd2e05b56..5f81ef8a21e 100644
--- a/src/mame/machine/hp48.cpp
+++ b/src/mame/machine/hp48.cpp
@@ -282,7 +282,7 @@ void hp48_state::hp48_update_annunciators()
WRITE8_MEMBER(hp48_state::hp48_io_w)
{
LOG(( "%s %f hp48_io_w: off=%02x data=%x\n",
- space.machine().describe_context(), space.machine().time().as_double(), offset, data ));
+ machine().describe_context(), machine().time().as_double(), offset, data ));
switch( offset )
{
@@ -324,13 +324,13 @@ WRITE8_MEMBER(hp48_state::hp48_io_w)
/* cards */
case 0x0e:
- LOG(( "%s: card control write %02x\n", space.machine().describe_context(), data ));
+ LOG(( "%s: card control write %02x\n", machine().describe_context(), data ));
/* bit 0: software interrupt */
if ( data & 1 )
{
LOG(( "%f hp48_io_w: software interrupt requested\n",
- space.machine().time().as_double() ));
+ machine().time().as_double() ));
hp48_pulse_irq( SATURN_IRQ_LINE );
data &= ~1;
}
@@ -343,7 +343,7 @@ WRITE8_MEMBER(hp48_state::hp48_io_w)
break;
case 0x0f:
- LOG(( "%s: card info write %02x\n", space.machine().describe_context(), data ));
+ LOG(( "%s: card info write %02x\n", machine().describe_context(), data ));
m_io[0x0f] = data;
break;
@@ -427,7 +427,7 @@ READ8_MEMBER(hp48_state::hp48_io_r)
case 0x29:
{
int last_line = HP48_IO_8(0x28) & 0x3f; /* last line of main bitmap before menu */
- int cur_line = space.machine().first_screen()->vpos();
+ int cur_line = machine().first_screen()->vpos();
if ( last_line <= 1 ) last_line = 0x3f;
data = ( cur_line >= 0 && cur_line <= last_line ) ? last_line - cur_line : 0;
if ( offset == 0x29 )
@@ -458,8 +458,8 @@ READ8_MEMBER(hp48_state::hp48_io_r)
{
/* second nibble of received data */
- //device_image_interface *xmodem = dynamic_cast<device_image_interface *>(space.machine().device("rs232_x"));
- //device_image_interface *kermit = dynamic_cast<device_image_interface *>(space.machine().device("rs232_k"));
+ //device_image_interface *xmodem = dynamic_cast<device_image_interface *>(machine().device("rs232_x"));
+ //device_image_interface *kermit = dynamic_cast<device_image_interface *>(machine().device("rs232_k"));
m_io[0x11] &= ~1; /* clear byte received */
data = m_io[offset];
@@ -473,7 +473,7 @@ READ8_MEMBER(hp48_state::hp48_io_r)
/* cards */
case 0x0e: /* detection */
data = m_io[0x0e];
- LOG(( "%s: card control read %02x\n", space.machine().describe_context(), data ));
+ LOG(( "%s: card control read %02x\n", machine().describe_context(), data ));
break;
case 0x0f: /* card info */
data = 0;
@@ -491,7 +491,7 @@ READ8_MEMBER(hp48_state::hp48_io_r)
if ( m_port_size[0] && m_port_write[0] ) data |= 4;
if ( m_port_size[1] && m_port_write[1] ) data |= 8;
}
- LOG(( "%s: card info read %02x\n", space.machine().describe_context(), data ));
+ LOG(( "%s: card info read %02x\n", machine().describe_context(), data ));
break;
@@ -499,7 +499,7 @@ READ8_MEMBER(hp48_state::hp48_io_r)
}
LOG(( "%s %f hp48_io_r: off=%02x data=%x\n",
- space.machine().describe_context(), space.machine().time().as_double(), offset, data ));
+ machine().describe_context(), machine().time().as_double(), offset, data ));
return data;
}
@@ -522,7 +522,7 @@ READ8_MEMBER(hp48_state::hp48_bank_r)
offset &= 0x7e;
if ( m_bank_switch != offset )
{
- LOG(( "%s %f hp48_bank_r: off=%03x\n", space.machine().describe_context(), space.machine().time().as_double(), offset ));
+ LOG(( "%s %f hp48_bank_r: off=%03x\n", machine().describe_context(), machine().time().as_double(), offset ));
m_bank_switch = offset;
hp48_apply_modules();
}
@@ -535,7 +535,7 @@ WRITE8_MEMBER(hp48_state::hp49_bank_w)
offset &= 0x7e;
if ( m_bank_switch != offset )
{
- LOG(( "%05x %f hp49_bank_w: off=%03x\n", space.device().safe_pcbase(), space.machine().time().as_double(), offset ));
+ LOG(( "%05x %f hp49_bank_w: off=%03x\n", space.device().safe_pcbase(), machine().time().as_double(), offset ));
m_bank_switch = offset;
hp48_apply_modules();
}
diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp
index 958672dbe48..ce14408e500 100644
--- a/src/mame/machine/inder_sb.cpp
+++ b/src/mame/machine/inder_sb.cpp
@@ -33,7 +33,7 @@ READ8_MEMBER(inder_sb_device::megaphx_0323_hack_r) { /*logerror("%04x audicpu I
READ16_MEMBER(inder_sb_device::megaphx_0x050002_r)
{
- space.machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
// int pc = machine().device("maincpu")->safe_pc();
int ret = m_soundback;
m_soundback = 0;
@@ -44,7 +44,7 @@ READ16_MEMBER(inder_sb_device::megaphx_0x050002_r)
WRITE16_MEMBER(inder_sb_device::megaphx_0x050000_w)
{
// int pc = machine().device("maincpu")->safe_pc();
- space.machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
//logerror("(%06x) megaphx_0x050000_w (to z80?) %04x %04x\n", pc, data, mem_mask);
m_soundsent = 0xff;
@@ -130,13 +130,13 @@ ADDRESS_MAP_END
READ8_MEMBER(inder_sb_device::megaphx_sound_cmd_r)
{
- space.machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
return m_sounddata;
}
READ8_MEMBER(inder_sb_device::megaphx_sound_sent_r)
{
- space.machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
int ret = m_soundsent;
m_soundsent = 0;
return ret;
@@ -145,7 +145,7 @@ READ8_MEMBER(inder_sb_device::megaphx_sound_sent_r)
WRITE8_MEMBER(inder_sb_device::megaphx_sound_to_68k_w)
{
// int pc = machine().device("audiocpu")->safe_pc();
- space.machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
//logerror("(%04x) megaphx_sound_to_68k_w (to 68k?) %02x\n", pc, data);
m_soundback = data;
diff --git a/src/mame/machine/kaneko_calc3.cpp b/src/mame/machine/kaneko_calc3.cpp
index 78aa0702d9a..b02c49b8166 100644
--- a/src/mame/machine/kaneko_calc3.cpp
+++ b/src/mame/machine/kaneko_calc3.cpp
@@ -1339,7 +1339,7 @@ int kaneko_calc3_device::decompress_table(int tabnum, uint8_t* dstram, int dstof
//printf("save to eeprom\n");
{
- eeprom_serial_93cxx_device *eeprom = space.machine().device<eeprom_serial_93cxx_device>(":eeprom");
+ eeprom_serial_93cxx_device *eeprom = machine().device<eeprom_serial_93cxx_device>(":eeprom");
for (i=0;i<0x40;i++)
{
@@ -1675,7 +1675,7 @@ void kaneko_calc3_device::mcu_run()
}
#endif
{
- eeprom_serial_93cxx_device *eeprom = space.machine().device<eeprom_serial_93cxx_device>(":eeprom");
+ eeprom_serial_93cxx_device *eeprom = machine().device<eeprom_serial_93cxx_device>(":eeprom");
for (i=0;i<0x40;i++)
{
diff --git a/src/mame/machine/konppc.cpp b/src/mame/machine/konppc.cpp
index b9429c8a1e6..28687545aeb 100644
--- a/src/mame/machine/konppc.cpp
+++ b/src/mame/machine/konppc.cpp
@@ -127,8 +127,8 @@ WRITE32_MEMBER( konppc_device::cgboard_dsp_comm_w_ppc )
{
const char *dsptag = (cgboard_id == 0) ? "dsp" : "dsp2";
const char *pcitag = (cgboard_id == 0) ? "k033906_1" : "k033906_2";
- device_t *dsp = space.machine().device(dsptag);
- k033906_device *k033906 = space.machine().device<k033906_device>(pcitag);
+ device_t *dsp = machine().device(dsptag);
+ k033906_device *k033906 = machine().device<k033906_device>(pcitag);
// osd_printf_debug("dsp_cmd_w: (board %d) %08X, %08X, %08X at %08X\n", cgboard_id, data, offset, mem_mask, space.device().safe_pc());
if (cgboard_id < MAX_CG_BOARDS)
@@ -184,7 +184,7 @@ WRITE32_MEMBER( konppc_device::cgboard_dsp_shared_w_ppc )
{
if (cgboard_id < MAX_CG_BOARDS)
{
- space.machine().scheduler().trigger(10000); // Remove the timeout (a part of the GTI Club FIFO test workaround)
+ machine().scheduler().trigger(10000); // Remove the timeout (a part of the GTI Club FIFO test workaround)
COMBINE_DATA(dsp_shared_ram[cgboard_id].get() + (offset + (dsp_shared_ram_bank[cgboard_id] * DSP_BANK_SIZE_WORD)));
}
}
@@ -211,12 +211,12 @@ void konppc_device::dsp_comm_sharc_w(address_space &space, int board, int offset
case CGBOARD_TYPE_GTICLUB:
{
//machine.device("dsp")->execute().set_input_line(SHARC_INPUT_FLAG0, ASSERT_LINE);
- space.machine().device<adsp21062_device>("dsp")->set_flag_input(0, ASSERT_LINE);
+ machine().device<adsp21062_device>("dsp")->set_flag_input(0, ASSERT_LINE);
if (offset == 1)
{
if (data & 0x03)
- space.machine().device<adsp21062_device>("dsp")->set_input_line(INPUT_LINE_IRQ2, ASSERT_LINE);
+ machine().device<adsp21062_device>("dsp")->set_input_line(INPUT_LINE_IRQ2, ASSERT_LINE);
}
break;
}
@@ -225,7 +225,7 @@ void konppc_device::dsp_comm_sharc_w(address_space &space, int board, int offset
case CGBOARD_TYPE_HANGPLT:
{
const char *dsptag = (board == 0) ? "dsp" : "dsp2";
- adsp21062_device *device = space.machine().device<adsp21062_device>(dsptag);
+ adsp21062_device *device = machine().device<adsp21062_device>(dsptag);
if (offset == 1)
{
@@ -240,7 +240,7 @@ void konppc_device::dsp_comm_sharc_w(address_space &space, int board, int offset
{
int offset = (data & 0x08) ? 1 : 0;
- space.machine().root_device().membank(texture_bank[board])->set_entry(offset);
+ machine().root_device().membank(texture_bank[board])->set_entry(offset);
}
}
break;
@@ -254,14 +254,14 @@ void konppc_device::dsp_comm_sharc_w(address_space &space, int board, int offset
{
int offset = (data & 0x08) ? 1 : 0;
- space.machine().root_device().membank(texture_bank[board])->set_entry(offset);
+ machine().root_device().membank(texture_bank[board])->set_entry(offset);
}
}
break;
}
}
-// printf("%s:cgboard_dsp_comm_w_sharc: %08X, %08X, %08X\n", space.machine().describe_context(), data, offset, mem_mask);
+// printf("%s:cgboard_dsp_comm_w_sharc: %08X, %08X, %08X\n", machine().describe_context(), data, offset, mem_mask);
dsp_comm_sharc[board][offset] = data;
}
@@ -340,7 +340,7 @@ WRITE32_MEMBER( konppc_device::cgboard_1_shared_sharc_w )
uint32_t konppc_device::nwk_fifo_r(address_space &space, int board)
{
const char *dsptag = (board == 0) ? "dsp" : "dsp2";
- adsp21062_device *device = space.machine().device<adsp21062_device>(dsptag);
+ adsp21062_device *device = machine().device<adsp21062_device>(dsptag);
uint32_t data;
if (nwk_fifo_read_ptr[board] < nwk_fifo_half_full_r)
@@ -395,7 +395,7 @@ void konppc_device::nwk_fifo_w(int board, uint32_t data)
READ32_MEMBER( konppc_device::K033906_0_r )
{
- k033906_device *k033906_1 = space.machine().device<k033906_device>("k033906_1");
+ k033906_device *k033906_1 = machine().device<k033906_device>("k033906_1");
if (nwk_device_sel[0] & 0x01)
return nwk_fifo_r(space, 0);
else
@@ -404,13 +404,13 @@ READ32_MEMBER( konppc_device::K033906_0_r )
WRITE32_MEMBER( konppc_device::K033906_0_w )
{
- k033906_device *k033906_1 = space.machine().device<k033906_device>("k033906_1");
+ k033906_device *k033906_1 = machine().device<k033906_device>("k033906_1");
k033906_1->write(space, offset, data, mem_mask);
}
READ32_MEMBER( konppc_device::K033906_1_r )
{
- k033906_device *k033906_2 = space.machine().device<k033906_device>("k033906_2");
+ k033906_device *k033906_2 = machine().device<k033906_device>("k033906_2");
if (nwk_device_sel[1] & 0x01)
return nwk_fifo_r(space, 1);
else
@@ -419,7 +419,7 @@ READ32_MEMBER( konppc_device::K033906_1_r )
WRITE32_MEMBER( konppc_device::K033906_1_w)
{
- k033906_device *k033906_2 = space.machine().device<k033906_device>("k033906_2");
+ k033906_device *k033906_2 = machine().device<k033906_device>("k033906_2");
k033906_2->write(space, offset, data, mem_mask);
}
@@ -427,7 +427,7 @@ WRITE32_MEMBER( konppc_device::K033906_1_w)
WRITE32_MEMBER( konppc_device::nwk_fifo_0_w)
{
- voodoo_device *device = space.machine().device<voodoo_device>("voodoo0");
+ voodoo_device *device = machine().device<voodoo_device>("voodoo0");
if (nwk_device_sel[0] & 0x01)
{
nwk_fifo_w(0, data);
@@ -445,7 +445,7 @@ WRITE32_MEMBER( konppc_device::nwk_fifo_0_w)
WRITE32_MEMBER( konppc_device::nwk_fifo_1_w)
{
- voodoo_device *device = space.machine().device<voodoo_device>("voodoo1");
+ voodoo_device *device = machine().device<voodoo_device>("voodoo1");
if (nwk_device_sel[1] & 0x01)
{
nwk_fifo_w(1, data);
@@ -463,7 +463,7 @@ WRITE32_MEMBER( konppc_device::nwk_fifo_1_w)
READ32_MEMBER( konppc_device::nwk_voodoo_0_r)
{
- voodoo_device *device = space.machine().device<voodoo_device>("voodoo0");
+ voodoo_device *device = machine().device<voodoo_device>("voodoo0");
if ((nwk_device_sel[0] == 0x4) && offset >= 0x100000 && offset < 0x200000)
{
return nwk_ram[0][offset & 0x1fff];
@@ -476,7 +476,7 @@ READ32_MEMBER( konppc_device::nwk_voodoo_0_r)
READ32_MEMBER( konppc_device::nwk_voodoo_1_r)
{
- voodoo_device *device = space.machine().device<voodoo_device>("voodoo1");
+ voodoo_device *device = machine().device<voodoo_device>("voodoo1");
if ((nwk_device_sel[1] == 0x4) && offset >= 0x100000 && offset < 0x200000)
{
return nwk_ram[1][offset & 0x1fff];
@@ -489,7 +489,7 @@ READ32_MEMBER( konppc_device::nwk_voodoo_1_r)
WRITE32_MEMBER( konppc_device::nwk_voodoo_0_w)
{
- voodoo_device *device = space.machine().device<voodoo_device>("voodoo0");
+ voodoo_device *device = machine().device<voodoo_device>("voodoo0");
if (nwk_device_sel[0] & 0x01)
{
nwk_fifo_w(0, data);
@@ -507,7 +507,7 @@ WRITE32_MEMBER( konppc_device::nwk_voodoo_0_w)
WRITE32_MEMBER( konppc_device::nwk_voodoo_1_w)
{
- voodoo_device *device = space.machine().device<voodoo_device>("voodoo0");
+ voodoo_device *device = machine().device<voodoo_device>("voodoo0");
if (nwk_device_sel[1] & 0x01)
{
nwk_fifo_w(1, data);
diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp
index ea1f5f3f1c2..8a1b8743e3b 100644
--- a/src/mame/machine/mac.cpp
+++ b/src/mame/machine/mac.cpp
@@ -1166,7 +1166,7 @@ void mac_state::scc_mouse_irq(int x, int y)
READ16_MEMBER ( mac_state::mac_scc_r )
{
- scc8530_t *scc = space.machine().device<scc8530_t>("scc");
+ scc8530_t *scc = machine().device<scc8530_t>("scc");
uint16_t result;
result = scc->reg_r(space, offset);
@@ -1177,13 +1177,13 @@ READ16_MEMBER ( mac_state::mac_scc_r )
WRITE16_MEMBER ( mac_state::mac_scc_w )
{
- scc8530_t *scc = space.machine().device<scc8530_t>("scc");
+ scc8530_t *scc = machine().device<scc8530_t>("scc");
scc->reg_w(space, offset, data);
}
WRITE16_MEMBER ( mac_state::mac_scc_2_w )
{
- scc8530_t *scc = space.machine().device<scc8530_t>("scc");
+ scc8530_t *scc = machine().device<scc8530_t>("scc");
scc->reg_w(space, offset, data >> 8);
}
@@ -1202,7 +1202,7 @@ READ16_MEMBER ( mac_state::mac_iwm_r )
*/
uint16_t result = 0;
- applefdc_base_device *fdc = space.machine().device<applefdc_base_device>("fdc");
+ applefdc_base_device *fdc = machine().device<applefdc_base_device>("fdc");
result = fdc->read(offset >> 8);
@@ -1214,7 +1214,7 @@ READ16_MEMBER ( mac_state::mac_iwm_r )
WRITE16_MEMBER ( mac_state::mac_iwm_w )
{
- applefdc_base_device *fdc = space.machine().device<applefdc_base_device>("fdc");
+ applefdc_base_device *fdc = machine().device<applefdc_base_device>("fdc");
if (LOG_MAC_IWM)
printf("mac_iwm_w: offset=0x%08x data=0x%04x mask %04x (PC=%x)\n", offset, data, mem_mask, space.device().safe_pc());
diff --git a/src/mame/machine/macpci.cpp b/src/mame/machine/macpci.cpp
index eaa735c24d2..dca8b76ebec 100644
--- a/src/mame/machine/macpci.cpp
+++ b/src/mame/machine/macpci.cpp
@@ -168,7 +168,7 @@ READ32_MEMBER(macpci_state::mac_read_id)
READ16_MEMBER ( macpci_state::mac_scc_r )
{
- scc8530_t *scc = space.machine().device<scc8530_t>("scc");
+ scc8530_t *scc = machine().device<scc8530_t>("scc");
uint16_t result;
result = scc->reg_r(space, offset);
@@ -177,13 +177,13 @@ READ16_MEMBER ( macpci_state::mac_scc_r )
WRITE16_MEMBER ( macpci_state::mac_scc_w )
{
- scc8530_t *scc = space.machine().device<scc8530_t>("scc");
+ scc8530_t *scc = machine().device<scc8530_t>("scc");
scc->reg_w(space, offset, data);
}
WRITE16_MEMBER ( macpci_state::mac_scc_2_w )
{
- scc8530_t *scc = space.machine().device<scc8530_t>("scc");
+ scc8530_t *scc = machine().device<scc8530_t>("scc");
scc->reg_w(space, offset, data >> 8);
}
diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp
index b815f1eec16..60786327e66 100644
--- a/src/mame/machine/mega32x.cpp
+++ b/src/mame/machine/mega32x.cpp
@@ -389,7 +389,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15106_w )
{
// install the game rom in the normal 0x000000-0x03fffff space used by the genesis - this allows VDP DMA operations to work as they have to be from this area or RAM
// it should also UNMAP the banked rom area...
- space.install_rom(0x0000100, 0x03fffff, space.machine().root_device().memregion("gamecart")->base() + 0x100);
+ space.install_rom(0x0000100, 0x03fffff, machine().root_device().memregion("gamecart")->base() + 0x100);
}
else
{
@@ -397,7 +397,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15106_w )
// this is actually blank / nop area
// we should also map the banked area back (we don't currently unmap it tho)
- space.install_rom(0x0000100, 0x03fffff, space.machine().root_device().memregion("maincpu")->base()+0x100);
+ space.install_rom(0x0000100, 0x03fffff, machine().root_device().memregion("maincpu")->base()+0x100);
}
if((m_a15106_reg & 4) == 0) // clears the FIFO state
@@ -430,7 +430,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15106_w )
READ16_MEMBER( sega_32x_device::_32x_dreq_common_r )
{
- address_space& _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& _68kspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
switch (offset)
{
@@ -501,7 +501,7 @@ READ16_MEMBER( sega_32x_device::_32x_dreq_common_r )
WRITE16_MEMBER( sega_32x_device::_32x_dreq_common_w )
{
- address_space& _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& _68kspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
switch (offset)
{
@@ -689,12 +689,12 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15100_w )
if (data & 0x01)
{
m_32x_adapter_enabled = 1;
- space.install_rom(0x0880000, 0x08fffff, space.machine().root_device().memregion("gamecart")->base()); // 'fixed' 512kb rom bank
+ space.install_rom(0x0880000, 0x08fffff, machine().root_device().memregion("gamecart")->base()); // 'fixed' 512kb rom bank
space.install_read_bank(0x0900000, 0x09fffff, "bank12"); // 'bankable' 1024kb rom bank
- space.machine().root_device().membank("bank12")->set_base(space.machine().root_device().memregion("gamecart")->base()+((m_32x_68k_a15104_reg&0x3)*0x100000) );
+ machine().root_device().membank("bank12")->set_base(machine().root_device().memregion("gamecart")->base()+((m_32x_68k_a15104_reg&0x3)*0x100000) );
- space.install_rom(0x0000000, 0x03fffff, space.machine().root_device().memregion("32x_68k_bios")->base());
+ space.install_rom(0x0000000, 0x03fffff, machine().root_device().memregion("32x_68k_bios")->base());
/* VDP area */
space.install_readwrite_handler(0x0a15180, 0x0a1518b, read16_delegate(FUNC(sega_32x_device::_32x_common_vdp_regs_r), this), write16_delegate(FUNC(sega_32x_device::_32x_common_vdp_regs_w),this)); // common / shared VDP regs
@@ -704,14 +704,14 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15100_w )
- space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
}
else
{
m_32x_adapter_enabled = 0;
- space.install_rom(0x0000000, 0x03fffff, space.machine().root_device().memregion("gamecart")->base());
- space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
+ space.install_rom(0x0000000, 0x03fffff, machine().root_device().memregion("gamecart")->base());
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
}
}
@@ -778,7 +778,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15104_w )
m_32x_68k_a15104_reg = (m_32x_68k_a15104_reg & 0x00ff) | (data & 0xff00);
}
- space.machine().root_device().membank("bank12")->set_base(space.machine().root_device().memregion("gamecart")->base()+((m_32x_68k_a15104_reg&0x3)*0x100000) );
+ machine().root_device().membank("bank12")->set_base(machine().root_device().memregion("gamecart")->base()+((m_32x_68k_a15104_reg&0x3)*0x100000) );
}
/**********************************************************************************************/
@@ -793,7 +793,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15104_w )
// reads
READ16_MEMBER( sega_32x_device::_32x_68k_m_commsram_r )
{
- if (_32X_COMMS_PORT_SYNC) space.machine().scheduler().synchronize();
+ if (_32X_COMMS_PORT_SYNC) machine().scheduler().synchronize();
return m_commsram[offset];
}
@@ -801,7 +801,7 @@ READ16_MEMBER( sega_32x_device::_32x_68k_m_commsram_r )
WRITE16_MEMBER( sega_32x_device::_32x_68k_m_commsram_w )
{
COMBINE_DATA(&m_commsram[offset]);
- if (_32X_COMMS_PORT_SYNC) space.machine().scheduler().synchronize();
+ if (_32X_COMMS_PORT_SYNC) machine().scheduler().synchronize();
}
/**********************************************************************************************/
@@ -1069,7 +1069,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_common_vdp_regs_w )
{
// what happens if the z80 accesses it, what authorization do we use? which address space do we get?? the z80 *can* write here and to the framebuffer via the window
- address_space& _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& _68kspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (&space!= &_68kspace)
{
diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp
index ac055834c90..ea4fb87b08f 100644
--- a/src/mame/machine/megacdcd.cpp
+++ b/src/mame/machine/megacdcd.cpp
@@ -975,12 +975,12 @@ READ16_MEMBER( lc89510_temp_device::segacd_cdc_data_r )
READ16_MEMBER( lc89510_temp_device::cdc_data_sub_r )
{
- return CDC_Host_r(space.machine(), READ_SUB);
+ return CDC_Host_r(machine(), READ_SUB);
}
READ16_MEMBER( lc89510_temp_device::cdc_data_main_r )
{
- return CDC_Host_r(space.machine(), READ_MAIN);
+ return CDC_Host_r(machine(), READ_MAIN);
}
@@ -1006,7 +1006,7 @@ WRITE16_MEMBER( lc89510_temp_device::segacd_irq_mask_w )
if (!(segacd_irq_mask & 0x10))
{
segacd_irq_mask = data & 0x7e;
- CDD_Process(space.machine(), 0);
+ CDD_Process(machine(), 0);
return;
}
}
@@ -1044,7 +1044,7 @@ WRITE16_MEMBER( lc89510_temp_device::segacd_cdd_ctrl_w )
{
if (segacd_irq_mask&0x10)
{
- CDD_Process(space.machine(), 1);
+ CDD_Process(machine(), 1);
}
}
}
@@ -1096,7 +1096,7 @@ WRITE8_MEMBER( lc89510_temp_device::segacd_cdd_tx_w )
if(offset == 9)
{
- CDD_Import(space.machine());
+ CDD_Import(machine());
}
}
diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp
index 756c6ee00c7..8848083b33e 100644
--- a/src/mame/machine/megadriv.cpp
+++ b/src/mame/machine/megadriv.cpp
@@ -320,7 +320,7 @@ READ16_MEMBER(md_base_state::megadriv_68k_io_read )
D0 : Bit 0 of version number
*/
- //return (space.machine().rand()&0x0f0f)|0xf0f0;//0x0000;
+ //return (machine().rand()&0x0f0f)|0xf0f0;//0x0000;
switch (offset)
{
case 0:
@@ -502,7 +502,7 @@ READ16_MEMBER(md_base_state::megadriv_68k_read_z80_ram )
else
{
logerror("%06x: 68000 attempting to access Z80 (read) address space without bus\n", space.device().safe_pc());
- return space.machine().rand();
+ return machine().rand();
}
}
@@ -543,7 +543,7 @@ READ16_MEMBER(md_base_state::megadriv_68k_check_z80_bus )
the value is never zero. Time Killers is the most fussy, and doesn't like the
read_next_instruction function from system16, so I just return a random value
in the unused bits */
- uint16_t nextvalue = space.machine().rand();//read_next_instruction(space)&0xff00;
+ uint16_t nextvalue = machine().rand();//read_next_instruction(space)&0xff00;
/* Check if the 68k has the z80 bus */
@@ -730,7 +730,7 @@ WRITE8_MEMBER(md_base_state::megadriv_z80_vdp_write )
READ8_MEMBER(md_base_state::megadriv_z80_vdp_read )
{
osd_printf_debug("megadriv_z80_vdp_read %02x\n",offset);
- return space.machine().rand();
+ return machine().rand();
}
READ8_MEMBER(md_base_state::megadriv_z80_unmapped_read )
diff --git a/src/mame/machine/micropolis.cpp b/src/mame/machine/micropolis.cpp
index e3c760dd82f..b79ee7b3177 100644
--- a/src/mame/machine/micropolis.cpp
+++ b/src/mame/machine/micropolis.cpp
@@ -303,7 +303,7 @@ WRITE8_MEMBER( micropolis_device::data_w )
else
{
if (VERBOSE)
- logerror("%s: micropolis_data_w $%02X\n", space.machine().describe_context(), data);
+ logerror("%s: micropolis_data_w $%02X\n", machine().describe_context(), data);
}
m_data = data;
}
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp
index 6cd2ab02612..861ff027d49 100644
--- a/src/mame/machine/midwayic.cpp
+++ b/src/mame/machine/midwayic.cpp
@@ -216,37 +216,37 @@ void midway_serial_pic_emu_device::device_start()
READ8_MEMBER(midway_serial_pic_emu_device::read_a)
{
-// printf("%s: read_a\n", space.machine().describe_context());
+// printf("%s: read_a\n", machine().describe_context());
return 0x00;
}
READ8_MEMBER(midway_serial_pic_emu_device::read_b)
{
-// printf("%s: read_b\n", space.machine().describe_context());
+// printf("%s: read_b\n", machine().describe_context());
return 0x00;
}
READ8_MEMBER(midway_serial_pic_emu_device::read_c)
{
// used
-// printf("%s: read_c\n", space.machine().describe_context());
+// printf("%s: read_c\n", machine().describe_context());
return 0x00;
}
WRITE8_MEMBER(midway_serial_pic_emu_device::write_a)
{
-// printf("%s: write_a %02x\n", space.machine().describe_context(), data);
+// printf("%s: write_a %02x\n", machine().describe_context(), data);
}
WRITE8_MEMBER(midway_serial_pic_emu_device::write_b)
{
-// printf("%s: write_b %02x\n", space.machine().describe_context(), data);
+// printf("%s: write_b %02x\n", machine().describe_context(), data);
}
WRITE8_MEMBER(midway_serial_pic_emu_device::write_c)
{
// used
-// printf("%s: write_c %02x\n", space.machine().describe_context(), data);
+// printf("%s: write_c %02x\n", machine().describe_context(), data);
}
MACHINE_CONFIG_MEMBER( midway_serial_pic_emu_device::device_add_mconfig )
diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp
index e972a5b2649..54bc2641605 100644
--- a/src/mame/machine/mpu4.cpp
+++ b/src/mame/machine/mpu4.cpp
@@ -2138,8 +2138,8 @@ void mpu4_state::mpu4_install_mod4yam_space(address_space &space)
void mpu4_state::mpu4_install_mod4oki_space(address_space &space)
{
- pia6821_device *pia_ic4ss = space.machine().device<pia6821_device>("pia_ic4ss");
- ptm6840_device *ptm_ic3ss = space.machine().device<ptm6840_device>("ptm_ic3ss");
+ pia6821_device *pia_ic4ss = machine().device<pia6821_device>("pia_ic4ss");
+ ptm6840_device *ptm_ic3ss = machine().device<ptm6840_device>("ptm_ic3ss");
space.install_readwrite_handler(0x0880, 0x0883, read8_delegate(FUNC(pia6821_device::read), pia_ic4ss), write8_delegate(FUNC(pia6821_device::write), pia_ic4ss));
space.install_read_handler(0x08c0, 0x08c7, read8_delegate(FUNC(ptm6840_device::read), ptm_ic3ss));
diff --git a/src/mame/machine/namco06.cpp b/src/mame/machine/namco06.cpp
index 0b3ba86d86a..9ff0d3655ea 100644
--- a/src/mame/machine/namco06.cpp
+++ b/src/mame/machine/namco06.cpp
@@ -145,7 +145,7 @@ READ8_MEMBER( namco_06xx_device::ctrl_r )
WRITE8_MEMBER( namco_06xx_device::ctrl_w )
{
- LOG("%s: 06XX '%s' control %02x\n",space.machine().describe_context(),tag(),data);
+ LOG("%s: 06XX '%s' control %02x\n",machine().describe_context(),tag(),data);
m_control = data;
diff --git a/src/mame/machine/namcos2.cpp b/src/mame/machine/namcos2.cpp
index eb055be1911..71aac181e3b 100644
--- a/src/mame/machine/namcos2.cpp
+++ b/src/mame/machine/namcos2.cpp
@@ -92,7 +92,7 @@ WRITE8_MEMBER(namcos2_shared_state::sound_reset_w)
//printf( "dspkick=0x%x\n", data );
if (data & 0x04)
{
- (*namcos2_kickstart)(space.machine(), 1);
+ (*namcos2_kickstart)(machine(), 1);
}
}
}
@@ -327,7 +327,7 @@ READ16_MEMBER( namcos2_state::namcos2_68k_key_r )
// case 3: return 0x142;
case 4: return 0x142;
// case 3: popmessage("blah %08x",space.device().safe_pc());
- default: return space.machine().rand();
+ default: return machine().rand();
}
case NAMCOS2_SUPER_WSTADIUM_92:
@@ -383,7 +383,7 @@ READ16_MEMBER( namcos2_state::namcos2_68k_key_r )
- return space.machine().rand()&0xffff;
+ return machine().rand()&0xffff;
}
WRITE16_MEMBER( namcos2_state::namcos2_68k_key_w )
diff --git a/src/mame/machine/nb1413m3.cpp b/src/mame/machine/nb1413m3.cpp
index 0092777d760..6932ee133d8 100644
--- a/src/mame/machine/nb1413m3.cpp
+++ b/src/mame/machine/nb1413m3.cpp
@@ -289,8 +289,8 @@ READ8_MEMBER( nb1413m3_device::sndrom_r )
popmessage("Sound ROM %02X:%05X [B1:%02X B2:%02X]", rombank, offset, m_sndrombank1, m_sndrombank2);
#endif
- if (offset < space.machine().root_device().memregion(m_sndromrgntag)->bytes())
- return space.machine().root_device().memregion(m_sndromrgntag)->base()[offset];
+ if (offset < machine().root_device().memregion(m_sndromrgntag)->bytes())
+ return machine().root_device().memregion(m_sndromrgntag)->base()[offset];
else
{
popmessage("read past sound ROM length (%05x[%02X])",offset, rombank);
@@ -313,7 +313,7 @@ WRITE8_MEMBER( nb1413m3_device::sndrombank2_w )
READ8_MEMBER( nb1413m3_device::gfxrom_r )
{
- uint8_t *GFXROM = space.machine().root_device().memregion("gfx1")->base();
+ uint8_t *GFXROM = machine().root_device().memregion("gfx1")->base();
return GFXROM[(0x20000 * (m_gfxrombank | ((m_sndrombank1 & 0x02) << 3))) + ((0x0200 * m_gfxradr_h) + (0x0002 * m_gfxradr_l)) + (offset & 0x01)];
}
@@ -340,12 +340,12 @@ WRITE8_MEMBER( nb1413m3_device::inputportsel_w )
READ8_MEMBER( nb1413m3_device::inputport0_r )
{
- return ((space.machine().root_device().ioport("SYSTEM")->read() & 0xfd) | ((m_outcoin_flag & 0x01) << 1));
+ return ((machine().root_device().ioport("SYSTEM")->read() & 0xfd) | ((m_outcoin_flag & 0x01) << 1));
}
READ8_MEMBER( nb1413m3_device::inputport1_r )
{
- device_t &root = space.machine().root_device();
+ device_t &root = machine().root_device();
switch (m_nb1413m3_type)
{
case NB1413M3_HYHOO:
@@ -394,7 +394,7 @@ READ8_MEMBER( nb1413m3_device::inputport1_r )
READ8_MEMBER( nb1413m3_device::inputport2_r )
{
- device_t &root = space.machine().root_device();
+ device_t &root = machine().root_device();
switch (m_nb1413m3_type)
{
case NB1413M3_HYHOO:
@@ -466,7 +466,7 @@ READ8_MEMBER( nb1413m3_device::inputport3_r )
READ8_MEMBER( nb1413m3_device::dipsw1_r )
{
- device_t &root = space.machine().root_device();
+ device_t &root = machine().root_device();
switch (m_nb1413m3_type)
{
case NB1413M3_KANATUEN:
@@ -504,13 +504,13 @@ READ8_MEMBER( nb1413m3_device::dipsw1_r )
((root.ioport("DSWA")->read() & 0x01) << 4) | ((root.ioport("DSWA")->read() & 0x04) << 3) |
((root.ioport("DSWA")->read() & 0x10) << 2) | ((root.ioport("DSWA")->read() & 0x40) << 1));
default:
- return space.machine().root_device().ioport("DSWA")->read();
+ return machine().root_device().ioport("DSWA")->read();
}
}
READ8_MEMBER( nb1413m3_device::dipsw2_r )
{
- device_t &root = space.machine().root_device();
+ device_t &root = machine().root_device();
switch (m_nb1413m3_type)
{
case NB1413M3_KANATUEN:
@@ -548,18 +548,18 @@ READ8_MEMBER( nb1413m3_device::dipsw2_r )
((root.ioport("DSWA")->read() & 0x02) << 3) | ((root.ioport("DSWA")->read() & 0x08) << 2) |
((root.ioport("DSWA")->read() & 0x20) << 1) | ((root.ioport("DSWA")->read() & 0x80) << 0));
default:
- return space.machine().root_device().ioport("DSWB")->read();
+ return machine().root_device().ioport("DSWB")->read();
}
}
READ8_MEMBER( nb1413m3_device::dipsw3_l_r )
{
- return ((space.machine().root_device().ioport("DSWC")->read() & 0xf0) >> 4);
+ return ((machine().root_device().ioport("DSWC")->read() & 0xf0) >> 4);
}
READ8_MEMBER( nb1413m3_device::dipsw3_h_r )
{
- return ((space.machine().root_device().ioport("DSWC")->read() & 0x0f) >> 0);
+ return ((machine().root_device().ioport("DSWC")->read() & 0x0f) >> 0);
}
WRITE8_MEMBER( nb1413m3_device::outcoin_w )
@@ -598,7 +598,7 @@ WRITE8_MEMBER( nb1413m3_device::outcoin_w )
break;
}
- space.machine().output().set_led_value(2, m_outcoin_flag); // out coin
+ machine().output().set_led_value(2, m_outcoin_flag); // out coin
}
WRITE8_MEMBER( nb1413m3_device::vcrctrl_w )
@@ -606,11 +606,11 @@ WRITE8_MEMBER( nb1413m3_device::vcrctrl_w )
if (data & 0x08)
{
popmessage(" ** VCR CONTROL ** ");
- space.machine().output().set_led_value(2, 1);
+ machine().output().set_led_value(2, 1);
}
else
{
- space.machine().output().set_led_value(2, 0);
+ machine().output().set_led_value(2, 0);
}
}
diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp
index f9dad1b0c2a..7feedb42209 100644
--- a/src/mame/machine/sgi.cpp
+++ b/src/mame/machine/sgi.cpp
@@ -141,181 +141,181 @@ READ32_MEMBER( sgi_mc_device::read )
{
case 0x0000:
case 0x0004:
- //verboselog( space.machine(), 3, "CPU Control 0 Read: %08x (%08x)\n", m_nCPUControl0, mem_mask );
+ //verboselog( machine(), 3, "CPU Control 0 Read: %08x (%08x)\n", m_nCPUControl0, mem_mask );
return m_nCPUControl0;
case 0x0008:
case 0x000c:
- //verboselog( space.machine(), 2, "CPU Control 1 Read: %08x (%08x)\n", m_nCPUControl1, mem_mask );
+ //verboselog( machine(), 2, "CPU Control 1 Read: %08x (%08x)\n", m_nCPUControl1, mem_mask );
return m_nCPUControl1;
case 0x0010:
case 0x0014:
- //verboselog( space.machine(), 2, "Watchdog Timer Read: %08x (%08x)\n", m_nWatchdog, mem_mask );
+ //verboselog( machine(), 2, "Watchdog Timer Read: %08x (%08x)\n", m_nWatchdog, mem_mask );
return m_nWatchdog;
case 0x0018:
case 0x001c:
- //verboselog( space.machine(), 2, "System ID Read: %08x (%08x)\n", m_nSysID, mem_mask );
+ //verboselog( machine(), 2, "System ID Read: %08x (%08x)\n", m_nSysID, mem_mask );
return m_nSysID;
case 0x0028:
case 0x002c:
- //verboselog( space.machine(), 2, "RPSS Divider Read: %08x (%08x)\n", m_nRPSSDiv, mem_mask );
+ //verboselog( machine(), 2, "RPSS Divider Read: %08x (%08x)\n", m_nRPSSDiv, mem_mask );
return m_nRPSSDiv;
case 0x0030:
case 0x0034:
- //verboselog( space.machine(), 2, "R4000 EEPROM Read\n" );
+ //verboselog( machine(), 2, "R4000 EEPROM Read\n" );
return 0;
case 0x0040:
case 0x0044:
- //verboselog( space.machine(), 2, "Refresh Count Preload Read: %08x (%08x)\n", m_nRefCntPreload, mem_mask );
+ //verboselog( machine(), 2, "Refresh Count Preload Read: %08x (%08x)\n", m_nRefCntPreload, mem_mask );
return m_nRefCntPreload;
case 0x0048:
case 0x004c:
- //verboselog( space.machine(), 2, "Refresh Count Read: %08x (%08x)\n", m_nRefCnt, mem_mask );
+ //verboselog( machine(), 2, "Refresh Count Read: %08x (%08x)\n", m_nRefCnt, mem_mask );
return m_nRefCnt;
case 0x0080:
case 0x0084:
- //verboselog( space.machine(), 2, "GIO64 Arbitration Param Read: %08x (%08x)\n", m_nGIO64ArbParam, mem_mask );
+ //verboselog( machine(), 2, "GIO64 Arbitration Param Read: %08x (%08x)\n", m_nGIO64ArbParam, mem_mask );
return m_nGIO64ArbParam;
case 0x0088:
case 0x008c:
- //verboselog( space.machine(), 2, "Arbiter CPU Time Read: %08x (%08x)\n", m_nArbCPUTime, mem_mask );
+ //verboselog( machine(), 2, "Arbiter CPU Time Read: %08x (%08x)\n", m_nArbCPUTime, mem_mask );
return m_nArbCPUTime;
case 0x0098:
case 0x009c:
- //verboselog( space.machine(), 2, "Arbiter Long Burst Time Read: %08x (%08x)\n", m_nArbBurstTime, mem_mask );
+ //verboselog( machine(), 2, "Arbiter Long Burst Time Read: %08x (%08x)\n", m_nArbBurstTime, mem_mask );
return m_nArbBurstTime;
case 0x00c0:
case 0x00c4:
- //verboselog( space.machine(), 3, "Memory Configuration Register 0 Read: %08x (%08x)\n", m_nMemCfg0, mem_mask );
+ //verboselog( machine(), 3, "Memory Configuration Register 0 Read: %08x (%08x)\n", m_nMemCfg0, mem_mask );
return m_nMemCfg0;
case 0x00c8:
case 0x00cc:
- //verboselog( space.machine(), 3, "Memory Configuration Register 1 Read: %08x (%08x)\n", m_nMemCfg1, mem_mask );
+ //verboselog( machine(), 3, "Memory Configuration Register 1 Read: %08x (%08x)\n", m_nMemCfg1, mem_mask );
return m_nMemCfg1;
case 0x00d0:
case 0x00d4:
- //verboselog( space.machine(), 2, "CPU Memory Access Config Params Read: %08x (%08x)\n", m_nCPUMemAccCfg, mem_mask );
+ //verboselog( machine(), 2, "CPU Memory Access Config Params Read: %08x (%08x)\n", m_nCPUMemAccCfg, mem_mask );
return m_nCPUMemAccCfg;
case 0x00d8:
case 0x00dc:
- //verboselog( space.machine(), 2, "GIO Memory Access Config Params Read: %08x (%08x)\n", m_nGIOMemAccCfg, mem_mask );
+ //verboselog( machine(), 2, "GIO Memory Access Config Params Read: %08x (%08x)\n", m_nGIOMemAccCfg, mem_mask );
return m_nGIOMemAccCfg;
case 0x00e0:
case 0x00e4:
- //verboselog( space.machine(), 2, "CPU Error Address Read: %08x (%08x)\n", m_nCPUErrorAddr, mem_mask );
+ //verboselog( machine(), 2, "CPU Error Address Read: %08x (%08x)\n", m_nCPUErrorAddr, mem_mask );
return m_nCPUErrorAddr;
case 0x00e8:
case 0x00ec:
- //verboselog( space.machine(), 2, "CPU Error Status Read: %08x (%08x)\n", m_nCPUErrorStatus, mem_mask );
+ //verboselog( machine(), 2, "CPU Error Status Read: %08x (%08x)\n", m_nCPUErrorStatus, mem_mask );
return m_nCPUErrorStatus;
case 0x00f0:
case 0x00f4:
- //verboselog( space.machine(), 2, "GIO Error Address Read: %08x (%08x)\n", m_nGIOErrorAddr, mem_mask );
+ //verboselog( machine(), 2, "GIO Error Address Read: %08x (%08x)\n", m_nGIOErrorAddr, mem_mask );
return m_nGIOErrorAddr;
case 0x00f8:
case 0x00fc:
- //verboselog( space.machine(), 2, "GIO Error Status Read: %08x (%08x)\n", m_nGIOErrorStatus, mem_mask );
+ //verboselog( machine(), 2, "GIO Error Status Read: %08x (%08x)\n", m_nGIOErrorStatus, mem_mask );
return m_nGIOErrorStatus;
case 0x0100:
case 0x0104:
- //verboselog( space.machine(), 2, "System Semaphore Read: %08x (%08x)\n", m_nSysSemaphore, mem_mask );
+ //verboselog( machine(), 2, "System Semaphore Read: %08x (%08x)\n", m_nSysSemaphore, mem_mask );
return m_nSysSemaphore;
case 0x0108:
case 0x010c:
- //verboselog( space.machine(), 2, "GIO Lock Read: %08x (%08x)\n", m_nGIOLock, mem_mask );
+ //verboselog( machine(), 2, "GIO Lock Read: %08x (%08x)\n", m_nGIOLock, mem_mask );
return m_nGIOLock;
case 0x0110:
case 0x0114:
- //verboselog( space.machine(), 2, "EISA Lock Read: %08x (%08x)\n", m_nEISALock, mem_mask );
+ //verboselog( machine(), 2, "EISA Lock Read: %08x (%08x)\n", m_nEISALock, mem_mask );
return m_nEISALock;
case 0x0150:
case 0x0154:
- //verboselog( space.machine(), 2, "GIO64 Translation Address Mask Read: %08x (%08x)\n", m_nGIO64TransMask, mem_mask );
+ //verboselog( machine(), 2, "GIO64 Translation Address Mask Read: %08x (%08x)\n", m_nGIO64TransMask, mem_mask );
return m_nGIO64TransMask;
case 0x0158:
case 0x015c:
- //verboselog( space.machine(), 2, "GIO64 Translation Address Substitution Bits Read: %08x (%08x)\n", m_nGIO64Subst, mem_mask );
+ //verboselog( machine(), 2, "GIO64 Translation Address Substitution Bits Read: %08x (%08x)\n", m_nGIO64Subst, mem_mask );
return m_nGIO64Subst;
case 0x0160:
case 0x0164:
- //verboselog( space.machine(), 2, "DMA Interrupt Cause: %08x (%08x)\n", m_nDMAIntrCause, mem_mask );
+ //verboselog( machine(), 2, "DMA Interrupt Cause: %08x (%08x)\n", m_nDMAIntrCause, mem_mask );
return m_nDMAIntrCause;
case 0x0168:
case 0x016c:
- //verboselog( space.machine(), 2, "DMA Control Read: %08x (%08x)\n", m_nDMAControl, mem_mask );
+ //verboselog( machine(), 2, "DMA Control Read: %08x (%08x)\n", m_nDMAControl, mem_mask );
return m_nDMAControl;
case 0x0180:
case 0x0184:
- //verboselog( space.machine(), 2, "DMA TLB Entry 0 High Read: %08x (%08x)\n", m_nDMATLBEntry0Hi, mem_mask );
+ //verboselog( machine(), 2, "DMA TLB Entry 0 High Read: %08x (%08x)\n", m_nDMATLBEntry0Hi, mem_mask );
return m_nDMATLBEntry0Hi;
case 0x0188:
case 0x018c:
- //verboselog( space.machine(), 2, "DMA TLB Entry 0 Low Read: %08x (%08x)\n", m_nDMATLBEntry0Lo, mem_mask );
+ //verboselog( machine(), 2, "DMA TLB Entry 0 Low Read: %08x (%08x)\n", m_nDMATLBEntry0Lo, mem_mask );
return m_nDMATLBEntry0Lo;
case 0x0190:
case 0x0194:
- //verboselog( space.machine(), 2, "DMA TLB Entry 1 High Read: %08x (%08x)\n", m_nDMATLBEntry1Hi, mem_mask );
+ //verboselog( machine(), 2, "DMA TLB Entry 1 High Read: %08x (%08x)\n", m_nDMATLBEntry1Hi, mem_mask );
return m_nDMATLBEntry1Hi;
case 0x0198:
case 0x019c:
- //verboselog( space.machine(), 2, "DMA TLB Entry 1 Low Read: %08x (%08x)\n", m_nDMATLBEntry1Lo, mem_mask );
+ //verboselog( machine(), 2, "DMA TLB Entry 1 Low Read: %08x (%08x)\n", m_nDMATLBEntry1Lo, mem_mask );
return m_nDMATLBEntry1Lo;
case 0x01a0:
case 0x01a4:
- //verboselog( space.machine(), 2, "DMA TLB Entry 2 High Read: %08x (%08x)\n", m_nDMATLBEntry2Hi, mem_mask );
+ //verboselog( machine(), 2, "DMA TLB Entry 2 High Read: %08x (%08x)\n", m_nDMATLBEntry2Hi, mem_mask );
return m_nDMATLBEntry2Hi;
case 0x01a8:
case 0x01ac:
- //verboselog( space.machine(), 2, "DMA TLB Entry 2 Low Read: %08x (%08x)\n", m_nDMATLBEntry2Lo, mem_mask );
+ //verboselog( machine(), 2, "DMA TLB Entry 2 Low Read: %08x (%08x)\n", m_nDMATLBEntry2Lo, mem_mask );
return m_nDMATLBEntry2Lo;
case 0x01b0:
case 0x01b4:
- //verboselog( space.machine(), 2, "DMA TLB Entry 3 High Read: %08x (%08x)\n", m_nDMATLBEntry3Hi, mem_mask );
+ //verboselog( machine(), 2, "DMA TLB Entry 3 High Read: %08x (%08x)\n", m_nDMATLBEntry3Hi, mem_mask );
return m_nDMATLBEntry3Hi;
case 0x01b8:
case 0x01bc:
- //verboselog( space.machine(), 2, "DMA TLB Entry 3 Low Read: %08x (%08x)\n", m_nDMATLBEntry3Lo, mem_mask );
+ //verboselog( machine(), 2, "DMA TLB Entry 3 Low Read: %08x (%08x)\n", m_nDMATLBEntry3Lo, mem_mask );
return m_nDMATLBEntry3Lo;
case 0x1000:
case 0x1004:
- //verboselog( space.machine(), 2, "RPSS 100ns Counter Read: %08x (%08x)\n", m_nRPSSCounter, mem_mask );
+ //verboselog( machine(), 2, "RPSS 100ns Counter Read: %08x (%08x)\n", m_nRPSSCounter, mem_mask );
return m_nRPSSCounter;
case 0x2000:
case 0x2004:
case 0x2008:
case 0x200c:
- //verboselog( space.machine(), 0, "DMA Memory Address Read: %08x (%08x)\n", m_nDMAMemAddr, mem_mask );
+ //verboselog( machine(), 0, "DMA Memory Address Read: %08x (%08x)\n", m_nDMAMemAddr, mem_mask );
return m_nDMAMemAddr;
case 0x2010:
case 0x2014:
- //verboselog( space.machine(), 0, "DMA Line Count and Width Read: %08x (%08x)\n", m_nDMALineCntWidth, mem_mask );
+ //verboselog( machine(), 0, "DMA Line Count and Width Read: %08x (%08x)\n", m_nDMALineCntWidth, mem_mask );
return m_nDMALineCntWidth;
case 0x2018:
case 0x201c:
- //verboselog( space.machine(), 0, "DMA Line Zoom and Stride Read: %08x (%08x)\n", m_nDMALineZoomStride, mem_mask );
+ //verboselog( machine(), 0, "DMA Line Zoom and Stride Read: %08x (%08x)\n", m_nDMALineZoomStride, mem_mask );
return m_nDMALineZoomStride;
case 0x2020:
case 0x2024:
case 0x2028:
case 0x202c:
- //verboselog( space.machine(), 0, "DMA GIO64 Address Read: %08x (%08x)\n", m_nDMAGIO64Addr, mem_mask );
+ //verboselog( machine(), 0, "DMA GIO64 Address Read: %08x (%08x)\n", m_nDMAGIO64Addr, mem_mask );
return m_nDMAGIO64Addr;
case 0x2030:
case 0x2034:
- //verboselog( space.machine(), 0, "DMA Mode Write: %08x (%08x)\n", m_nDMAMode, mem_mask );
+ //verboselog( machine(), 0, "DMA Mode Write: %08x (%08x)\n", m_nDMAMode, mem_mask );
return m_nDMAMode;
case 0x2038:
case 0x203c:
- //verboselog( space.machine(), 0, "DMA Zoom Count Read: %08x (%08x)\n", m_nDMAZoomByteCnt, mem_mask );
+ //verboselog( machine(), 0, "DMA Zoom Count Read: %08x (%08x)\n", m_nDMAZoomByteCnt, mem_mask );
return m_nDMAZoomByteCnt;
// case 0x2040:
// case 0x2044:
-// //verboselog( space.machine(), 2, "DMA Start Write: %08x (%08x)\n", data, mem_mask );
+// //verboselog( machine(), 2, "DMA Start Write: %08x (%08x)\n", data, mem_mask );
// Start DMA
// m_nDMARunning = 1;
// break;
case 0x2048:
case 0x204c:
- //verboselog( space.machine(), 0, "VDMA Running Read: %08x (%08x)\n", m_nDMARunning, mem_mask );
+ //verboselog( machine(), 0, "VDMA Running Read: %08x (%08x)\n", m_nDMARunning, mem_mask );
if( m_nDMARunning == 1 )
{
m_nDMARunning = 0;
@@ -326,7 +326,7 @@ READ32_MEMBER( sgi_mc_device::read )
return 0;
}
}
- //verboselog( space.machine(), 0, "Unmapped MC read: 0x%08x (%08x)\n", 0x1fa00000 + offset, mem_mask );
+ //verboselog( machine(), 0, "Unmapped MC read: 0x%08x (%08x)\n", 0x1fa00000 + offset, mem_mask );
return 0;
}
@@ -337,210 +337,210 @@ WRITE32_MEMBER( sgi_mc_device::write )
{
case 0x0000:
case 0x0004:
- //verboselog( space.machine(), 2, "CPU Control 0 Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "CPU Control 0 Write: %08x (%08x)\n", data, mem_mask );
m_nCPUControl0 = data;
break;
case 0x0008:
case 0x000c:
- //verboselog( space.machine(), 2, "CPU Control 1 Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "CPU Control 1 Write: %08x (%08x)\n", data, mem_mask );
m_nCPUControl1 = data;
break;
case 0x0010:
case 0x0014:
- //verboselog( space.machine(), 2, "Watchdog Timer Clear" );
+ //verboselog( machine(), 2, "Watchdog Timer Clear" );
m_nWatchdog = 0;
break;
case 0x0028:
case 0x002c:
- //verboselog( space.machine(), 2, "RPSS Divider Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "RPSS Divider Write: %08x (%08x)\n", data, mem_mask );
m_nRPSSDiv = data;
break;
case 0x0030:
case 0x0034:
- //verboselog( space.machine(), 2, "R4000 EEPROM Write\n" );
+ //verboselog( machine(), 2, "R4000 EEPROM Write\n" );
break;
case 0x0040:
case 0x0044:
- //verboselog( space.machine(), 2, "Refresh Count Preload Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "Refresh Count Preload Write: %08x (%08x)\n", data, mem_mask );
m_nRefCntPreload = data;
break;
case 0x0080:
case 0x0084:
- //verboselog( space.machine(), 2, "GIO64 Arbitration Param Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "GIO64 Arbitration Param Write: %08x (%08x)\n", data, mem_mask );
m_nGIO64ArbParam = data;
break;
case 0x0088:
case 0x008c:
- //verboselog( space.machine(), 3, "Arbiter CPU Time Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 3, "Arbiter CPU Time Write: %08x (%08x)\n", data, mem_mask );
m_nArbCPUTime = data;
break;
case 0x0098:
case 0x009c:
- //verboselog( space.machine(), 3, "Arbiter Long Burst Time Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 3, "Arbiter Long Burst Time Write: %08x (%08x)\n", data, mem_mask );
m_nArbBurstTime = data;
break;
case 0x00c0:
case 0x00c4:
- //verboselog( space.machine(), 3, "Memory Configuration Register 0 Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 3, "Memory Configuration Register 0 Write: %08x (%08x)\n", data, mem_mask );
m_nMemCfg0 = data;
break;
case 0x00c8:
case 0x00cc:
- //verboselog( space.machine(), 3, "Memory Configuration Register 1 Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 3, "Memory Configuration Register 1 Write: %08x (%08x)\n", data, mem_mask );
m_nMemCfg1 = data;
break;
case 0x00d0:
case 0x00d4:
- //verboselog( space.machine(), 2, "CPU Memory Access Config Params Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "CPU Memory Access Config Params Write: %08x (%08x)\n", data, mem_mask );
m_nCPUMemAccCfg = data;
break;
case 0x00d8:
case 0x00dc:
- //verboselog( space.machine(), 2, "GIO Memory Access Config Params Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "GIO Memory Access Config Params Write: %08x (%08x)\n", data, mem_mask );
m_nGIOMemAccCfg = data;
break;
case 0x00e8:
case 0x00ec:
- //verboselog( space.machine(), 2, "CPU Error Status Clear\n" );
+ //verboselog( machine(), 2, "CPU Error Status Clear\n" );
m_nCPUErrorStatus = 0;
break;
case 0x00f8:
case 0x00fc:
- //verboselog( space.machine(), 2, "GIO Error Status Clear\n" );
+ //verboselog( machine(), 2, "GIO Error Status Clear\n" );
m_nGIOErrorStatus = 0;
break;
case 0x0100:
case 0x0104:
- //verboselog( space.machine(), 2, "System Semaphore Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "System Semaphore Write: %08x (%08x)\n", data, mem_mask );
m_nSysSemaphore = data;
break;
case 0x0108:
case 0x010c:
- //verboselog( space.machine(), 2, "GIO Lock Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "GIO Lock Write: %08x (%08x)\n", data, mem_mask );
m_nGIOLock = data;
break;
case 0x0110:
case 0x0114:
- //verboselog( space.machine(), 2, "EISA Lock Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "EISA Lock Write: %08x (%08x)\n", data, mem_mask );
m_nEISALock = data;
break;
case 0x0150:
case 0x0154:
- //verboselog( space.machine(), 2, "GIO64 Translation Address Mask Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "GIO64 Translation Address Mask Write: %08x (%08x)\n", data, mem_mask );
m_nGIO64TransMask = data;
break;
case 0x0158:
case 0x015c:
- //verboselog( space.machine(), 2, "GIO64 Translation Address Substitution Bits Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 2, "GIO64 Translation Address Substitution Bits Write: %08x (%08x)\n", data, mem_mask );
m_nGIO64Subst = data;
break;
case 0x0160:
case 0x0164:
- //verboselog( space.machine(), 0, "DMA Interrupt Cause Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Interrupt Cause Write: %08x (%08x)\n", data, mem_mask );
m_nDMAIntrCause = data;
break;
case 0x0168:
case 0x016c:
- //verboselog( space.machine(), 0, "DMA Control Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Control Write: %08x (%08x)\n", data, mem_mask );
m_nDMAControl = data;
break;
case 0x0180:
case 0x0184:
- //verboselog( space.machine(), 0, "DMA TLB Entry 0 High Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA TLB Entry 0 High Write: %08x (%08x)\n", data, mem_mask );
m_nDMATLBEntry0Hi = data;
break;
case 0x0188:
case 0x018c:
- //verboselog( space.machine(), 0, "DMA TLB Entry 0 Low Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA TLB Entry 0 Low Write: %08x (%08x)\n", data, mem_mask );
m_nDMATLBEntry0Lo = data;
break;
case 0x0190:
case 0x0194:
- //verboselog( space.machine(), 0, "DMA TLB Entry 1 High Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA TLB Entry 1 High Write: %08x (%08x)\n", data, mem_mask );
m_nDMATLBEntry1Hi = data;
break;
case 0x0198:
case 0x019c:
- //verboselog( space.machine(), 0, "DMA TLB Entry 1 Low Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA TLB Entry 1 Low Write: %08x (%08x)\n", data, mem_mask );
m_nDMATLBEntry1Lo = data;
break;
case 0x01a0:
case 0x01a4:
- //verboselog( space.machine(), 0, "DMA TLB Entry 2 High Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA TLB Entry 2 High Write: %08x (%08x)\n", data, mem_mask );
m_nDMATLBEntry2Hi = data;
break;
case 0x01a8:
case 0x01ac:
- //verboselog( space.machine(), 0, "DMA TLB Entry 2 Low Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA TLB Entry 2 Low Write: %08x (%08x)\n", data, mem_mask );
m_nDMATLBEntry2Lo = data;
break;
case 0x01b0:
case 0x01b4:
- //verboselog( space.machine(), 0, "DMA TLB Entry 3 High Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA TLB Entry 3 High Write: %08x (%08x)\n", data, mem_mask );
m_nDMATLBEntry3Hi = data;
break;
case 0x01b8:
case 0x01bc:
- //verboselog( space.machine(), 0, "DMA TLB Entry 3 Low Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA TLB Entry 3 Low Write: %08x (%08x)\n", data, mem_mask );
m_nDMATLBEntry3Lo = data;
break;
case 0x2000:
case 0x2004:
- //verboselog( space.machine(), 0, "DMA Memory Address Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Memory Address Write: %08x (%08x)\n", data, mem_mask );
m_nDMAMemAddr = data;
break;
case 0x2008:
case 0x200c:
- //verboselog( space.machine(), 0, "DMA Memory Address + Default Params Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Memory Address + Default Params Write: %08x (%08x)\n", data, mem_mask );
m_nDMAMemAddr = data;
break;
case 0x2010:
case 0x2014:
- //verboselog( space.machine(), 0, "DMA Line Count and Width Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Line Count and Width Write: %08x (%08x)\n", data, mem_mask );
m_nDMALineCntWidth = data;
break;
case 0x2018:
case 0x201c:
- //verboselog( space.machine(), 0, "DMA Line Zoom and Stride Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Line Zoom and Stride Write: %08x (%08x)\n", data, mem_mask );
m_nDMALineZoomStride = data;
break;
case 0x2020:
case 0x2024:
- //verboselog( space.machine(), 0, "DMA GIO64 Address Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA GIO64 Address Write: %08x (%08x)\n", data, mem_mask );
m_nDMAGIO64Addr = data;
break;
case 0x2028:
case 0x202c:
- //verboselog( space.machine(), 0, "DMA GIO64 Address Write + Start DMA: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA GIO64 Address Write + Start DMA: %08x (%08x)\n", data, mem_mask );
m_nDMAGIO64Addr = data;
// Start DMA
m_nDMARunning = 1;
break;
case 0x2030:
case 0x2034:
- //verboselog( space.machine(), 0, "DMA Mode Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Mode Write: %08x (%08x)\n", data, mem_mask );
m_nDMAMode = data;
break;
case 0x2038:
case 0x203c:
- //verboselog( space.machine(), 0, "DMA Zoom Count + Byte Count Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Zoom Count + Byte Count Write: %08x (%08x)\n", data, mem_mask );
m_nDMAZoomByteCnt = data;
break;
case 0x2040:
case 0x2044:
- //verboselog( space.machine(), 0, "DMA Start Write: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA Start Write: %08x (%08x)\n", data, mem_mask );
// Start DMA
m_nDMARunning = 1;
break;
case 0x2070:
case 0x2074:
- //verboselog( space.machine(), 0, "DMA GIO64 Address Write + Default Params Write + Start DMA: %08x (%08x)\n", data, mem_mask );
+ //verboselog( machine(), 0, "DMA GIO64 Address Write + Default Params Write + Start DMA: %08x (%08x)\n", data, mem_mask );
m_nDMAGIO64Addr = data;
// Start DMA
m_nDMARunning = 1;
break;
default:
- //verboselog( space.machine(), 0, "Unmapped MC write: 0x%08x: %08x (%08x)\n", 0x1fa00000 + offset, data, mem_mask );
+ //verboselog( machine(), 0, "Unmapped MC write: 0x%08x: %08x (%08x)\n", 0x1fa00000 + offset, data, mem_mask );
break;
}
}
diff --git a/src/mame/machine/slapstic.cpp b/src/mame/machine/slapstic.cpp
index 28f12fb7821..9b751954b88 100644
--- a/src/mame/machine/slapstic.cpp
+++ b/src/mame/machine/slapstic.cpp
@@ -1077,7 +1077,7 @@ int atari_slapstic_device::slapstic_tweak(address_space &space, offs_t offset)
/* log this access */
if (LOG_SLAPSTIC)
- slapstic_log(space.machine(), offset);
+ slapstic_log(machine(), offset);
/* return the active bank */
return current_bank;
diff --git a/src/mame/machine/snes.cpp b/src/mame/machine/snes.cpp
index 56f452e2fa1..887b02d7ca9 100644
--- a/src/mame/machine/snes.cpp
+++ b/src/mame/machine/snes.cpp
@@ -490,7 +490,7 @@ WRITE8_MEMBER( snes_state::snes_w_io )
{
// printf("816: %02x to APU @ %d (PC=%06x)\n", data, offset & 3,space.device().safe_pc());
m_spc700->spc_port_in(space, offset & 0x3, data);
- space.machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(20));
+ machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(20));
return;
}
diff --git a/src/mame/machine/stvprot.cpp b/src/mame/machine/stvprot.cpp
index 02b110f33df..eaf95385624 100644
--- a/src/mame/machine/stvprot.cpp
+++ b/src/mame/machine/stvprot.cpp
@@ -30,7 +30,7 @@
READ32_MEMBER( stv_state::common_prot_r )
{
- uint32_t *ROM = (uint32_t *)space.machine().root_device().memregion("abus")->base();
+ uint32_t *ROM = (uint32_t *)machine().root_device().memregion("abus")->base();
if(m_abus_protenable & 0x00010000)//protection calculation is activated
{
diff --git a/src/mame/machine/thomflop.cpp b/src/mame/machine/thomflop.cpp
index 25fa0292a7f..2c2a3d4968e 100644
--- a/src/mame/machine/thomflop.cpp
+++ b/src/mame/machine/thomflop.cpp
@@ -753,7 +753,7 @@ WRITE8_MEMBER( thomson_state::to7_qdd_w )
int bits, parity;
bits = bit[ (data >> 3) & 7 ];
parity = par[ (data >> 3) & 7 ];
- to7_qdd_stat_update(space.machine());
+ to7_qdd_stat_update(machine());
VLOG(( "%f $%04x to7_qdd_w: CTRL2=$%02X bits=%i par=%s blen=%i under=%s%s\n",
machine().time().as_double(), m_maincpu->pc(), data,
bits, parname[ parity ], data & QDD_C2_BLEN ? 1 : 2,
diff --git a/src/mame/video/antic.cpp b/src/mame/video/antic.cpp
index c5f4a51e819..9dba288d91b 100644
--- a/src/mame/video/antic.cpp
+++ b/src/mame/video/antic.cpp
@@ -1177,7 +1177,7 @@ READ8_MEMBER ( antic_device::read )
data = m_r.antic09;
break;
case 10: /* WSYNC read */
- space.machine().device("maincpu")->execute().spin_until_trigger(TRIGGER_HSYNC);
+ machine().device("maincpu")->execute().spin_until_trigger(TRIGGER_HSYNC);
m_w.wsync = 1;
data = m_r.antic0a;
break;
@@ -1287,7 +1287,7 @@ WRITE8_MEMBER ( antic_device::write )
break;
case 10: /* WSYNC write */
LOG(("ANTIC 0A write WSYNC $%02X\n", data));
- space.machine().device("maincpu")->execute().spin_until_trigger(TRIGGER_HSYNC);
+ machine().device("maincpu")->execute().spin_until_trigger(TRIGGER_HSYNC);
m_w.wsync = 1;
break;
case 11:
diff --git a/src/mame/video/fmtowns.cpp b/src/mame/video/fmtowns.cpp
index 828614a34e7..c3d0d0f3ad0 100644
--- a/src/mame/video/fmtowns.cpp
+++ b/src/mame/video/fmtowns.cpp
@@ -371,8 +371,8 @@ READ8_MEMBER(towns_state::towns_video_440_r)
if(m_video.towns_crtc_sel == 30)
{
// check video position
- xpos = space.machine().first_screen()->hpos();
- ypos = space.machine().first_screen()->vpos();
+ xpos = machine().first_screen()->hpos();
+ ypos = machine().first_screen()->vpos();
if(xpos < (m_video.towns_crtc_reg[0] & 0xfe))
ret |= 0x02;
@@ -546,7 +546,7 @@ READ8_MEMBER(towns_state::towns_video_fd90_r)
return m_video.towns_degipal[offset-0x08];
case 0x10: // "sub status register"
// check video position
- xpos = space.machine().first_screen()->hpos();
+ xpos = machine().first_screen()->hpos();
if(xpos < m_video.towns_crtc_layerscr[0].max_x && xpos > m_video.towns_crtc_layerscr[0].min_x)
ret |= 0x02;
diff --git a/src/mame/video/k001006.cpp b/src/mame/video/k001006.cpp
index 54aa9d088cf..6ce7d0039a1 100644
--- a/src/mame/video/k001006.cpp
+++ b/src/mame/video/k001006.cpp
@@ -70,7 +70,7 @@ READ32_MEMBER( k001006_device::read )
{
case 0x0b: // CG Board ROM read
{
- uint16_t *rom = (uint16_t*)space.machine().root_device().memregion(m_gfx_region)->base();
+ uint16_t *rom = (uint16_t*)machine().root_device().memregion(m_gfx_region)->base();
return rom[m_addr / 2] << 16;
}
case 0x0d: // Palette RAM read
diff --git a/src/mame/video/k001604.cpp b/src/mame/video/k001604.cpp
index 6742471315a..98b69197f7f 100644
--- a/src/mame/video/k001604.cpp
+++ b/src/mame/video/k001604.cpp
@@ -310,8 +310,8 @@ READ32_MEMBER( k001604_device::reg_r )
{
switch (offset)
{
- case 0x54/4: return space.machine().rand() << 16;
- case 0x5c/4: return space.machine().rand() << 16 | space.machine().rand();
+ case 0x54/4: return machine().rand() << 16;
+ case 0x5c/4: return machine().rand() << 16 | machine().rand();
}
return m_reg[offset];
diff --git a/src/mame/video/k007121.cpp b/src/mame/video/k007121.cpp
index 04a367572e5..0f9b483a39a 100644
--- a/src/mame/video/k007121.cpp
+++ b/src/mame/video/k007121.cpp
@@ -174,7 +174,7 @@ WRITE8_MEMBER( k007121_device::ctrl_w )
case 6:
/* palette bank change */
if ((m_ctrlram[offset] & 0x30) != (data & 0x30))
- space.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
break;
case 7:
m_flipscreen = data & 0x08;
diff --git a/src/mame/video/k007342.cpp b/src/mame/video/k007342.cpp
index 5290b1636e6..106d6d3c0cc 100644
--- a/src/mame/video/k007342.cpp
+++ b/src/mame/video/k007342.cpp
@@ -162,7 +162,7 @@ WRITE8_MEMBER( k007342_device::vreg_w )
break;
case 0x01: /* used for banking in Rock'n'Rage */
if (data != m_regs[1])
- space.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
case 0x02:
m_scrollx[0] = (m_scrollx[0] & 0xff) | ((data & 0x01) << 8);
m_scrollx[1] = (m_scrollx[1] & 0xff) | ((data & 0x02) << 7);
diff --git a/src/mame/video/k051316.cpp b/src/mame/video/k051316.cpp
index 18fecde3e1e..cd2053e4690 100644
--- a/src/mame/video/k051316.cpp
+++ b/src/mame/video/k051316.cpp
@@ -213,13 +213,13 @@ READ8_MEMBER( k051316_device::rom_r )
addr /= m_pixels_per_byte;
addr &= m_zoom_rom.mask();
- // popmessage("%s: offset %04x addr %04x", space.machine().describe_context(), offset, addr);
+ // popmessage("%s: offset %04x addr %04x", machine().describe_context(), offset, addr);
return m_zoom_rom[addr];
}
else
{
- //logerror("%s: read 051316 ROM offset %04x but reg 0x0c bit 0 not clear\n", space.machine().describe_context(), offset);
+ //logerror("%s: read 051316 ROM offset %04x but reg 0x0c bit 0 not clear\n", machine().describe_context(), offset);
return 0;
}
}
@@ -227,7 +227,7 @@ READ8_MEMBER( k051316_device::rom_r )
WRITE8_MEMBER( k051316_device::ctrl_w )
{
m_ctrlram[offset] = data;
- //if (offset >= 0x0c) logerror("%s: write %02x to 051316 reg %x\n", space.machine().describe_context(), data, offset);
+ //if (offset >= 0x0c) logerror("%s: write %02x to 051316 reg %x\n", machine().describe_context(), data, offset);
}
// some games (ajax, rollerg, ultraman, etc.) have external logic that can enable or disable wraparound dynamically
diff --git a/src/mame/video/k053244_k053245.cpp b/src/mame/video/k053244_k053245.cpp
index 9e96492e276..0f6acdd9688 100644
--- a/src/mame/video/k053244_k053245.cpp
+++ b/src/mame/video/k053244_k053245.cpp
@@ -239,7 +239,7 @@ WRITE8_MEMBER( k05324x_device::k053244_w )
// popmessage("053244 reg 05 = %02x",data);
/* bit 2 = unknown, Parodius uses it */
/* bit 5 = unknown, Rollergames uses it */
-// logerror("%s: write %02x to 053244 address 5\n", space.machine().describe_context(), data);
+// logerror("%s: write %02x to 053244 address 5\n", machine().describe_context(), data);
break;
case 0x06:
diff --git a/src/mame/video/k053246_k053247_k055673.cpp b/src/mame/video/k053246_k053247_k055673.cpp
index 4948c7b8f60..987d261c21c 100644
--- a/src/mame/video/k053246_k053247_k055673.cpp
+++ b/src/mame/video/k053246_k053247_k055673.cpp
@@ -133,9 +133,9 @@ WRITE8_MEMBER( k053247_device::k053247_w )
// FIXME: rearrange ROM loading so this can be merged with the 4/6/8bpp version
READ16_MEMBER( k053247_device::k055673_5bpp_rom_word_r ) // 5bpp
{
- uint8_t *ROM8 = (uint8_t *)space.machine().root_device().memregion(m_memory_region)->base();
- uint16_t *ROM = (uint16_t *)space.machine().root_device().memregion(m_memory_region)->base();
- int size4 = (space.machine().root_device().memregion(m_memory_region)->bytes() / (1024 * 1024)) / 5;
+ uint8_t *ROM8 = (uint8_t *)machine().root_device().memregion(m_memory_region)->base();
+ uint16_t *ROM = (uint16_t *)machine().root_device().memregion(m_memory_region)->base();
+ int size4 = (machine().root_device().memregion(m_memory_region)->bytes() / (1024 * 1024)) / 5;
int romofs;
size4 *= 4 * 1024 * 1024; // get offset to 5th bit
@@ -174,7 +174,7 @@ READ16_MEMBER( k053247_device::k055673_rom_word_r )
if (m_bpp == 5)
return k055673_5bpp_rom_word_r(space, offset, mem_mask);
- uint16_t *ROM = (uint16_t *)space.machine().root_device().memregion(m_memory_region)->base();
+ uint16_t *ROM = (uint16_t *)machine().root_device().memregion(m_memory_region)->base();
int romofs;
romofs = m_kx46_regs[6] << 16 | m_kx46_regs[7] << 8 | m_kx46_regs[4];
@@ -188,7 +188,7 @@ READ16_MEMBER( k053247_device::k055673_rom_word_r )
READ16_MEMBER( k053247_device::k055673_ps_rom_word_r )
{
- uint8_t *ROM = (uint8_t *)space.machine().root_device().memregion(m_memory_region)->base();
+ uint8_t *ROM = (uint8_t *)machine().root_device().memregion(m_memory_region)->base();
int romofs;
int magic = (offset & 1);
@@ -207,10 +207,10 @@ READ8_MEMBER( k053247_device::k053246_r )
int addr;
addr = (m_kx46_regs[6] << 17) | (m_kx46_regs[7] << 9) | (m_kx46_regs[4] << 1) | ((offset & 1) ^ 1);
- addr &= space.machine().root_device().memregion(m_memory_region)->bytes() - 1;
+ addr &= machine().root_device().memregion(m_memory_region)->bytes() - 1;
// if (VERBOSE)
// popmessage("%04x: offset %02x addr %06x", space.device().safe_pc(), offset, addr);
- return space.machine().root_device().memregion(m_memory_region)->base()[addr];
+ return machine().root_device().memregion(m_memory_region)->base()[addr];
}
else
{
diff --git a/src/mame/video/k053251.cpp b/src/mame/video/k053251.cpp
index 21eece746f6..2b37c44a5aa 100644
--- a/src/mame/video/k053251.cpp
+++ b/src/mame/video/k053251.cpp
@@ -195,7 +195,7 @@ WRITE8_MEMBER( k053251_device::write )
}
if (!m_tilemaps_set)
- space.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
}
else if (offset == 10)
{
@@ -211,7 +211,7 @@ WRITE8_MEMBER( k053251_device::write )
}
if (!m_tilemaps_set)
- space.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
}
}
}
diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp
index f3c5caf9a2d..f96c00dfa70 100644
--- a/src/mame/video/leland.cpp
+++ b/src/mame/video/leland.cpp
@@ -198,14 +198,14 @@ int leland_state::leland_vram_port_r(address_space &space, int offset, int num)
default:
logerror("%s: Warning: Unknown video port %02x read (address=%04x)\n",
- space.machine().describe_context(), offset, addr);
+ machine().describe_context(), offset, addr);
ret = 0;
break;
}
state->m_addr = addr;
if (LOG_COMM && addr >= 0xf000)
- logerror("%s:%s comm read %04X = %02X\n", space.machine().describe_context(), num ? "slave" : "master", addr, ret);
+ logerror("%s:%s comm read %04X = %02X\n", machine().describe_context(), num ? "slave" : "master", addr, ret);
return ret;
}
@@ -233,7 +233,7 @@ void leland_state::leland_vram_port_w(address_space &space, int offset, int data
m_screen->update_partial(scanline - 1);
if (LOG_COMM && addr >= 0xf000)
- logerror("%s:%s comm write %04X = %02X\n", space.machine().describe_context(), num ? "slave" : "master", addr, data);
+ logerror("%s:%s comm write %04X = %02X\n", machine().describe_context(), num ? "slave" : "master", addr, data);
/* based on the low 3 bits of the offset, update the destination */
switch (offset & 7)
@@ -285,7 +285,7 @@ void leland_state::leland_vram_port_w(address_space &space, int offset, int data
default:
logerror("%s:Warning: Unknown video port write (address=%04x value=%02x)\n",
- space.machine().describe_context(), offset, addr);
+ machine().describe_context(), offset, addr);
break;
}
diff --git a/src/mame/video/mitchell.cpp b/src/mame/video/mitchell.cpp
index 536270a7692..8cd42c700aa 100644
--- a/src/mame/video/mitchell.cpp
+++ b/src/mame/video/mitchell.cpp
@@ -145,7 +145,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data);
/* bit 0 is unknown (used, maybe back color enable?) */
/* bit 1 is coin counter */
- space.machine().bookkeeping().coin_counter_w(0, data & 2);
+ machine().bookkeeping().coin_counter_w(0, data & 2);
/* bit 2 is flip screen */
if (m_flipscreen != (data & 0x04))
diff --git a/src/mame/video/namcos2.cpp b/src/mame/video/namcos2.cpp
index 55f6f07a109..56c110a3b43 100644
--- a/src/mame/video/namcos2.cpp
+++ b/src/mame/video/namcos2.cpp
@@ -287,7 +287,7 @@ WRITE16_MEMBER( namcos2_state::rozram_word_w )
{
COMBINE_DATA(&m_rozram[offset]);
m_tilemap_roz->mark_tile_dirty(offset);
- //if( space.machine().input().code_pressed(KEYCODE_Q) )
+ //if( machine().input().code_pressed(KEYCODE_Q) )
//{
// machine().debug_break();
//}