summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-02-24 14:07:24 +0100
committer Olivier Galibert <galibert@pobox.com>2018-02-24 14:09:46 +0100
commitc5345b9ea8a5b6939c55621024bce8e1eade4fdd (patch)
treed75c88692ac40de1f5d7b0a647de7aa4b987bcdc /src/devices
parent1b9a2d8891b1c809f56622380447500e9716790d (diff)
Grammar police (nw)
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp2
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp8
-rw-r--r--src/devices/bus/amiga/keyboard/a500.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_6502.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_65c102.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_arm.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_zep100.cpp2
-rw-r--r--src/devices/bus/c64/currah_speech.cpp2
-rw-r--r--src/devices/bus/intellec4/insdatastor.cpp2
-rw-r--r--src/devices/bus/isa/ega.cpp2
-rw-r--r--src/devices/bus/isa/sb16.cpp2
-rw-r--r--src/devices/bus/msx_cart/holy_quran.cpp2
-rw-r--r--src/devices/bus/spectrum/intf1.cpp2
-rw-r--r--src/devices/bus/spectrum/usource.cpp2
-rw-r--r--src/devices/bus/spectrum/uspeech.cpp2
-rw-r--r--src/devices/bus/ti99/internal/998board.cpp4
-rw-r--r--src/devices/bus/ti99/internal/datamux.cpp4
-rw-r--r--src/devices/bus/ti99/internal/genboard.cpp18
-rw-r--r--src/devices/bus/ti99/peb/bwg.cpp6
-rw-r--r--src/devices/bus/ti99/peb/evpc.cpp2
-rw-r--r--src/devices/bus/ti99/peb/hfdc.cpp6
-rw-r--r--src/devices/bus/ti99/peb/hsgpl.cpp4
-rw-r--r--src/devices/bus/ti99/peb/pcode.cpp4
-rw-r--r--src/devices/bus/ti99/peb/spchsyn.cpp4
-rw-r--r--src/devices/bus/ti99/peb/ti_fdc.cpp8
-rw-r--r--src/devices/bus/ti99/peb/tn_ide.cpp4
-rw-r--r--src/devices/bus/ti99/peb/tn_usbsm.cpp4
-rwxr-xr-xsrc/devices/bus/vcs/rom.cpp26
-rw-r--r--src/devices/bus/vcs/scharger.cpp2
-rw-r--r--src/devices/cpu/alto2/a2hw.cpp10
-rw-r--r--src/devices/cpu/alto2/a2kbd.cpp4
-rw-r--r--src/devices/cpu/alto2/a2mem.cpp14
-rw-r--r--src/devices/cpu/cop400/cop400.cpp4
-rw-r--r--src/devices/cpu/e0c6200/e0c6s46.cpp4
-rw-r--r--src/devices/cpu/lc8670/lc8670.cpp12
-rw-r--r--src/devices/cpu/m6800/m6801.cpp18
-rw-r--r--src/devices/cpu/m6805/m68hc05.cpp14
-rw-r--r--src/devices/cpu/psx/psx.cpp4
-rw-r--r--src/devices/cpu/sharc/sharc.cpp2
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp4
-rw-r--r--src/devices/cpu/tms7000/tms7000.cpp4
-rw-r--r--src/devices/cpu/tms7000/tms7000.h4
-rw-r--r--src/devices/cpu/tms9900/tms9900.cpp4
-rw-r--r--src/devices/cpu/tms9900/tms9995.cpp4
-rw-r--r--src/devices/machine/6522via.cpp2
-rw-r--r--src/devices/machine/6532riot.cpp2
-rw-r--r--src/devices/machine/am9513.cpp2
-rw-r--r--src/devices/machine/autoconfig.cpp4
-rw-r--r--src/devices/machine/cdp1879.cpp2
-rw-r--r--src/devices/machine/gen_latch.cpp6
-rw-r--r--src/devices/machine/i8212.cpp2
-rw-r--r--src/devices/machine/mb8421.cpp2
-rw-r--r--src/devices/machine/mc68901.cpp6
-rw-r--r--src/devices/machine/mm58167.cpp2
-rw-r--r--src/devices/machine/mos6526.cpp14
-rw-r--r--src/devices/machine/mos6530n.cpp6
-rw-r--r--src/devices/machine/mos6551.cpp2
-rw-r--r--src/devices/machine/msm6253.cpp2
-rw-r--r--src/devices/machine/s2636.cpp2
-rw-r--r--src/devices/machine/upd4701.cpp6
-rw-r--r--src/devices/machine/z80sio.cpp6
-rw-r--r--src/devices/machine/z8536.cpp2
-rw-r--r--src/devices/sound/tms5220.cpp4
-rw-r--r--src/devices/video/315_5124.cpp4
-rw-r--r--src/devices/video/bt459.cpp10
-rw-r--r--src/devices/video/clgd542x.cpp2
-rw-r--r--src/devices/video/gb_lcd.cpp8
-rw-r--r--src/devices/video/hd44780.cpp6
-rw-r--r--src/devices/video/nt7534.cpp4
-rw-r--r--src/devices/video/pc_vga.cpp2
-rw-r--r--src/devices/video/stvvdp1.cpp2
-rw-r--r--src/devices/video/stvvdp2.cpp8
-rw-r--r--src/devices/video/t6a04.cpp2
-rw-r--r--src/devices/video/tms9927.cpp2
-rw-r--r--src/devices/video/tms9928a.cpp8
76 files changed, 186 insertions, 186 deletions
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 8e5c5bd7eeb..02a3affc9f2 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -301,7 +301,7 @@ uint8_t a2bus_pcxporter_device::read_c800(uint16_t offset)
case 0x703: // read with increment
rv = m_ram[m_offset];
// don't increment if the debugger's reading
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
m_offset++;
}
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index fad737d8f7b..86e2ba55cab 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -587,7 +587,7 @@ WRITE8_MEMBER( luxor_55_10828_device::ctrl_w )
*/
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return;
// drive selection
@@ -639,7 +639,7 @@ WRITE8_MEMBER( luxor_55_10828_device::status_w )
*/
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return;
m_status = data & 0xfe;
@@ -655,7 +655,7 @@ WRITE8_MEMBER( luxor_55_10828_device::status_w )
READ8_MEMBER( luxor_55_10828_device::fdc_r )
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0xff;
uint8_t data = 0xff;
@@ -683,7 +683,7 @@ READ8_MEMBER( luxor_55_10828_device::fdc_r )
WRITE8_MEMBER( luxor_55_10828_device::fdc_w )
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return;
m_fdc->gen_w(offset, data);
diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp
index 682e779cb72..ae866c62181 100644
--- a/src/devices/bus/amiga/keyboard/a500.cpp
+++ b/src/devices/bus/amiga/keyboard/a500.cpp
@@ -442,7 +442,7 @@ WRITE8_MEMBER( a500_kbd_device::latch_w )
READ8_MEMBER( a500_kbd_device::counter_r )
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
m_control &= ~COUNTER_OVERFLOW;
update_irqs();
diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp
index 305723af347..99884692dfc 100644
--- a/src/devices/bus/bbc/tube/tube_6502.cpp
+++ b/src/devices/bus/bbc/tube/tube_6502.cpp
@@ -130,7 +130,7 @@ READ8_MEMBER(bbc_tube_6502_device::read)
if (offset >= 0xfef0 && offset <= 0xfeff)
{
- if (!machine().side_effect_disabled()) m_rom_enabled = false;
+ if (!machine().side_effects_disabled()) m_rom_enabled = false;
data = m_ula->parasite_r(space, offset);
}
else if (m_rom_enabled && (offset >= 0xf000))
diff --git a/src/devices/bus/bbc/tube/tube_65c102.cpp b/src/devices/bus/bbc/tube/tube_65c102.cpp
index a18f31c3f99..35f170a8c76 100644
--- a/src/devices/bus/bbc/tube/tube_65c102.cpp
+++ b/src/devices/bus/bbc/tube/tube_65c102.cpp
@@ -130,7 +130,7 @@ READ8_MEMBER(bbc_tube_65c102_device::read)
if ((offset >= 0xfef0) && (offset <= 0xfeff))
{
- if (!machine().side_effect_disabled()) m_rom_enabled = false;
+ if (!machine().side_effects_disabled()) m_rom_enabled = false;
data = m_ula->parasite_r(space, offset);
}
else if (m_rom_enabled && (offset >= 0xf000))
diff --git a/src/devices/bus/bbc/tube/tube_arm.cpp b/src/devices/bus/bbc/tube/tube_arm.cpp
index 8a8b1f287cd..c4b6a7ede90 100644
--- a/src/devices/bus/bbc/tube/tube_arm.cpp
+++ b/src/devices/bus/bbc/tube/tube_arm.cpp
@@ -145,7 +145,7 @@ READ8_MEMBER(bbc_tube_arm_device::ram_r)
WRITE8_MEMBER(bbc_tube_arm_device::ram_w)
{
/* clear ROM select on first write */
- if (!machine().side_effect_disabled()) m_rom_select = false;
+ if (!machine().side_effects_disabled()) m_rom_select = false;
m_ram->pointer()[offset] = data;
}
diff --git a/src/devices/bus/bbc/tube/tube_z80.cpp b/src/devices/bus/bbc/tube/tube_z80.cpp
index 2aada0ebf59..a8a10460cd6 100644
--- a/src/devices/bus/bbc/tube/tube_z80.cpp
+++ b/src/devices/bus/bbc/tube/tube_z80.cpp
@@ -145,7 +145,7 @@ WRITE8_MEMBER(bbc_tube_z80_device::host_w)
READ8_MEMBER(bbc_tube_z80_device::opcode_r)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (offset == 0x0066 && m_z80->input_state(INPUT_LINE_NMI))
m_rom_enabled = true;
diff --git a/src/devices/bus/bbc/tube/tube_zep100.cpp b/src/devices/bus/bbc/tube/tube_zep100.cpp
index 61fca1c05ac..e80b53b8f3f 100644
--- a/src/devices/bus/bbc/tube/tube_zep100.cpp
+++ b/src/devices/bus/bbc/tube/tube_zep100.cpp
@@ -171,7 +171,7 @@ READ8_MEMBER(bbc_tube_zep100_device::io_r)
{
uint8_t data = 0xff;
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_rom_enabled = !BIT(offset, 2);
data = m_ppi->read(space, offset & 0x03);
diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index 3f62c5011c2..3c5d33fd8b1 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -204,7 +204,7 @@ uint8_t c64_currah_speech_cartridge_device::c64_cd_r(address_space &space, offs_
data = m_nsp->sby_r() << 7;
}
- if (!machine().side_effect_disabled() && (offset == 0xa7f0))
+ if (!machine().side_effects_disabled() && (offset == 0xa7f0))
{
m_game = !m_game;
m_exrom = !m_exrom;
diff --git a/src/devices/bus/intellec4/insdatastor.cpp b/src/devices/bus/intellec4/insdatastor.cpp
index a4114425844..f036bf6e7b5 100644
--- a/src/devices/bus/intellec4/insdatastor.cpp
+++ b/src/devices/bus/intellec4/insdatastor.cpp
@@ -115,7 +115,7 @@ WRITE8_MEMBER(imm4_22_device::rom_out)
READ8_MEMBER(imm4_22_device::rom_in)
{
// GPIO read - hooking this up would be a pain with MAME as it is
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
logerror("ROM %u in\n", (m_rom_page << 2) | ((offset >> 4) & 0x03U));
return 0x0fU;
}
diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp
index 12ca0086531..922ef1475a5 100644
--- a/src/devices/bus/isa/ega.cpp
+++ b/src/devices/bus/isa/ega.cpp
@@ -959,7 +959,7 @@ READ8_MEMBER( isa8_ega_device::read )
{
uint8_t data = 0xFF;
- if ( !machine().side_effect_disabled() && ! ( m_sequencer.data[4] & 0x04 ) )
+ if ( !machine().side_effects_disabled() && ! ( m_sequencer.data[4] & 0x04 ) )
{
/* Fill read latches */
m_read_latch[0] = m_plane[0][offset & 0xffff];
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index edc367aa049..7910aa50028 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -16,7 +16,7 @@ DEFINE_DEVICE_TYPE(ISA16_SB16, sb16_lle_device, "sb16", "SoundBlaster 16 Audio A
READ8_MEMBER( sb16_lle_device::dsp_data_r )
{
- if(!machine().side_effect_disabled())
+ if(!machine().side_effects_disabled())
m_data_in = false;
return m_in_byte;
diff --git a/src/devices/bus/msx_cart/holy_quran.cpp b/src/devices/bus/msx_cart/holy_quran.cpp
index c461b83ee16..4c44656a9e3 100644
--- a/src/devices/bus/msx_cart/holy_quran.cpp
+++ b/src/devices/bus/msx_cart/holy_quran.cpp
@@ -77,7 +77,7 @@ READ8_MEMBER(msx_cart_holy_quran_device::read_cart)
// The decryption should actually start working after the first M1 cycle executing something
// from the cartridge.
- if (offset == ((m_rom[3] << 8) | m_rom[2]) && !machine().side_effect_disabled())
+ if (offset == ((m_rom[3] << 8) | m_rom[2]) && !machine().side_effects_disabled())
{
m_decrypt = true;
}
diff --git a/src/devices/bus/spectrum/intf1.cpp b/src/devices/bus/spectrum/intf1.cpp
index cf79c71f1f4..514ebd3535c 100644
--- a/src/devices/bus/spectrum/intf1.cpp
+++ b/src/devices/bus/spectrum/intf1.cpp
@@ -108,7 +108,7 @@ READ8_MEMBER(spectrum_intf1_device::mreq_r)
uint8_t temp;
uint8_t data = 0xff;
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (offset == 0x0008 || offset == 0x1708)
m_romcs = 1;
diff --git a/src/devices/bus/spectrum/usource.cpp b/src/devices/bus/spectrum/usource.cpp
index b138ce97c0b..6df423d9883 100644
--- a/src/devices/bus/spectrum/usource.cpp
+++ b/src/devices/bus/spectrum/usource.cpp
@@ -88,7 +88,7 @@ READ8_MEMBER(spectrum_usource_device::mreq_r)
{
uint8_t data;
- if (!machine().side_effect_disabled() && (offset == 0x2bae))
+ if (!machine().side_effects_disabled() && (offset == 0x2bae))
{
m_romcs = !m_romcs;
}
diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp
index ae3f49250af..745e87ef2b0 100644
--- a/src/devices/bus/spectrum/uspeech.cpp
+++ b/src/devices/bus/spectrum/uspeech.cpp
@@ -111,7 +111,7 @@ READ8_MEMBER(spectrum_uspeech_device::mreq_r)
{
uint8_t data;
- if (!machine().side_effect_disabled() && (offset == 0x38))
+ if (!machine().side_effects_disabled() && (offset == 0x38))
{
m_romcs = !m_romcs;
}
diff --git a/src/devices/bus/ti99/internal/998board.cpp b/src/devices/bus/ti99/internal/998board.cpp
index 4f98f925271..486130d5ac9 100644
--- a/src/devices/bus/ti99/internal/998board.cpp
+++ b/src/devices/bus/ti99/internal/998board.cpp
@@ -634,7 +634,7 @@ READ8_MEMBER( mainboard8_device::read )
uint8_t value = 0;
const char* what;
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
return debugger_read(space, offset);
}
@@ -832,7 +832,7 @@ WRITE8_MEMBER( mainboard8_device::write )
m_latched_data = data;
m_pending_write = true;
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
return debugger_write(space, offset, data);
}
diff --git a/src/devices/bus/ti99/internal/datamux.cpp b/src/devices/bus/ti99/internal/datamux.cpp
index ecc0fadb317..7aba2265156 100644
--- a/src/devices/bus/ti99/internal/datamux.cpp
+++ b/src/devices/bus/ti99/internal/datamux.cpp
@@ -335,7 +335,7 @@ READ16_MEMBER( datamux_device::read )
uint16_t value = 0;
// Care for debugger
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
return debugger_read(space, offset);
}
@@ -384,7 +384,7 @@ READ16_MEMBER( datamux_device::read )
*/
WRITE16_MEMBER( datamux_device::write )
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
debugger_write(space, offset, data);
return;
diff --git a/src/devices/bus/ti99/internal/genboard.cpp b/src/devices/bus/ti99/internal/genboard.cpp
index 03654a818e2..4f0716dc4e7 100644
--- a/src/devices/bus/ti99/internal/genboard.cpp
+++ b/src/devices/bus/ti99/internal/genboard.cpp
@@ -497,7 +497,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
decdata debug;
// For the debugger, do the decoding here with no wait states
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
if (m_cpu->is_onchip(offset)) return m_cpu->debug_read_onchip_memory(offset&0xff);
dec = &debug;
@@ -514,7 +514,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
switch (dec->function)
{
case MLGVIDEO:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
value = m_video->read(space, dec->offset>>1);
LOGMASKED(LOG_READ, "Read video %04x -> %02x\n", dec->offset, value);
@@ -532,7 +532,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
case MLGKEY:
// key
- if (!machine().side_effect_disabled()) value = m_keyboard->get_recent_key();
+ if (!machine().side_effects_disabled()) value = m_keyboard->get_recent_key();
LOGMASKED(LOG_READ, "Read keyboard -> %02x\n", value);
break;
@@ -552,7 +552,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
case MLTKEY:
// key
- if (!machine().side_effect_disabled()) value = m_keyboard->get_recent_key();
+ if (!machine().side_effects_disabled()) value = m_keyboard->get_recent_key();
LOGMASKED(LOG_READ, "Read keyboard -> %02x\n", value);
break;
@@ -574,7 +574,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// video
// ++++ ++-- ---- ---+
// 1000 1000 0000 00x0
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
value = m_video->read(space, dec->offset>>1);
LOGMASKED(LOG_READ, "Read video %04x -> %02x\n", dec->offset, value);
@@ -597,7 +597,7 @@ READ8_MEMBER( geneve_mapper_device::readm )
// grom simulation
// ++++ ++-- ---- ---+
// 1001 1000 0000 00x0
- if (!machine().side_effect_disabled()) value = read_grom(space, dec->offset, 0xff);
+ if (!machine().side_effects_disabled()) value = read_grom(space, dec->offset, 0xff);
LOGMASKED(LOG_READ, "Read GROM %04x -> %02x\n", dec->offset, value);
break;
@@ -684,7 +684,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
decdata debug;
// For the debugger, do the decoding here with no wait states
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
dec = &debug;
m_debug_no_ws = true;
@@ -704,7 +704,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// ++++ ++++ ++++ ---+
// 1111 0001 0000 .cc0
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
m_video->write(space, dec->offset>>1, data);
LOGMASKED(LOG_WRITE, "Write video %04x <- %02x\n", offset, data);
@@ -750,7 +750,7 @@ WRITE8_MEMBER( geneve_mapper_device::writem )
// ++++ ++-- ---- ---+
// 1000 1100 0000 00c0
// Initialize waitstate timer
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
m_video->write(space, dec->offset>>1, data);
LOGMASKED(LOG_WRITE, "Write video %04x <- %02x\n", offset, data);
diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp
index a1d2f41a31b..6e51624d92c 100644
--- a/src/devices/bus/ti99/peb/bwg.cpp
+++ b/src/devices/bus/ti99/peb/bwg.cpp
@@ -140,7 +140,7 @@ WRITE_LINE_MEMBER( snug_bwg_device::fdc_drq_w )
SETADDRESS_DBIN_MEMBER( snug_bwg_device::setaddress_dbin )
{
// Do not allow setaddress for debugger
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
// Selection login in the PAL and some circuits on the board
@@ -219,7 +219,7 @@ void snug_bwg_device::debug_write(offs_t offset, uint8_t data)
*/
READ8Z_MEMBER(snug_bwg_device::readz)
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
debug_read(offset, value);
return;
@@ -289,7 +289,7 @@ READ8Z_MEMBER(snug_bwg_device::readz)
*/
WRITE8_MEMBER(snug_bwg_device::write)
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
debug_write(offset, data);
return;
diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp
index df93f54ff2b..98fbf5187ff 100644
--- a/src/devices/bus/ti99/peb/evpc.cpp
+++ b/src/devices/bus/ti99/peb/evpc.cpp
@@ -75,7 +75,7 @@ SETADDRESS_DBIN_MEMBER( snug_enhanced_video_device::setaddress_dbin )
{
// Do not allow setaddress for the debugger. It will mess up the
// setaddress/memory access pairs when the CPU enters wait states.
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (TRACE_ADDRESS) logerror("set address %04x, %s\n", offset, (state==ASSERT_LINE)? "read" : "write");
diff --git a/src/devices/bus/ti99/peb/hfdc.cpp b/src/devices/bus/ti99/peb/hfdc.cpp
index f8dc8c1195b..4ff37fe8da3 100644
--- a/src/devices/bus/ti99/peb/hfdc.cpp
+++ b/src/devices/bus/ti99/peb/hfdc.cpp
@@ -110,7 +110,7 @@ SETADDRESS_DBIN_MEMBER( myarc_hfdc_device::setaddress_dbin )
{
// Do not allow setaddress for the debugger. It will mess up the
// setaddress/memory access pairs when the CPU enters wait states.
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
// Selection login in the PAL and some circuits on the board
@@ -202,7 +202,7 @@ void myarc_hfdc_device::debug_write(offs_t offset, uint8_t data)
*/
READ8Z_MEMBER(myarc_hfdc_device::readz)
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
debug_read(offset, value);
return;
@@ -281,7 +281,7 @@ READ8Z_MEMBER(myarc_hfdc_device::readz)
*/
WRITE8_MEMBER( myarc_hfdc_device::write )
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
debug_write(offset, data);
return;
diff --git a/src/devices/bus/ti99/peb/hsgpl.cpp b/src/devices/bus/ti99/peb/hsgpl.cpp
index 6c020e7527b..7b757fbe813 100644
--- a/src/devices/bus/ti99/peb/hsgpl.cpp
+++ b/src/devices/bus/ti99/peb/hsgpl.cpp
@@ -347,7 +347,7 @@ void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t of
*/
void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, uint8_t* value, uint8_t mem_mask)
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
//activedevice_adjust_icount(-4);
@@ -533,7 +533,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
*/
void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset, uint8_t data, uint8_t mem_mask)
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
//activedevice_adjust_icount(-4);
diff --git a/src/devices/bus/ti99/peb/pcode.cpp b/src/devices/bus/ti99/peb/pcode.cpp
index 71f4d2148f9..0301b709524 100644
--- a/src/devices/bus/ti99/peb/pcode.cpp
+++ b/src/devices/bus/ti99/peb/pcode.cpp
@@ -160,7 +160,7 @@ void ti_pcode_card_device::debugger_read(address_space& space, uint16_t offset,
READ8Z_MEMBER( ti_pcode_card_device::readz )
{
// Care for debugger
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
debugger_read(space, offset, *value);
}
@@ -203,7 +203,7 @@ READ8Z_MEMBER( ti_pcode_card_device::readz )
*/
WRITE8_MEMBER( ti_pcode_card_device::write )
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (m_active && m_isgrom && m_selected)
{
for (auto & elem : m_grom) elem->write(space, m_address, data);
diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp
index 2793e833518..4c2b96ece0d 100644
--- a/src/devices/bus/ti99/peb/spchsyn.cpp
+++ b/src/devices/bus/ti99/peb/spchsyn.cpp
@@ -51,7 +51,7 @@ ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config
READ8Z_MEMBER( ti_speech_synthesizer_device::readz )
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (m_sbe)
{
@@ -70,7 +70,7 @@ READ8Z_MEMBER( ti_speech_synthesizer_device::readz )
*/
WRITE8_MEMBER( ti_speech_synthesizer_device::write )
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (m_sbe)
{
diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp
index 28f80a48787..b1bad0dcc9c 100644
--- a/src/devices/bus/ti99/peb/ti_fdc.cpp
+++ b/src/devices/bus/ti99/peb/ti_fdc.cpp
@@ -147,7 +147,7 @@ void ti_fdc_device::debug_read(offs_t offset, uint8_t* value)
READ8Z_MEMBER(ti_fdc_device::readz)
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
{
debug_read(offset, value);
return;
@@ -161,7 +161,7 @@ READ8Z_MEMBER(ti_fdc_device::readz)
if (m_WDsel && ((m_address & 9)==0))
{
- if (!machine().side_effect_disabled()) reply = m_fd1771->gen_r((offset >> 1)&0x03);
+ if (!machine().side_effects_disabled()) reply = m_fd1771->gen_r((offset >> 1)&0x03);
if (TRACE_DATA)
{
if ((m_address & 0xffff)==0x5ff6)
@@ -188,7 +188,7 @@ READ8Z_MEMBER(ti_fdc_device::readz)
WRITE8_MEMBER(ti_fdc_device::write)
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (m_inDsrArea && m_selected)
{
@@ -206,7 +206,7 @@ WRITE8_MEMBER(ti_fdc_device::write)
{
// As this is a memory-mapped access we must prevent the debugger
// from messing with the operation
- if (!machine().side_effect_disabled()) m_fd1771->gen_w((offset >> 1)&0x03, data);
+ if (!machine().side_effects_disabled()) m_fd1771->gen_w((offset >> 1)&0x03, data);
}
}
}
diff --git a/src/devices/bus/ti99/peb/tn_ide.cpp b/src/devices/bus/ti99/peb/tn_ide.cpp
index 9908c62debd..d1adadfbe86 100644
--- a/src/devices/bus/ti99/peb/tn_ide.cpp
+++ b/src/devices/bus/ti99/peb/tn_ide.cpp
@@ -131,7 +131,7 @@ WRITE8_MEMBER(nouspikel_ide_interface_device::cruwrite)
READ8Z_MEMBER(nouspikel_ide_interface_device::readz)
{
uint8_t reply = 0;
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
@@ -197,7 +197,7 @@ READ8Z_MEMBER(nouspikel_ide_interface_device::readz)
*/
WRITE8_MEMBER(nouspikel_ide_interface_device::write)
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
diff --git a/src/devices/bus/ti99/peb/tn_usbsm.cpp b/src/devices/bus/ti99/peb/tn_usbsm.cpp
index b8942465c8f..ba0723388b5 100644
--- a/src/devices/bus/ti99/peb/tn_usbsm.cpp
+++ b/src/devices/bus/ti99/peb/tn_usbsm.cpp
@@ -185,7 +185,7 @@ WRITE8_MEMBER(nouspikel_usb_smartmedia_device::cruwrite)
*/
READ8Z_MEMBER(nouspikel_usb_smartmedia_device::readz)
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
@@ -236,7 +236,7 @@ READ8Z_MEMBER(nouspikel_usb_smartmedia_device::readz)
*/
WRITE8_MEMBER(nouspikel_usb_smartmedia_device::write)
{
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp
index e5699d1ae48..9650bc29661 100755
--- a/src/devices/bus/vcs/rom.cpp
+++ b/src/devices/bus/vcs/rom.cpp
@@ -357,7 +357,7 @@ READ8_MEMBER(a26_rom_f4_device::read_rom)
}
// update banks
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
switch (offset)
{
@@ -423,7 +423,7 @@ READ8_MEMBER(a26_rom_f6_device::read_rom)
}
// update banks
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
switch (offset)
{
@@ -481,7 +481,7 @@ READ8_MEMBER(a26_rom_f8_device::read_rom)
}
// update banks
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
switch (offset)
{
@@ -537,7 +537,7 @@ READ8_MEMBER(a26_rom_fa_device::read_rom)
}
// update banks
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
switch (offset)
{
@@ -605,7 +605,7 @@ READ8_MEMBER(a26_rom_fe_device::read_rom)
data = m_rom[offset + (m_base_bank * 0x1000)];
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (m_trigger_on_next_access)
{
@@ -630,7 +630,7 @@ READ8_MEMBER(a26_rom_fe_device::read_bank)
{
uint8_t data = space.read_byte(0xfe + offset);
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
switch (offset & 1)
{
@@ -654,7 +654,7 @@ READ8_MEMBER(a26_rom_fe_device::read_bank)
WRITE8_MEMBER(a26_rom_fe_device::write_bank)
{
space.write_byte(0xfe, data);
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
// The next byte on the data bus determines which bank to switch to
m_trigger_on_next_access = 1;
@@ -740,7 +740,7 @@ WRITE8_MEMBER(a26_rom_3f_device::write_bank)
READ8_MEMBER(a26_rom_e0_device::read_rom)
{
// update banks
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (offset >= 0xfe0 && offset <= 0xff8)
m_base_banks[(offset >> 3) & 3] = offset & 7;
@@ -779,7 +779,7 @@ WRITE8_MEMBER(a26_rom_e0_device::write_bank)
READ8_MEMBER(a26_rom_e7_device::read_rom)
{
// update banks
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (offset >= 0xfe0 && offset <= 0xfe7)
m_base_bank = offset - 0xfe0;
@@ -845,7 +845,7 @@ READ8_MEMBER(a26_rom_ua_device::read_rom)
READ8_MEMBER(a26_rom_ua_device::read_bank)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_base_bank = offset >> 6;
return 0;
@@ -900,7 +900,7 @@ WRITE8_MEMBER(a26_rom_cv_device::write_bank)
READ8_MEMBER(a26_rom_dc_device::read_rom)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (offset == 0xff0)
m_base_bank = (m_base_bank + 1) & 0x0f;
@@ -930,7 +930,7 @@ WRITE8_MEMBER(a26_rom_dc_device::write_bank)
READ8_MEMBER(a26_rom_fv_device::read_rom)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (offset == 0xfd0)
{
@@ -1014,7 +1014,7 @@ READ8_MEMBER(a26_rom_4in1_device::read_rom)
READ8_MEMBER(a26_rom_8in1_device::read_rom)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
switch (offset)
{
diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp
index db97df33a98..85ede8b6b26 100644
--- a/src/devices/bus/vcs/scharger.cpp
+++ b/src/devices/bus/vcs/scharger.cpp
@@ -111,7 +111,7 @@ inline uint8_t a26_rom_ss_device::read_byte(uint32_t offset)
READ8_MEMBER(a26_rom_ss_device::read_rom)
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return read_byte(offset);
// Bankswitch
diff --git a/src/devices/cpu/alto2/a2hw.cpp b/src/devices/cpu/alto2/a2hw.cpp
index b7c11d93239..525b3d4e78e 100644
--- a/src/devices/cpu/alto2/a2hw.cpp
+++ b/src/devices/cpu/alto2/a2hw.cpp
@@ -242,7 +242,7 @@ READ16_MEMBER( alto2_cpu_device::utilin_r )
data = m_hw.utilin;
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_HW,2," UTILIN rd %#o (%#o)\n", offset, data));
}
return data;
@@ -258,7 +258,7 @@ READ16_MEMBER( alto2_cpu_device::xbus_r )
{
uint16_t data = m_hw.xbus[offset & 3];
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_HW,2," XBUS[%d] rd %#o (%#o)\n", offset & 3, offset, data));
}
return data;
@@ -274,7 +274,7 @@ READ16_MEMBER( alto2_cpu_device::xbus_r )
*/
WRITE16_MEMBER( alto2_cpu_device::xbus_w )
{
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_HW,2," XBUS[%d] wr %#o (%#o)\n", offset & 3, offset, data));
}
m_hw.xbus[offset&3] = data;
@@ -289,7 +289,7 @@ WRITE16_MEMBER( alto2_cpu_device::xbus_w )
READ16_MEMBER( alto2_cpu_device::utilout_r )
{
uint16_t data = m_hw.utilout ^ 0177777;
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,0,2," UTILOUT rd %#o (%#o)\n", offset, data));
}
return data;
@@ -305,7 +305,7 @@ READ16_MEMBER( alto2_cpu_device::utilout_r )
*/
WRITE16_MEMBER( alto2_cpu_device::utilout_w )
{
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_HW,2," UTILOUT wr %#o (%#o)\n", offset, data));
}
m_hw.utilout = data ^ 0177777;
diff --git a/src/devices/cpu/alto2/a2kbd.cpp b/src/devices/cpu/alto2/a2kbd.cpp
index 6c24d49622c..77d3683e1e0 100644
--- a/src/devices/cpu/alto2/a2kbd.cpp
+++ b/src/devices/cpu/alto2/a2kbd.cpp
@@ -32,11 +32,11 @@ READ16_MEMBER( alto2_cpu_device::kbd_ad_r )
break;
}
m_kbd.matrix[offset & 03] = data;
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_KBD,2," read KBDAD+%o (%#o)\n", offset & 3, data));
}
if (0 == (offset & 3) && (m_kbd.bootkey != 0177777)) {
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,0,2," boot keys (%#o & %#o)\n", data, m_kbd.bootkey));
}
data &= m_kbd.bootkey;
diff --git a/src/devices/cpu/alto2/a2mem.cpp b/src/devices/cpu/alto2/a2mem.cpp
index 483e33be533..036ac05e23e 100644
--- a/src/devices/cpu/alto2/a2mem.cpp
+++ b/src/devices/cpu/alto2/a2mem.cpp
@@ -485,7 +485,7 @@ uint32_t alto2_cpu_device::hamming_code(bool write, uint32_t dw_addr, uint32_t d
READ16_MEMBER( alto2_cpu_device::mear_r )
{
int data = m_mem.error ? m_mem.mear : m_mem.mar;
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_MEM,2," MEAR read %07o\n", data));
}
return data;
@@ -510,7 +510,7 @@ READ16_MEMBER( alto2_cpu_device::mear_r )
READ16_MEMBER( alto2_cpu_device::mesr_r )
{
uint16_t data = m_mem.mesr ^ 0177777;
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_MEM,2," MESR read %07o\n", data));
LOG((this,LOG_MEM,6," Hamming code read : %#o\n", GET_MESR_HAMMING(data)));
LOG((this,LOG_MEM,6," Parity error : %o\n", GET_MESR_PERR(data)));
@@ -523,7 +523,7 @@ READ16_MEMBER( alto2_cpu_device::mesr_r )
WRITE16_MEMBER( alto2_cpu_device::mesr_w )
{
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_MEM,2," MESR write %07o (clear MESR; was %07o)\n", data, m_mem.mesr));
m_mem.mesr = 0; // set all bits to 0
m_mem.error = 0; // reset the error flag
@@ -558,7 +558,7 @@ WRITE16_MEMBER( alto2_cpu_device::mecr_w )
// clear spare bits
X_WRBITS(m_mem.mecr,16, 0, 3,0);
X_WRBITS(m_mem.mecr,16,15,15,0);
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_MEM,2," MECR write %07o\n", data));
LOG((this,LOG_MEM,6," Test Hamming code : %#o\n", GET_MECR_TEST_CODE(m_mem.mecr)));
LOG((this,LOG_MEM,6," Test mode : %s\n", GET_MECR_TEST_MODE(m_mem.mecr) ? "on" : "off"));
@@ -575,7 +575,7 @@ READ16_MEMBER( alto2_cpu_device::mecr_r )
{
uint16_t data = m_mem.mecr ^ 0177777;
// all spare bits are set
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
LOG((this,LOG_MEM,2," MECR read %07o\n", data));
LOG((this,LOG_MEM,6," Test Hamming code : %#o\n", GET_MECR_TEST_CODE(data)));
LOG((this,LOG_MEM,6," Test mode : %s\n", GET_MECR_TEST_MODE(data) ? "on" : "off"));
@@ -772,7 +772,7 @@ uint16_t alto2_cpu_device::debug_read_mem(uint32_t addr)
int base_addr = addr & 0177777;
int data;
if (addr >= ALTO2_IO_PAGE_BASE && addr < ALTO2_RAM_SIZE) {
- auto dis = machine().disable_side_effect();
+ auto dis = machine().disable_side_effects();
data = m_iomem->read_word(m_iomem->address_to_byte(base_addr));
} else {
data = (addr & ALTO2_MEM_ODD) ? GET_ODD(m_mem.ram[addr/2]) : GET_EVEN(m_mem.ram[addr/2]);
@@ -790,7 +790,7 @@ void alto2_cpu_device::debug_write_mem(uint32_t addr, uint16_t data)
{
int base_addr = addr & 0177777;
if (addr >= ALTO2_IO_PAGE_BASE && addr < ALTO2_RAM_SIZE) {
- auto dis = machine().disable_side_effect();
+ auto dis = machine().disable_side_effects();
m_iomem->write_word(m_iomem->address_to_byte(base_addr), data);
} else if (addr & ALTO2_MEM_ODD) {
PUT_ODD(m_mem.ram[addr/2], data);
diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp
index 44737d5b1d7..d0835f86027 100644
--- a/src/devices/cpu/cop400/cop400.cpp
+++ b/src/devices/cpu/cop400/cop400.cpp
@@ -1326,13 +1326,13 @@ void cop400_cpu_device::set_flags(uint8_t flags)
uint8_t cop400_cpu_device::get_m() const
{
- auto dis = machine().disable_side_effect();
+ auto dis = machine().disable_side_effects();
return RAM_R(B);
}
void cop400_cpu_device::set_m(uint8_t m)
{
- auto dis = machine().disable_side_effect();
+ auto dis = machine().disable_side_effects();
RAM_W(B, m);
}
diff --git a/src/devices/cpu/e0c6200/e0c6s46.cpp b/src/devices/cpu/e0c6200/e0c6s46.cpp
index 47c21daedf8..e14d855ece5 100644
--- a/src/devices/cpu/e0c6200/e0c6s46.cpp
+++ b/src/devices/cpu/e0c6200/e0c6s46.cpp
@@ -629,7 +629,7 @@ READ8_MEMBER(e0c6s46_device::io_r)
{
// irq flags are reset(acked) when read
u8 flag = m_irqflag[offset];
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_irqflag[offset] = 0;
return flag;
}
@@ -706,7 +706,7 @@ READ8_MEMBER(e0c6s46_device::io_r)
break;
default:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
logerror("%s unknown io_r from $0F%02X at $%04X\n", tag(), offset, m_prev_pc);
break;
}
diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp
index 8452bab001c..0942636c4a3 100644
--- a/src/devices/cpu/lc8670/lc8670.cpp
+++ b/src/devices/cpu/lc8670/lc8670.cpp
@@ -916,7 +916,7 @@ WRITE8_MEMBER(lc8670_cpu_device::mram_w)
READ8_MEMBER(lc8670_cpu_device::xram_r)
{
- if (!(REG_VCCR & 0x40) || machine().side_effect_disabled()) // XRAM access enabled
+ if (!(REG_VCCR & 0x40) || machine().side_effects_disabled()) // XRAM access enabled
{
uint8_t * xram_bank = m_xram + (REG_XBNK & 0x03) * 0x60;
@@ -939,7 +939,7 @@ READ8_MEMBER(lc8670_cpu_device::xram_r)
WRITE8_MEMBER(lc8670_cpu_device::xram_w)
{
- if (!(REG_VCCR & 0x40) || machine().side_effect_disabled()) // XRAM access enabled
+ if (!(REG_VCCR & 0x40) || machine().side_effects_disabled()) // XRAM access enabled
{
uint8_t * xram_bank = m_xram + (REG_XBNK & 0x03) * 0x60;
@@ -979,7 +979,7 @@ READ8_MEMBER(lc8670_cpu_device::regs_r)
case 0x66:
{
uint8_t data = m_vtrbf[((REG_VRMAD2<<8) | REG_VRMAD1) & 0x1ff];
- if (!machine().side_effect_disabled() && (REG_VSEL & 0x10))
+ if (!machine().side_effects_disabled() && (REG_VSEL & 0x10))
{
uint16_t vrmad = (REG_VRMAD1 | (REG_VRMAD2<<8)) + 1;
REG_VRMAD1 = vrmad & 0xff;
@@ -991,7 +991,7 @@ READ8_MEMBER(lc8670_cpu_device::regs_r)
// write-only registers
case 0x20: case 0x23: case 0x24: case 0x27:
case 0x45: case 0x46: case 0x4d:
- if(!machine().side_effect_disabled()) logerror("%s: read write-only SFR %04x\n", machine().describe_context(), offset);
+ if(!machine().side_effects_disabled()) logerror("%s: read write-only SFR %04x\n", machine().describe_context(), offset);
return 0xff;
}
return m_sfr[offset];
@@ -1046,7 +1046,7 @@ WRITE8_MEMBER(lc8670_cpu_device::regs_w)
break;
case 0x66:
m_vtrbf[((REG_VRMAD2<<8) | REG_VRMAD1) & 0x1ff] = data;
- if (!machine().side_effect_disabled() && (REG_VSEL & 0x10))
+ if (!machine().side_effects_disabled() && (REG_VSEL & 0x10))
{
uint16_t vrmad = (REG_VRMAD1 | (REG_VRMAD2<<8)) + 1;
REG_VRMAD1 = vrmad & 0xff;
@@ -1060,7 +1060,7 @@ WRITE8_MEMBER(lc8670_cpu_device::regs_w)
// read-only registers
case 0x12: case 0x14: case 0x5c:
- if(!machine().side_effect_disabled()) logerror("%s: write read-only SFR %04x = %02x\n", machine().describe_context(), offset, data);
+ if(!machine().side_effects_disabled()) logerror("%s: write read-only SFR %04x = %02x\n", machine().describe_context(), offset, data);
return;
}
diff --git a/src/devices/cpu/m6800/m6801.cpp b/src/devices/cpu/m6800/m6801.cpp
index a9a2801f272..6330a2df2a6 100644
--- a/src/devices/cpu/m6800/m6801.cpp
+++ b/src/devices/cpu/m6800/m6801.cpp
@@ -847,7 +847,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
break;
case IO_P3DATA:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (m_p3csr_is3_flag_read)
{
@@ -868,7 +868,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
data = (m_io->read_byte(M6801_PORT3) & (m_port3_ddr ^ 0xff))
| (m_port3_data & m_port3_ddr);
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
m_port3_latched = 0;
@@ -893,7 +893,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
break;
case IO_CH:
- if(!(m_pending_tcsr&TCSR_TOF) && !machine().side_effect_disabled())
+ if(!(m_pending_tcsr&TCSR_TOF) && !machine().side_effects_disabled())
{
m_tcsr &= ~TCSR_TOF;
MODIFIED_tcsr;
@@ -906,7 +906,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
// HACK there should be a break here, but Coleco Adam won't boot with it present, proper fix required to the free-running counter
case IO_OCRH:
- if(!(m_pending_tcsr&TCSR_OCF) && !machine().side_effect_disabled())
+ if(!(m_pending_tcsr&TCSR_OCF) && !machine().side_effects_disabled())
{
m_tcsr &= ~TCSR_OCF;
MODIFIED_tcsr;
@@ -915,7 +915,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
break;
case IO_OCRL:
- if(!(m_pending_tcsr&TCSR_OCF) && !machine().side_effect_disabled())
+ if(!(m_pending_tcsr&TCSR_OCF) && !machine().side_effects_disabled())
{
m_tcsr &= ~TCSR_OCF;
MODIFIED_tcsr;
@@ -924,7 +924,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
break;
case IO_ICRH:
- if(!(m_pending_tcsr&TCSR_ICF) && !machine().side_effect_disabled())
+ if(!(m_pending_tcsr&TCSR_ICF) && !machine().side_effects_disabled())
{
m_tcsr &= ~TCSR_ICF;
MODIFIED_tcsr;
@@ -937,7 +937,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
break;
case IO_P3CSR:
- if ((m_p3csr & M6801_P3CSR_IS3_FLAG) && !machine().side_effect_disabled())
+ if ((m_p3csr & M6801_P3CSR_IS3_FLAG) && !machine().side_effects_disabled())
{
m_p3csr_is3_flag_read = 1;
}
@@ -950,7 +950,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
break;
case IO_TRCSR:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (m_trcsr & M6801_TRCSR_TDRE)
{
@@ -972,7 +972,7 @@ READ8_MEMBER( m6801_cpu_device::m6801_io_r )
break;
case IO_RDR:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (m_trcsr_read_orfe)
{
diff --git a/src/devices/cpu/m6805/m68hc05.cpp b/src/devices/cpu/m6805/m68hc05.cpp
index 099d31ab1f0..900835b1775 100644
--- a/src/devices/cpu/m6805/m68hc05.cpp
+++ b/src/devices/cpu/m6805/m68hc05.cpp
@@ -168,7 +168,7 @@ void m68hc05_device::set_port_interrupt(std::array<u8, PORT_COUNT> const &interr
READ8_MEMBER(m68hc05_device::port_r)
{
offset &= PORT_COUNT - 1;
- if (!machine().side_effect_disabled() && !m_port_cb_r[offset].isnull())
+ if (!machine().side_effects_disabled() && !m_port_cb_r[offset].isnull())
{
u8 const newval(m_port_cb_r[offset](space, 0, ~m_port_ddr[offset] & m_port_bits[offset]) & m_port_bits[offset]);
u8 const diff(newval ^ m_port_input[offset]);
@@ -252,7 +252,7 @@ WRITE8_MEMBER(m68hc05_device::tcr_w)
READ8_MEMBER(m68hc05_device::tsr_r)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
u8 const events(m_tsr & ~m_tsr_seen);
if (events)
@@ -271,7 +271,7 @@ READ8_MEMBER(m68hc05_device::icr_r)
// reading ICRL after reading TCR with ICF set clears ICF
u8 const low(BIT(offset, 0));
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (low)
{
@@ -299,7 +299,7 @@ READ8_MEMBER(m68hc05_device::ocr_r)
// reading OCRL after reading TCR with OCF set clears OCF
u8 const low(BIT(offset, 0));
- if (!machine().side_effect_disabled() && low && BIT(m_tsr_seen, 6))
+ if (!machine().side_effects_disabled() && low && BIT(m_tsr_seen, 6))
{
LOGTIMER("read OCRL, clear OCF\n");
m_tsr &= 0xbf;
@@ -315,7 +315,7 @@ WRITE8_MEMBER(m68hc05_device::ocr_w)
// writing OCRL after reading TCR with OCF set clears OCF
u8 const low(BIT(offset, 0));
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (low)
{
@@ -349,7 +349,7 @@ READ8_MEMBER(m68hc05_device::timer_r)
u8 const alt(BIT(offset, 1));
if (low)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
if (m_trl_latched[alt]) LOGTIMER("read %sTRL, read sequence complete\n", alt ? "A" : "");
m_trl_latched[alt] = false;
@@ -365,7 +365,7 @@ READ8_MEMBER(m68hc05_device::timer_r)
}
else
{
- if (!machine().side_effect_disabled() && !m_trl_latched[alt])
+ if (!machine().side_effects_disabled() && !m_trl_latched[alt])
{
LOGTIMER("read %sTRH, latch %sTRL\n", alt ? "A" : "", alt ? "A" : "");
m_trl_latched[alt] = true;
diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp
index 2559cfe7c0c..6f697bbc81d 100644
--- a/src/devices/cpu/psx/psx.cpp
+++ b/src/devices/cpu/psx/psx.cpp
@@ -203,14 +203,14 @@ static const uint32_t mtc0_writemask[]=
READ32_MEMBER( psxcpu_device::berr_r )
{
- if( !machine().side_effect_disabled() )
+ if( !machine().side_effects_disabled() )
m_berr = 1;
return 0;
}
WRITE32_MEMBER( psxcpu_device::berr_w )
{
- if( !machine().side_effect_disabled() )
+ if( !machine().side_effects_disabled() )
m_berr = 1;
}
diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp
index ae0f728e3e3..ab33dad22c0 100644
--- a/src/devices/cpu/sharc/sharc.cpp
+++ b/src/devices/cpu/sharc/sharc.cpp
@@ -260,7 +260,7 @@ READ32_MEMBER( adsp21062_device::iop_r)
return m_core->dma_status;
}
default:
- if(!machine().side_effect_disabled())
+ if(!machine().side_effects_disabled())
fatalerror("sharc_iop_r: Unimplemented IOP reg %02X at %08X\n", offset, m_core->pc);
return 0;
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index e70c1f54a39..7dec63c1fae 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -518,7 +518,7 @@ READ16_MEMBER( tms32051_device::cpuregs_r )
return m_io->read_word(offset);
default:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
fatalerror("32051: cpuregs_r: unimplemented memory-mapped register %02X at %04X\n", offset, m_pc-1);
}
@@ -630,7 +630,7 @@ WRITE16_MEMBER( tms32051_device::cpuregs_w )
break;
default:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
fatalerror("32051: cpuregs_w: unimplemented memory-mapped register %02X, data %04X at %04X\n", offset, data, m_pc-1);
}
}
diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp
index 98bd1a69e40..7f63ac07aff 100644
--- a/src/devices/cpu/tms7000/tms7000.cpp
+++ b/src/devices/cpu/tms7000/tms7000.cpp
@@ -511,7 +511,7 @@ READ8_MEMBER(tms7000_device::tms7000_pf_r)
{
// note: port B is write-only, reading it returns the output value as if ddr is 0xff
int port = offset / 2 - 2;
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
return (m_port_in_cb[port]() & ~m_port_ddr[port]) | (m_port_latch[port] & m_port_ddr[port]);
break;
}
@@ -521,7 +521,7 @@ READ8_MEMBER(tms7000_device::tms7000_pf_r)
return m_port_ddr[offset / 2 - 2];
default:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
logerror("'%s' (%04X): tms7000_pf_r @ $%04x\n", tag(), m_pc, offset);
break;
}
diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h
index c42f7e3a758..987aa8af543 100644
--- a/src/devices/cpu/tms7000/tms7000.h
+++ b/src/devices/cpu/tms7000/tms7000.h
@@ -63,7 +63,7 @@ public:
template<class Object>
static devcb_base &set_port_write_cb(device_t &device, int p, Object &&object) { return downcast<tms7000_device &>(device).m_port_out_cb[p].set_callback(std::move(object)); }
- DECLARE_READ8_MEMBER(tms7000_unmapped_rf_r) { if (!machine().side_effect_disabled()) logerror("'%s' (%04X): unmapped_rf_r @ $%04x\n", tag(), m_pc, offset + 0x80); return 0; };
+ DECLARE_READ8_MEMBER(tms7000_unmapped_rf_r) { if (!machine().side_effects_disabled()) logerror("'%s' (%04X): unmapped_rf_r @ $%04x\n", tag(), m_pc, offset + 0x80); return 0; };
DECLARE_WRITE8_MEMBER(tms7000_unmapped_rf_w) { logerror("'%s' (%04X): unmapped_rf_w @ $%04x = $%02x\n", tag(), m_pc, offset + 0x80, data); };
DECLARE_READ8_MEMBER(tms7000_pf_r);
@@ -349,7 +349,7 @@ public:
DECLARE_WRITE8_MEMBER(dockbus_data_w);
// access I/O port E if databus is disabled
- DECLARE_READ8_MEMBER(e_bus_data_r) { return machine().side_effect_disabled() ? 0xff : ((m_control & 0x20) ? 0xff : m_port_in_cb[4]()); }
+ DECLARE_READ8_MEMBER(e_bus_data_r) { return machine().side_effects_disabled() ? 0xff : ((m_control & 0x20) ? 0xff : m_port_in_cb[4]()); }
DECLARE_WRITE8_MEMBER(e_bus_data_w) { if (~m_control & 0x20) m_port_out_cb[4](data); }
void tms70c46_mem(address_map &map);
diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp
index 89f2e1e70a6..f984852f2cd 100644
--- a/src/devices/cpu/tms9900/tms9900.cpp
+++ b/src/devices/cpu/tms9900/tms9900.cpp
@@ -421,7 +421,7 @@ void tms99xx_device::state_string_export(const device_state_entry &entry, std::s
uint16_t tms99xx_device::read_workspace_register_debug(int reg)
{
int temp = m_icount;
- auto dis = machine().disable_side_effect();
+ auto dis = machine().disable_side_effects();
uint16_t value = m_prgspace->read_word((WP+(reg<<1)) & m_prgaddr_mask & 0xfffe);
m_icount = temp;
return value;
@@ -430,7 +430,7 @@ uint16_t tms99xx_device::read_workspace_register_debug(int reg)
void tms99xx_device::write_workspace_register_debug(int reg, uint16_t data)
{
int temp = m_icount;
- auto dis = machine().disable_side_effect();
+ auto dis = machine().disable_side_effects();
m_prgspace->write_word((WP+(reg<<1)) & m_prgaddr_mask & 0xfffe, data);
m_icount = temp;
}
diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp
index 0c361bb915a..c9f849d5851 100644
--- a/src/devices/cpu/tms9900/tms9995.cpp
+++ b/src/devices/cpu/tms9900/tms9995.cpp
@@ -437,7 +437,7 @@ uint16_t tms9995_device::read_workspace_register_debug(int reg)
}
else
{
- auto dis = machine().disable_side_effect();
+ auto dis = machine().disable_side_effects();
value = (m_prgspace->read_byte(addrb) << 8) & 0xff00;
value |= m_prgspace->read_byte(addrb+1);
}
@@ -457,7 +457,7 @@ void tms9995_device::write_workspace_register_debug(int reg, uint16_t data)
}
else
{
- auto dis = machine().disable_side_effect();
+ auto dis = machine().disable_side_effects();
m_prgspace->write_byte(addrb, (data >> 8) & 0xff);
m_prgspace->write_byte(addrb+1, data & 0xff);
}
diff --git a/src/devices/machine/6522via.cpp b/src/devices/machine/6522via.cpp
index 24fe04e6574..93f1f056b3f 100644
--- a/src/devices/machine/6522via.cpp
+++ b/src/devices/machine/6522via.cpp
@@ -537,7 +537,7 @@ void via6522_device::output_pb()
READ8_MEMBER( via6522_device::read )
{
int val = 0;
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0;
offset &= 0xf;
diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp
index 762809cdf6a..1b619f4e16d 100644
--- a/src/devices/machine/6532riot.cpp
+++ b/src/devices/machine/6532riot.cpp
@@ -233,7 +233,7 @@ void riot6532_device::reg_w(uint8_t offset, uint8_t data)
READ8_MEMBER( riot6532_device::read )
{
- return reg_r(offset, machine().side_effect_disabled());
+ return reg_r(offset, machine().side_effects_disabled());
}
uint8_t riot6532_device::reg_r(uint8_t offset, bool debugger_access)
diff --git a/src/devices/machine/am9513.cpp b/src/devices/machine/am9513.cpp
index 60f76e691c8..c17ae1f09fe 100644
--- a/src/devices/machine/am9513.cpp
+++ b/src/devices/machine/am9513.cpp
@@ -1164,7 +1164,7 @@ void am9513_device::internal_write(u16 data)
void am9513_device::advance_dpr()
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return;
if (bus_is_16_bit() || !BIT(m_status, 0))
diff --git a/src/devices/machine/autoconfig.cpp b/src/devices/machine/autoconfig.cpp
index 2b272f814cc..9ee2a53d087 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 && !dynamic_cast<device_t *>(this)->machine().side_effect_disabled())
+ if (VERBOSE && !dynamic_cast<device_t *>(this)->machine().side_effects_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 && !dynamic_cast<device_t *>(this)->machine().side_effect_disabled())
+ if (VERBOSE && !dynamic_cast<device_t *>(this)->machine().side_effects_disabled())
space.device().logerror("autoconfig_write %04x @ %02x [mask = %04x]\n", data, offset, mem_mask);
switch (offset)
diff --git a/src/devices/machine/cdp1879.cpp b/src/devices/machine/cdp1879.cpp
index 6fbc376df28..206709f9a8d 100644
--- a/src/devices/machine/cdp1879.cpp
+++ b/src/devices/machine/cdp1879.cpp
@@ -116,7 +116,7 @@ void cdp1879_device::update_rtc()
READ8_MEMBER(cdp1879_device::read)
{
- if (offset == R_CTL_IRQSTATUS && !machine().side_effect_disabled())
+ if (offset == R_CTL_IRQSTATUS && !machine().side_effects_disabled())
{
// reading the IRQ status clears IRQ line and IRQ status
uint8_t data = m_regs[offset];
diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp
index cb1fefda60c..ba711813eb1 100644
--- a/src/devices/machine/gen_latch.cpp
+++ b/src/devices/machine/gen_latch.cpp
@@ -101,7 +101,7 @@ generic_latch_8_device::generic_latch_8_device(const machine_config &mconfig, co
READ8_MEMBER( generic_latch_8_device::read )
{
- if (!has_separate_acknowledge() && !machine().side_effect_disabled())
+ if (!has_separate_acknowledge() && !machine().side_effects_disabled())
set_latch_written(false);
return m_latched_value;
}
@@ -133,7 +133,7 @@ WRITE_LINE_MEMBER( generic_latch_8_device::clear_w )
READ8_MEMBER( generic_latch_8_device::acknowledge_r )
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
set_latch_written(false);
return space.unmap();
}
@@ -184,7 +184,7 @@ generic_latch_16_device::generic_latch_16_device(const machine_config &mconfig,
READ16_MEMBER( generic_latch_16_device::read )
{
- if (!has_separate_acknowledge() && !machine().side_effect_disabled())
+ if (!has_separate_acknowledge() && !machine().side_effects_disabled())
set_latch_written(false);
return m_latched_value;
}
diff --git a/src/devices/machine/i8212.cpp b/src/devices/machine/i8212.cpp
index 4c7cd115c75..c6428fe7c13 100644
--- a/src/devices/machine/i8212.cpp
+++ b/src/devices/machine/i8212.cpp
@@ -122,7 +122,7 @@ void i8212_device::device_reset()
READ8_MEMBER(i8212_device::read)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
// clear interrupt line
m_write_int(CLEAR_LINE);
diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp
index 6be5320141f..89a18d60d6d 100644
--- a/src/devices/machine/mb8421.cpp
+++ b/src/devices/machine/mb8421.cpp
@@ -96,7 +96,7 @@ void mb8421_master_device::device_reset()
template<read_or_write row, bool is_right>
void mb8421_master_device::update_intr(offs_t offset)
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return;
if (row == read_or_write::WRITE && offset == (is_right ? 0x7fe : 0x7ff))
diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp
index 02011fe447f..c3ba2a7bfaa 100644
--- a/src/devices/machine/mc68901.cpp
+++ b/src/devices/machine/mc68901.cpp
@@ -571,7 +571,7 @@ READ8_MEMBER( mc68901_device::read )
case REGISTER_RSR:
{
uint8_t rsr = m_rsr;
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_rsr &= ~RSR_OVERRUN_ERROR;
return rsr;
}
@@ -580,13 +580,13 @@ READ8_MEMBER( mc68901_device::read )
{
/* clear UE bit (in reality, this won't be cleared until one full clock cycle of the transmitter has passed since the bit was set) */
uint8_t tsr = m_tsr;
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_tsr &= ~TSR_UNDERRUN_ERROR;
return tsr;
}
case REGISTER_UDR:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
m_rsr &= ~RSR_BUFFER_FULL;
if (m_overrun_pending)
diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp
index eedfdcd339f..22b49f4a7dd 100644
--- a/src/devices/machine/mm58167.cpp
+++ b/src/devices/machine/mm58167.cpp
@@ -184,7 +184,7 @@ READ8_MEMBER(mm58167_device::read)
{
// printf("read reg %x = %02x\n", offset, m_regs[offset]);
- if (offset == R_CTL_IRQSTATUS && !machine().side_effect_disabled())
+ if (offset == R_CTL_IRQSTATUS && !machine().side_effects_disabled())
{
// reading the IRQ status clears IRQ line and IRQ status
uint8_t data = m_regs[offset];
diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp
index 7b87d623c8e..9109eedc5b5 100644
--- a/src/devices/machine/mos6526.cpp
+++ b/src/devices/machine/mos6526.cpp
@@ -795,7 +795,7 @@ READ8_MEMBER( mos6526_device::read )
switch (offset & 0x0f)
{
case PRA:
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0xff;
if (m_ddra != 0xff)
@@ -806,7 +806,7 @@ READ8_MEMBER( mos6526_device::read )
break;
case PRB:
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0xff;
if (m_ddrb != 0xff)
@@ -860,7 +860,7 @@ READ8_MEMBER( mos6526_device::read )
break;
case TOD_10THS:
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0xff;
data = read_tod(0);
@@ -869,21 +869,21 @@ READ8_MEMBER( mos6526_device::read )
break;
case TOD_SEC:
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0xff;
data = read_tod(1);
break;
case TOD_MIN:
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0xff;
data = read_tod(2);
break;
case TOD_HR:
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0xff;
if (!m_tod_latched)
@@ -902,7 +902,7 @@ READ8_MEMBER( mos6526_device::read )
case ICR:
data = (m_ir1 << 7) | m_icr;
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return data;
m_icr_read = true;
diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp
index c05fc123309..834d9513db4 100644
--- a/src/devices/machine/mos6530n.cpp
+++ b/src/devices/machine/mos6530n.cpp
@@ -581,7 +581,7 @@ WRITE8_MEMBER( mos6530_device_base::pb_ddr_w )
READ8_MEMBER( mos6530_device_base::timer_off_r )
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0;
return timer_r(false);
@@ -589,7 +589,7 @@ READ8_MEMBER( mos6530_device_base::timer_off_r )
READ8_MEMBER( mos6530_device_base::timer_on_r )
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0;
return timer_r(true);
@@ -626,7 +626,7 @@ READ8_MEMBER( mos6530_device_base::irq_r )
{
uint8_t data = get_irq_flags();
- if (!machine().side_effect_disabled()) {
+ if (!machine().side_effects_disabled()) {
if (m_irq_edge) {
m_irq_edge = false;
update_irq();
diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp
index 4ce1b97c3eb..2b2a2dd7208 100644
--- a/src/devices/machine/mos6551.cpp
+++ b/src/devices/machine/mos6551.cpp
@@ -376,7 +376,7 @@ void mos6551_device::write_command(uint8_t data)
READ8_MEMBER( mos6551_device::read )
{
- if (machine().side_effect_disabled())
+ if (machine().side_effects_disabled())
return 0xff;
switch (offset & 0x03)
diff --git a/src/devices/machine/msm6253.cpp b/src/devices/machine/msm6253.cpp
index af09f141405..96722247d08 100644
--- a/src/devices/machine/msm6253.cpp
+++ b/src/devices/machine/msm6253.cpp
@@ -103,7 +103,7 @@ bool msm6253_device::shift_out()
bool msb = BIT(m_shift_register, 7);
// shift the bit out, with zero coming in on the other end
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_shift_register <<= 1;
// return the bit
diff --git a/src/devices/machine/s2636.cpp b/src/devices/machine/s2636.cpp
index b0eb09aefa4..c8b1adb62e0 100644
--- a/src/devices/machine/s2636.cpp
+++ b/src/devices/machine/s2636.cpp
@@ -416,7 +416,7 @@ READ8_MEMBER( s2636_device::read_data )
{
case REG_COL_BG_CMPL:
case REG_VBL_COL_OBJ:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_registers[offset] = 0x00; // collision/completion/VRESET flags reset on read
break;
}
diff --git a/src/devices/machine/upd4701.cpp b/src/devices/machine/upd4701.cpp
index 7a02e8bf1e4..14b5fb693a6 100644
--- a/src/devices/machine/upd4701.cpp
+++ b/src/devices/machine/upd4701.cpp
@@ -150,7 +150,7 @@ WRITE_LINE_MEMBER(upd4701_device::resety_w)
READ8_MEMBER(upd4701_device::reset_x)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
resetx_w(1);
resetx_w(0);
@@ -170,7 +170,7 @@ WRITE8_MEMBER(upd4701_device::reset_x)
READ8_MEMBER(upd4701_device::reset_y)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
resety_w(1);
resety_w(0);
@@ -190,7 +190,7 @@ WRITE8_MEMBER(upd4701_device::reset_y)
READ8_MEMBER(upd4701_device::reset_xy)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
resetx_w(1);
resety_w(1);
diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp
index 3d706098dff..4f236814857 100644
--- a/src/devices/machine/z80sio.cpp
+++ b/src/devices/machine/z80sio.cpp
@@ -748,7 +748,7 @@ uint8_t i8274_new_device::read_vector()
constexpr uint8_t RR1_SPECIAL(RR1_RX_OVERRUN_ERROR | RR1_CRC_FRAMING_ERROR | RR1_END_OF_FRAME);
// in non-vectored mode this serves the same function as the end of the second acknowldege cycle
- if (!(m_chanB->m_wr2 & WR2_VECTORED_INT) && !machine().side_effect_disabled())
+ if (!(m_chanB->m_wr2 & WR2_VECTORED_INT) && !machine().side_effects_disabled())
{
m_int_state[prio[i]] |= Z80_DAISY_IEO;
check_interrupts();
@@ -1384,7 +1384,7 @@ uint8_t z80sio_channel::control_read()
//LOG("%s %s\n",FUNCNAME, tag());
// mask out register index
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_wr0 &= ~WR0_REGISTER_MASK;
switch (reg)
@@ -1652,7 +1652,7 @@ uint8_t z80sio_channel::data_read()
{
uint8_t const data = uint8_t(m_rx_data_fifo & 0x000000ffU);
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
// framing and overrun errors need to be cleared to advance the FIFO in interrupt-on-first mode
// TODO: Intel 8274 manual doesn't mention this behaviour - is it specific to Z80 SIO?
diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp
index b5ce53c6bfc..038bfb4d55b 100644
--- a/src/devices/machine/z8536.cpp
+++ b/src/devices/machine/z8536.cpp
@@ -1032,7 +1032,7 @@ READ8_MEMBER( z8536_device::read )
data = read_register(m_pointer);
// return to state 0 after read
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_state0 = true;
break;
diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp
index a8955937fd1..b9a45cabaa4 100644
--- a/src/devices/sound/tms5220.cpp
+++ b/src/devices/sound/tms5220.cpp
@@ -2012,7 +2012,7 @@ WRITE8_MEMBER( tms5220_device::data_w )
void tms5220_device::data_w(uint8_t data)
{
// prevent debugger from changing the internal state
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
#ifdef DEBUG_RS_WS
logerror("tms5220_data_w: data %02x\n", data);
@@ -2050,7 +2050,7 @@ READ8_MEMBER( tms5220_device::status_r )
uint8_t tms5220_device::status_r()
{
// prevent debugger from changing the internal state
- if (machine().side_effect_disabled()) return 0;
+ if (machine().side_effects_disabled()) return 0;
if (!m_true_timing)
{
diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp
index f6d51ac84c6..437fe28a79b 100644
--- a/src/devices/video/315_5124.cpp
+++ b/src/devices/video/315_5124.cpp
@@ -567,7 +567,7 @@ READ8_MEMBER( sega315_5124_device::vram_read )
/* Return read buffer contents */
temp = m_buffer;
- if ( !machine().side_effect_disabled() )
+ if ( !machine().side_effects_disabled() )
{
/* Load read buffer */
m_buffer = this->space().read_byte(m_addr & 0x3fff);
@@ -634,7 +634,7 @@ READ8_MEMBER( sega315_5124_device::register_read )
check_pending_flags();
temp = m_status;
- if ( !machine().side_effect_disabled() )
+ if ( !machine().side_effects_disabled() )
{
/* Clear pending write flag */
m_pending_reg_write = 0;
diff --git a/src/devices/video/bt459.cpp b/src/devices/video/bt459.cpp
index 2fffa53fda9..8086b72e7b5 100644
--- a/src/devices/video/bt459.cpp
+++ b/src/devices/video/bt459.cpp
@@ -100,17 +100,17 @@ u8 bt459_device::get_component(rgb_t *arr, int index)
switch (m_address_rgb)
{
case 0: // red component
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_address_rgb = 1;
return (m_command_2 & CR2524) == CR2524_RED ? arr[index].g() : arr[index].r();
case 1: // green component
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_address_rgb = 2;
return arr[index].g();
case 2: // blue component
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
m_address_rgb = 0;
m_address = (m_address + 1) & ADDRESS_MASK;
@@ -147,7 +147,7 @@ void bt459_device::set_component(rgb_t *arr, int index, u8 data)
READ8_MEMBER(bt459_device::address_lo_r)
{
// reset component pointer and return address register lsb
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_address_rgb = 0;
return m_address & ADDRESS_LSB;
}
@@ -162,7 +162,7 @@ WRITE8_MEMBER(bt459_device::address_lo_w)
READ8_MEMBER(bt459_device::address_hi_r)
{
// reset component pointer and return address register msb
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
m_address_rgb = 0;
return (m_address & ADDRESS_MSB) >> 8;
}
diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp
index fa3dd3c67f7..b5b17160a33 100644
--- a/src/devices/video/clgd542x.cpp
+++ b/src/devices/video/clgd542x.cpp
@@ -1263,7 +1263,7 @@ READ8_MEMBER(cirrus_gd5428_device::mem_r)
if(vga.sequencer.data[4] & 4)
{
int data;
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
vga.gc.latch[0]=vga.memory[(offset+addr) % vga.svga_intf.vram_size];
vga.gc.latch[1]=vga.memory[((offset+addr)+0x10000) % vga.svga_intf.vram_size];
diff --git a/src/devices/video/gb_lcd.cpp b/src/devices/video/gb_lcd.cpp
index 1ac18932086..68aff2d35ec 100644
--- a/src/devices/video/gb_lcd.cpp
+++ b/src/devices/video/gb_lcd.cpp
@@ -2868,7 +2868,7 @@ void dmg_ppu_device::lcd_switch_on(uint8_t new_data)
READ8_MEMBER(dmg_ppu_device::vram_r)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
update_state();
LOG("vram_r: offset=0x%04x\n", offset);
@@ -2890,7 +2890,7 @@ WRITE8_MEMBER(dmg_ppu_device::vram_w)
READ8_MEMBER(dmg_ppu_device::oam_r)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
update_state();
LOG("oam_r: offset=0x%02x\n", offset);
@@ -2913,7 +2913,7 @@ WRITE8_MEMBER(dmg_ppu_device::oam_w)
READ8_MEMBER(dmg_ppu_device::video_r)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
update_state();
if (offset == 1) LOG("STAT read\n");
@@ -3185,7 +3185,7 @@ WRITE8_MEMBER(dmg_ppu_device::video_w)
READ8_MEMBER(cgb_ppu_device::video_r)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
update_state();
if (offset == 1) LOG("STAT read\n");
diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp
index 8f3451352ab..a810e90b5f0 100644
--- a/src/devices/video/hd44780.cpp
+++ b/src/devices/video/hd44780.cpp
@@ -489,7 +489,7 @@ READ8_MEMBER(hd44780_device::control_read)
{
if (m_data_len == 4)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
update_nibble(0, 1);
if (m_nibble)
@@ -551,7 +551,7 @@ READ8_MEMBER(hd44780_device::data_read)
if (m_data_len == 4)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
update_nibble(1, 1);
if (m_nibble)
@@ -560,7 +560,7 @@ READ8_MEMBER(hd44780_device::data_read)
data = (data << 4) & 0xf0;
}
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
update_ac(m_direction);
set_busy_flag(41);
diff --git a/src/devices/video/nt7534.cpp b/src/devices/video/nt7534.cpp
index ea91164c8df..cf2219b3805 100644
--- a/src/devices/video/nt7534.cpp
+++ b/src/devices/video/nt7534.cpp
@@ -283,7 +283,7 @@ READ8_MEMBER(nt7534_device::control_read)
{
if (m_data_len == 4)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
update_nibble(0, 1);
if (m_nibble)
@@ -342,7 +342,7 @@ READ8_MEMBER(nt7534_device::data_read)
if (m_data_len == 4)
{
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
update_nibble(1, 1);
if (m_nibble)
diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp
index 0bbb0f7665c..c4806949ebc 100644
--- a/src/devices/video/pc_vga.cpp
+++ b/src/devices/video/pc_vga.cpp
@@ -2118,7 +2118,7 @@ READ8_MEMBER(vga_device::mem_r)
if(vga.sequencer.data[4] & 4)
{
int data;
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
vga.gc.latch[0]=vga.memory[(offset)];
vga.gc.latch[1]=vga.memory[(offset)+0x10000];
diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp
index b54fb66ea84..3f439bdb89e 100644
--- a/src/devices/video/stvvdp1.cpp
+++ b/src/devices/video/stvvdp1.cpp
@@ -175,7 +175,7 @@ READ16_MEMBER( saturn_state::saturn_vdp1_regs_r )
return modr;
default:
- if(!machine().side_effect_disabled())
+ if(!machine().side_effects_disabled())
logerror("%s VDP1: Read from Registers, Offset %04x\n", machine().describe_context(), offset*2);
break;
}
diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp
index 64d2057ce83..9b8944090ed 100644
--- a/src/devices/video/stvvdp2.cpp
+++ b/src/devices/video/stvvdp2.cpp
@@ -5780,7 +5780,7 @@ READ16_MEMBER ( saturn_state::saturn_vdp2_regs_r )
/* latch h/v signals through HV latch*/
if(!STV_VDP2_EXLTEN)
{
- if(!machine().side_effect_disabled())
+ if(!machine().side_effects_disabled())
{
m_vdp2.h_count = get_hcounter();
m_vdp2.v_count = get_vcounter();
@@ -5807,7 +5807,7 @@ READ16_MEMBER ( saturn_state::saturn_vdp2_regs_r )
m_vdp2_regs[offset] |= 1 << 3;
/* HV latches clears if this register is read */
- if(!machine().side_effect_disabled())
+ if(!machine().side_effects_disabled())
{
m_vdp2.exltfg &= ~1;
m_vdp2.exsyfg &= ~1;
@@ -5821,7 +5821,7 @@ READ16_MEMBER ( saturn_state::saturn_vdp2_regs_r )
/* Games basically r/w the entire VDP2 register area when this is tripped. (example: Silhouette Mirage)
Disable log for the time being. */
- //if(!machine().side_effect_disabled())
+ //if(!machine().side_effects_disabled())
// printf("Warning: VDP2 version read\n");
break;
}
@@ -5841,7 +5841,7 @@ READ16_MEMBER ( saturn_state::saturn_vdp2_regs_r )
}
default:
- //if(!machine().side_effect_disabled())
+ //if(!machine().side_effects_disabled())
// printf("VDP2: read from register %08x %08x\n",offset*4,mem_mask);
break;
}
diff --git a/src/devices/video/t6a04.cpp b/src/devices/video/t6a04.cpp
index 641d447baa6..f0a843986b7 100644
--- a/src/devices/video/t6a04.cpp
+++ b/src/devices/video/t6a04.cpp
@@ -231,7 +231,7 @@ READ8_MEMBER(t6a04_device::data_read)
output_reg = ((((*ti82_video)<<8)+ti82_video[1])>>(10-pos_bit));
}
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
{
m_output_reg = output_reg;
diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp
index c5653c88b13..907886b8a24 100644
--- a/src/devices/video/tms9927.cpp
+++ b/src/devices/video/tms9927.cpp
@@ -279,7 +279,7 @@ READ8_MEMBER( tms9927_device::read )
return m_reg[offset - 0x08 + 7];
default:
- if (!machine().side_effect_disabled())
+ if (!machine().side_effects_disabled())
generic_access(space, offset);
break;
}
diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp
index 52a320815c7..18d41d3782f 100644
--- a/src/devices/video/tms9928a.cpp
+++ b/src/devices/video/tms9928a.cpp
@@ -139,7 +139,7 @@ WRITE8_MEMBER( tms9928a_device::write )
u8 tms9928a_device::vram_read()
{
// prevent debugger from changing the address base
- if (machine().side_effect_disabled()) return 0;
+ if (machine().side_effects_disabled()) return 0;
uint8_t data = m_ReadAhead;
@@ -158,7 +158,7 @@ READ8_MEMBER( tms9928a_device::vram_read )
void tms9928a_device::vram_write(u8 data)
{
// prevent debugger from changing the address base
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
m_vram_space->write_byte(m_Addr, data);
m_Addr = (m_Addr + 1) & (m_vram_size - 1);
@@ -174,7 +174,7 @@ WRITE8_MEMBER( tms9928a_device::vram_write )
u8 tms9928a_device::register_read()
{
// prevent debugger from changing the internal state
- if (machine().side_effect_disabled()) return 0;
+ if (machine().side_effects_disabled()) return 0;
uint8_t data = m_StatusReg;
@@ -306,7 +306,7 @@ void tms9928a_device::change_register(uint8_t reg, uint8_t val)
void tms9928a_device::register_write(u8 data)
{
// prevent debugger from changing the internal state
- if (machine().side_effect_disabled()) return;
+ if (machine().side_effects_disabled()) return;
if (m_latch)
{