From c5345b9ea8a5b6939c55621024bce8e1eade4fdd Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sat, 24 Feb 2018 14:07:24 +0100 Subject: Grammar police (nw) --- src/devices/bus/a2bus/pc_xporter.cpp | 2 +- src/devices/bus/abcbus/lux10828.cpp | 8 +++---- src/devices/bus/amiga/keyboard/a500.cpp | 2 +- src/devices/bus/bbc/tube/tube_6502.cpp | 2 +- src/devices/bus/bbc/tube/tube_65c102.cpp | 2 +- src/devices/bus/bbc/tube/tube_arm.cpp | 2 +- src/devices/bus/bbc/tube/tube_z80.cpp | 2 +- src/devices/bus/bbc/tube/tube_zep100.cpp | 2 +- src/devices/bus/c64/currah_speech.cpp | 2 +- src/devices/bus/intellec4/insdatastor.cpp | 2 +- src/devices/bus/isa/ega.cpp | 2 +- src/devices/bus/isa/sb16.cpp | 2 +- src/devices/bus/msx_cart/holy_quran.cpp | 2 +- src/devices/bus/spectrum/intf1.cpp | 2 +- src/devices/bus/spectrum/usource.cpp | 2 +- src/devices/bus/spectrum/uspeech.cpp | 2 +- src/devices/bus/ti99/internal/998board.cpp | 4 ++-- src/devices/bus/ti99/internal/datamux.cpp | 4 ++-- src/devices/bus/ti99/internal/genboard.cpp | 18 ++++++++-------- src/devices/bus/ti99/peb/bwg.cpp | 6 +++--- src/devices/bus/ti99/peb/evpc.cpp | 2 +- src/devices/bus/ti99/peb/hfdc.cpp | 6 +++--- src/devices/bus/ti99/peb/hsgpl.cpp | 4 ++-- src/devices/bus/ti99/peb/pcode.cpp | 4 ++-- src/devices/bus/ti99/peb/spchsyn.cpp | 4 ++-- src/devices/bus/ti99/peb/ti_fdc.cpp | 8 +++---- src/devices/bus/ti99/peb/tn_ide.cpp | 4 ++-- src/devices/bus/ti99/peb/tn_usbsm.cpp | 4 ++-- src/devices/bus/vcs/rom.cpp | 26 +++++++++++------------ src/devices/bus/vcs/scharger.cpp | 2 +- src/devices/cpu/alto2/a2hw.cpp | 10 ++++----- src/devices/cpu/alto2/a2kbd.cpp | 4 ++-- src/devices/cpu/alto2/a2mem.cpp | 14 ++++++------ src/devices/cpu/cop400/cop400.cpp | 4 ++-- src/devices/cpu/e0c6200/e0c6s46.cpp | 4 ++-- src/devices/cpu/lc8670/lc8670.cpp | 12 +++++------ src/devices/cpu/m6800/m6801.cpp | 18 ++++++++-------- src/devices/cpu/m6805/m68hc05.cpp | 14 ++++++------ src/devices/cpu/psx/psx.cpp | 4 ++-- src/devices/cpu/sharc/sharc.cpp | 2 +- src/devices/cpu/tms32051/tms32051.cpp | 4 ++-- src/devices/cpu/tms7000/tms7000.cpp | 4 ++-- src/devices/cpu/tms7000/tms7000.h | 4 ++-- src/devices/cpu/tms9900/tms9900.cpp | 4 ++-- src/devices/cpu/tms9900/tms9995.cpp | 4 ++-- src/devices/machine/6522via.cpp | 2 +- src/devices/machine/6532riot.cpp | 2 +- src/devices/machine/am9513.cpp | 2 +- src/devices/machine/autoconfig.cpp | 4 ++-- src/devices/machine/cdp1879.cpp | 2 +- src/devices/machine/gen_latch.cpp | 6 +++--- src/devices/machine/i8212.cpp | 2 +- src/devices/machine/mb8421.cpp | 2 +- src/devices/machine/mc68901.cpp | 6 +++--- src/devices/machine/mm58167.cpp | 2 +- src/devices/machine/mos6526.cpp | 14 ++++++------ src/devices/machine/mos6530n.cpp | 6 +++--- src/devices/machine/mos6551.cpp | 2 +- src/devices/machine/msm6253.cpp | 2 +- src/devices/machine/s2636.cpp | 2 +- src/devices/machine/upd4701.cpp | 6 +++--- src/devices/machine/z80sio.cpp | 6 +++--- src/devices/machine/z8536.cpp | 2 +- src/devices/sound/tms5220.cpp | 4 ++-- src/devices/video/315_5124.cpp | 4 ++-- src/devices/video/bt459.cpp | 10 ++++----- src/devices/video/clgd542x.cpp | 2 +- src/devices/video/gb_lcd.cpp | 8 +++---- src/devices/video/hd44780.cpp | 6 +++--- src/devices/video/nt7534.cpp | 4 ++-- src/devices/video/pc_vga.cpp | 2 +- src/devices/video/stvvdp1.cpp | 2 +- src/devices/video/stvvdp2.cpp | 8 +++---- src/devices/video/t6a04.cpp | 2 +- src/devices/video/tms9927.cpp | 2 +- src/devices/video/tms9928a.cpp | 8 +++---- src/emu/debug/debugbuf.cpp | 14 ++++++------ src/emu/debug/debugcmd.cpp | 4 ++-- src/emu/debug/debugcpu.cpp | 18 ++++++++-------- src/emu/debug/dvmemory.cpp | 4 ++-- src/emu/debug/express.cpp | 6 +++--- src/emu/debug/express.h | 4 ++-- src/emu/emumem.cpp | 4 ++-- src/emu/machine.cpp | 2 +- src/emu/machine.h | 26 +++++++++++------------ src/mame/drivers/a2600.cpp | 4 ++-- src/mame/drivers/accomm.cpp | 2 +- src/mame/drivers/agat.cpp | 24 ++++++++++----------- src/mame/drivers/altos8600.cpp | 6 +++--- src/mame/drivers/apple2.cpp | 22 +++++++++---------- src/mame/drivers/apple2e.cpp | 24 ++++++++++----------- src/mame/drivers/atarist.cpp | 2 +- src/mame/drivers/bombjack.cpp | 2 +- src/mame/drivers/c65.cpp | 2 +- src/mame/drivers/ccs2810.cpp | 4 ++-- src/mame/drivers/cdi.cpp | 4 ++-- src/mame/drivers/champbwl.cpp | 2 +- src/mame/drivers/cmi.cpp | 12 +++++------ src/mame/drivers/decwritr.cpp | 4 ++-- src/mame/drivers/esq5505.cpp | 2 +- src/mame/drivers/fm7.cpp | 2 +- src/mame/drivers/gei.cpp | 2 +- src/mame/drivers/grchamp.cpp | 2 +- src/mame/drivers/hp_ipc.cpp | 8 +++---- src/mame/drivers/hyperscan.cpp | 4 ++-- src/mame/drivers/intellec4.cpp | 2 +- src/mame/drivers/interpro.cpp | 4 ++-- src/mame/drivers/kurukuru.cpp | 2 +- src/mame/drivers/lwriter.cpp | 10 ++++----- src/mame/drivers/megasys1.cpp | 12 +++++------ src/mame/drivers/next.cpp | 6 +++--- src/mame/drivers/pc8801.cpp | 4 ++-- src/mame/drivers/pcd.cpp | 8 +++---- src/mame/drivers/psion.cpp | 2 +- src/mame/drivers/rainbow.cpp | 2 +- src/mame/drivers/sc2.cpp | 2 +- src/mame/drivers/segag80r.cpp | 2 +- src/mame/drivers/sigmab98.cpp | 2 +- src/mame/drivers/skylncr.cpp | 2 +- src/mame/drivers/snk.cpp | 4 ++-- src/mame/drivers/stv.cpp | 14 ++++++------ src/mame/drivers/sun2.cpp | 14 ++++++------ src/mame/drivers/sun3.cpp | 14 ++++++------ src/mame/drivers/sun4.cpp | 14 ++++++------ src/mame/drivers/superqix.cpp | 6 +++--- src/mame/drivers/supracan.cpp | 24 ++++++++++----------- src/mame/drivers/symbolics.cpp | 2 +- src/mame/drivers/taitosj.cpp | 2 +- src/mame/drivers/ti99_4p.cpp | 8 +++---- src/mame/drivers/tk2000.cpp | 2 +- src/mame/drivers/univac.cpp | 2 +- src/mame/drivers/vixen.cpp | 4 ++-- src/mame/drivers/vt240.cpp | 2 +- src/mame/drivers/wicat.cpp | 4 ++-- src/mame/drivers/x1.cpp | 2 +- src/mame/drivers/x68k.cpp | 12 +++++------ src/mame/drivers/xor100.cpp | 2 +- src/mame/drivers/zorba.cpp | 4 ++-- src/mame/machine/3do.cpp | 4 ++-- src/mame/machine/apple2.cpp | 34 +++++++++++++++--------------- src/mame/machine/apple2gs.cpp | 6 +++--- src/mame/machine/apple3.cpp | 10 ++++----- src/mame/machine/cammu.cpp | 6 +++--- src/mame/machine/decocass.cpp | 4 ++-- src/mame/machine/inder_sb.cpp | 2 +- src/mame/machine/interpro_ioga.cpp | 4 ++-- src/mame/machine/isbc_215g.cpp | 4 ++-- src/mame/machine/kay_kbd.cpp | 2 +- src/mame/machine/msx_matsushita.cpp | 2 +- src/mame/machine/msx_s1985.cpp | 2 +- src/mame/machine/n64.cpp | 2 +- src/mame/machine/osborne1.cpp | 2 +- src/mame/machine/stfight.cpp | 2 +- src/mame/machine/taito68705interface.cpp | 2 +- src/mame/machine/taitocchip.cpp | 2 +- src/mame/machine/taitosjsec.cpp | 2 +- src/mame/machine/thomson.cpp | 30 +++++++++++++------------- src/mame/machine/ti85.cpp | 4 ++-- src/mame/machine/tigeroad.cpp | 2 +- src/mame/video/pc9801.cpp | 2 +- src/mame/video/zx.cpp | 4 ++-- 161 files changed, 459 insertions(+), 459 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 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 static devcb_base &set_port_write_cb(device_t &device, int p, Object &&object) { return downcast(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(this)->machine().side_effect_disabled()) + if (VERBOSE && !dynamic_cast(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(this)->machine().side_effect_disabled()) + if (VERBOSE && !dynamic_cast(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 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) { diff --git a/src/emu/debug/debugbuf.cpp b/src/emu/debug/debugbuf.cpp index 2399581c18c..10011569aea 100644 --- a/src/emu/debug/debugbuf.cpp +++ b/src/emu/debug/debugbuf.cpp @@ -204,7 +204,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() switch(shift) { case -1: m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->device().machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effects(); u16 *dest = get_ptr(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = m_intf->pc_linear_to_real(lpc); @@ -217,7 +217,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() break; case 0: m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->device().machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effects(); u8 *dest = get_ptr(lstart); u32 steps = 0; for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { @@ -236,7 +236,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() switch(shift) { case -3: // bus granularity 64 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->device().machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effects(); u64 *dest = get_ptr(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = lpc; @@ -250,7 +250,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() case -2: // bus granularity 32 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->device().machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effects(); u32 *dest = get_ptr(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = lpc; @@ -264,7 +264,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() case -1: // bus granularity 16 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->device().machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effects(); u16 *dest = get_ptr(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = lpc; @@ -278,7 +278,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() case 0: // bus granularity 8 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->device().machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effects(); u8 *dest = get_ptr(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = lpc; @@ -292,7 +292,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() case 3: // bus granularity 1, stored as u16 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->device().machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effects(); u16 *dest = reinterpret_cast(&m_buffer[0]) + ((lstart - m_lstart) >> 4); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 0x10) & m_pc_mask) { offs_t tpc = lpc; diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp index 60c859bbe21..b0e9053dfd4 100644 --- a/src/emu/debug/debugcmd.cpp +++ b/src/emu/debug/debugcmd.cpp @@ -1691,7 +1691,7 @@ void debugger_commands::execute_save(int ref, const std::vector &pa } /* now write the data out */ - auto dis = space->device().machine().disable_side_effect(); + auto dis = space->device().machine().disable_side_effects(); switch (space->addr_shift()) { case -3: @@ -1917,7 +1917,7 @@ void debugger_commands::execute_dump(int ref, const std::vector &pa else if(shift < 0) width >>= -shift; - auto dis = space->device().machine().disable_side_effect(); + auto dis = space->device().machine().disable_side_effects(); bool be = space->endianness() == ENDIANNESS_BIG; for (offs_t i = offset; i <= endoffset; i += rowsize) diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index d5d8ec69200..52fb2f784f8 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -835,7 +835,7 @@ u64 debugger_cpu::expression_read_memory(void *param, const char *name, expressi if (memory->has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL))) { address_space &space = memory->space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL)); - auto dis = m_machine.disable_side_effect(disable_se); + auto dis = m_machine.disable_side_effects(disable_se); return read_memory(space, address, size, true); } break; @@ -859,7 +859,7 @@ u64 debugger_cpu::expression_read_memory(void *param, const char *name, expressi if (memory->has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL))) { address_space &space = memory->space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL)); - auto dis = m_machine.disable_side_effect(disable_se); + auto dis = m_machine.disable_side_effects(disable_se); return read_memory(space, address, size, false); } break; @@ -877,7 +877,7 @@ u64 debugger_cpu::expression_read_memory(void *param, const char *name, expressi device = get_visible_cpu(); memory = &device->memory(); } - auto dis = m_machine.disable_side_effect(disable_se); + auto dis = m_machine.disable_side_effects(disable_se); return expression_read_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size); break; } @@ -894,7 +894,7 @@ u64 debugger_cpu::expression_read_memory(void *param, const char *name, expressi device = get_visible_cpu(); memory = &device->memory(); } - auto dis = m_machine.disable_side_effect(disable_se); + auto dis = m_machine.disable_side_effects(disable_se); return expression_read_program_direct(memory->space(AS_OPCODES), (spacenum == EXPSPACE_OPCODE), address, size); break; } @@ -1040,7 +1040,7 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres if (memory->has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL))) { address_space &space = memory->space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL)); - auto dis = m_machine.disable_side_effect(disable_se); + auto dis = m_machine.disable_side_effects(disable_se); write_memory(space, address, data, size, true); } break; @@ -1059,7 +1059,7 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres if (memory->has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL))) { address_space &space = memory->space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL)); - auto dis = m_machine.disable_side_effect(disable_se); + auto dis = m_machine.disable_side_effects(disable_se); write_memory(space, address, data, size, false); } break; @@ -1072,7 +1072,7 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres device = get_visible_cpu(); memory = &device->memory(); } - auto dis = m_machine.disable_side_effect(disable_se); + auto dis = m_machine.disable_side_effects(disable_se); expression_write_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size, data); break; } @@ -1085,7 +1085,7 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres device = get_visible_cpu(); memory = &device->memory(); } - auto dis = m_machine.disable_side_effect(disable_se); + auto dis = m_machine.disable_side_effects(disable_se); expression_write_program_direct(memory->space(AS_OPCODES), (spacenum == EXPSPACE_OPCODE), address, size, data); break; } @@ -2726,7 +2726,7 @@ void device_debug::watchpoint_check(address_space& space, int type, offs_t addre void debugger_cpu::watchpoint_check(address_space& space, int type, offs_t address, u64 value_to_write, u64 mem_mask, std::vector &wplist) { // if we're within debugger code, don't stop - if (m_within_instruction_hook || m_machine.side_effect_disabled()) + if (m_within_instruction_hook || m_machine.side_effects_disabled()) return; m_within_instruction_hook = true; diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp index 13297dbe7b9..d6038214e2d 100644 --- a/src/emu/debug/dvmemory.cpp +++ b/src/emu/debug/dvmemory.cpp @@ -759,7 +759,7 @@ bool debug_view_memory::read(u8 size, offs_t offs, u64 &data) // if no raw data, just use the standard debug routines if (source.m_space) { - auto dis = machine().disable_side_effect(); + auto dis = machine().disable_side_effects(); bool ismapped = offs <= m_maxaddr; if (ismapped && !m_no_translation) @@ -842,7 +842,7 @@ void debug_view_memory::write(u8 size, offs_t offs, u64 data) // if no raw data, just use the standard debug routines if (source.m_space) { - auto dis = machine().disable_side_effect(); + auto dis = machine().disable_side_effects(); switch (size) { diff --git a/src/emu/debug/express.cpp b/src/emu/debug/express.cpp index 06e12e09800..0e4175c6aaf 100644 --- a/src/emu/debug/express.cpp +++ b/src/emu/debug/express.cpp @@ -1159,7 +1159,7 @@ void parsed_expression::parse_memory_operator(parse_token &token, const char *st } // configure the token - token.configure_operator(TVL_MEMORYAT, 2).set_memory_size(memsize).set_memory_space(memspace).set_memory_source(namestring).set_memory_side_effect(disable_se); + token.configure_operator(TVL_MEMORYAT, 2).set_memory_size(memsize).set_memory_space(memspace).set_memory_source(namestring).set_memory_side_effects(disable_se); } @@ -1703,7 +1703,7 @@ u64 parsed_expression::parse_token::get_lval_value(symbol_table *table) // or get the value from the memory callbacks else if (is_memory() && table != nullptr) { - return table->memory_value(m_string, memory_space(), address(), 1 << memory_size(), memory_side_effect()); + return table->memory_value(m_string, memory_space(), address(), 1 << memory_size(), memory_side_effects()); } return 0; @@ -1723,7 +1723,7 @@ inline void parsed_expression::parse_token::set_lval_value(symbol_table *table, // or set the value via the memory callbacks else if (is_memory() && table != nullptr) - table->set_memory_value(m_string, memory_space(), address(), 1 << memory_size(), value, memory_side_effect()); + table->set_memory_value(m_string, memory_space(), address(), 1 << memory_size(), value, memory_side_effects()); } diff --git a/src/emu/debug/express.h b/src/emu/debug/express.h index 8084cf84e8f..270743e6261 100644 --- a/src/emu/debug/express.h +++ b/src/emu/debug/express.h @@ -293,7 +293,7 @@ private: bool right_to_left() const { assert(m_type == OPERATOR); return ((m_flags & TIN_RIGHT_TO_LEFT_MASK) != 0); } expression_space memory_space() const { assert(m_type == OPERATOR || m_type == MEMORY); return expression_space((m_flags & TIN_MEMORY_SPACE_MASK) >> TIN_MEMORY_SPACE_SHIFT); } int memory_size() const { assert(m_type == OPERATOR || m_type == MEMORY); return (m_flags & TIN_MEMORY_SIZE_MASK) >> TIN_MEMORY_SIZE_SHIFT; } - bool memory_side_effect() const { assert(m_type == OPERATOR || m_type == MEMORY); return (m_flags & TIN_SIDE_EFFECT_MASK) >> TIN_SIDE_EFFECT_SHIFT; } + bool memory_side_effects() const { assert(m_type == OPERATOR || m_type == MEMORY); return (m_flags & TIN_SIDE_EFFECT_MASK) >> TIN_SIDE_EFFECT_SHIFT; } // setters parse_token &set_offset(int offset) { m_offset = offset; return *this; } @@ -310,7 +310,7 @@ private: parse_token &set_right_to_left() { assert(m_type == OPERATOR); m_flags |= TIN_RIGHT_TO_LEFT_MASK; return *this; } parse_token &set_memory_space(expression_space space) { assert(m_type == OPERATOR || m_type == MEMORY); m_flags = (m_flags & ~TIN_MEMORY_SPACE_MASK) | ((space << TIN_MEMORY_SPACE_SHIFT) & TIN_MEMORY_SPACE_MASK); return *this; } parse_token &set_memory_size(int log2ofbits) { assert(m_type == OPERATOR || m_type == MEMORY); m_flags = (m_flags & ~TIN_MEMORY_SIZE_MASK) | ((log2ofbits << TIN_MEMORY_SIZE_SHIFT) & TIN_MEMORY_SIZE_MASK); return *this; } - parse_token &set_memory_side_effect(bool disable_se) { assert(m_type == OPERATOR || m_type == MEMORY); m_flags = disable_se ? m_flags | TIN_SIDE_EFFECT_MASK : m_flags & ~TIN_SIDE_EFFECT_MASK; return *this; } + parse_token &set_memory_side_effects(bool disable_se) { assert(m_type == OPERATOR || m_type == MEMORY); m_flags = disable_se ? m_flags | TIN_SIDE_EFFECT_MASK : m_flags & ~TIN_SIDE_EFFECT_MASK; return *this; } parse_token &set_memory_source(const char *string) { assert(m_type == OPERATOR || m_type == MEMORY); m_string = string; return *this; } // access diff --git a/src/emu/emumem.cpp b/src/emu/emumem.cpp index 8d10ed5af4c..4faf7d7bec8 100644 --- a/src/emu/emumem.cpp +++ b/src/emu/emumem.cpp @@ -719,7 +719,7 @@ private: template UintType unmap_r(address_space &space, offs_t offset, UintType mask) { - if (m_space.log_unmap() && !m_space.m_manager.machine().side_effect_disabled()) + if (m_space.log_unmap() && !m_space.m_manager.machine().side_effects_disabled()) { m_space.device().logerror( m_space.is_octal() @@ -791,7 +791,7 @@ private: template void unmap_w(address_space &space, offs_t offset, UintType data, UintType mask) { - if (m_space.log_unmap() && !m_space.m_manager.machine().side_effect_disabled()) + if (m_space.log_unmap() && !m_space.m_manager.machine().side_effects_disabled()) { m_space.device().logerror( m_space.is_octal() diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index a1bd50bc3d1..36620b4258d 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -108,7 +108,7 @@ osd_interface &running_machine::osd() const running_machine::running_machine(const machine_config &_config, machine_manager &manager) : primary_screen(nullptr), - m_side_effect_disabled(0), + m_side_effects_disabled(0), debug_flags(0), m_config(_config), m_system(_config.gamedrv()), diff --git a/src/emu/machine.h b/src/emu/machine.h index bdc4bb6c520..91c937c5134 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -145,7 +145,7 @@ class running_machine { DISABLE_COPYING(running_machine); - class side_effect_disabler; + class side_effects_disabler; friend class sound_manager; friend class memory_manager; @@ -201,8 +201,8 @@ public: // RAII-based side effect disable // NOP-ed when passed false, to make it more easily conditional - side_effect_disabler disable_side_effect(bool disable_se = true) { return side_effect_disabler(this, disable_se); } - bool side_effect_disabled() const { return m_side_effect_disabled != 0; } + side_effects_disabler disable_side_effects(bool disable_se = true) { return side_effects_disabler(this, disable_se); } + bool side_effects_disabled() const { return m_side_effects_disabled != 0; } // additional helpers emu_options &options() const { return m_config.options(); } @@ -263,34 +263,34 @@ private: screen_device * primary_screen; // the primary screen device, or nullptr if screenless // side effect disable counter - u32 m_side_effect_disabled; + u32 m_side_effects_disabled; public: // debugger-related information u32 debug_flags; // the current debug flags private: - class side_effect_disabler { + class side_effects_disabler { running_machine *m_machine; bool m_disable_se; public: - side_effect_disabler(running_machine *m, bool disable_se) : m_machine(m), m_disable_se(disable_se) { + side_effects_disabler(running_machine *m, bool disable_se) : m_machine(m), m_disable_se(disable_se) { if(m_disable_se) - m_machine->disable_side_effect_count(); + m_machine->disable_side_effects_count(); } - ~side_effect_disabler() { + ~side_effects_disabler() { if(m_disable_se) - m_machine->enable_side_effect_count(); + m_machine->enable_side_effects_count(); } - side_effect_disabler(const side_effect_disabler &) = delete; - side_effect_disabler(side_effect_disabler &&) = default; + side_effects_disabler(const side_effects_disabler &) = delete; + side_effects_disabler(side_effects_disabler &&) = default; }; - void disable_side_effect_count() { m_side_effect_disabled++; } - void enable_side_effect_count() { m_side_effect_disabled--; } + void disable_side_effects_count() { m_side_effects_disabled++; } + void enable_side_effects_count() { m_side_effects_disabled--; } // internal helpers template struct is_null { template static bool value(U &&x) { return false; } }; diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index 0c16a985bde..15b1cd559ae 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -43,7 +43,7 @@ ADDRESS_MAP_END READ8_MEMBER(a2600_state::cart_over_all_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_cart->write_bank(space, offset, 0); int masked_offset = offset &~ 0x0d00; @@ -265,7 +265,7 @@ WRITE16_MEMBER(a2600_base_state::a2600_tia_vsync_callback_pal) // TODO: is this the correct behavior for the real hardware?!? READ8_MEMBER(a2600_state::cart_over_riot_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_cart->write_bank(space, offset, 0); return m_riot_ram[0x20 + offset]; } diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp index e1bf38f862f..4d3279afc4e 100644 --- a/src/mame/drivers/accomm.cpp +++ b/src/mame/drivers/accomm.cpp @@ -220,7 +220,7 @@ void accomm_state::video_start() WRITE8_MEMBER(accomm_state::ch00switch_w) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_ch00rom_enabled = false; } diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp index e86bbaf13c9..341a64501bf 100644 --- a/src/mame/drivers/agat.cpp +++ b/src/mame/drivers/agat.cpp @@ -19,7 +19,7 @@ - video: vertical raster splits (used at least by Rapira) - what is the state of devices at init and reset? - what do floating bus reads do? - - ignore debugger reads -- use side_effect_disabled() + - ignore debugger reads -- use side_effects_disabled() - softlists To do (agat7): @@ -351,7 +351,7 @@ READ8_MEMBER(agat7_state::keyb_strobe_r) { // reads any key down, clears strobe uint8_t rv = m_transchar | (m_anykeydown ? 0x80 : 0x00); - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_strobe = 0; return rv; } @@ -364,7 +364,7 @@ WRITE8_MEMBER(agat7_state::keyb_strobe_w) READ8_MEMBER(agat7_state::cassette_toggle_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) cassette_toggle_w(space, offset, 0); return read_floatingbus(); } @@ -377,7 +377,7 @@ WRITE8_MEMBER(agat7_state::cassette_toggle_w) READ8_MEMBER(agat7_state::speaker_toggle_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) speaker_toggle_w(space, offset, 0); return read_floatingbus(); } @@ -390,7 +390,7 @@ WRITE8_MEMBER(agat7_state::speaker_toggle_w) READ8_MEMBER(agat7_state::interrupts_on_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) interrupts_on_w(space, offset, 0); return read_floatingbus(); } @@ -402,7 +402,7 @@ WRITE8_MEMBER(agat7_state::interrupts_on_w) READ8_MEMBER(agat7_state::interrupts_off_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) interrupts_off_w(space, offset, 0); return read_floatingbus(); } @@ -447,7 +447,7 @@ READ8_MEMBER(agat7_state::flags_r) READ8_MEMBER(agat7_state::controller_strobe_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) controller_strobe_w(space, offset, 0); return read_floatingbus(); } @@ -462,7 +462,7 @@ WRITE8_MEMBER(agat7_state::controller_strobe_w) READ8_MEMBER(agat7_state::c080_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { int slot; @@ -504,7 +504,7 @@ READ8_MEMBER(agat7_state::c100_r) if (m_slotdevice[slotnum] != nullptr) { - if ((m_slotdevice[slotnum]->take_c800()) && (!machine().side_effect_disabled())) + if ((m_slotdevice[slotnum]->take_c800()) && (!machine().side_effects_disabled())) { m_cnxx_slot = slotnum; } @@ -527,7 +527,7 @@ WRITE8_MEMBER(agat7_state::c100_w) if (m_slotdevice[slotnum] != nullptr) { - if ((m_slotdevice[slotnum]->take_c800()) && (!machine().side_effect_disabled())) + if ((m_slotdevice[slotnum]->take_c800()) && (!machine().side_effects_disabled())) { m_cnxx_slot = slotnum; } @@ -542,7 +542,7 @@ READ8_MEMBER(agat7_state::c800_r) if (offset == 0x7ff) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_cnxx_slot = -1; } @@ -564,7 +564,7 @@ WRITE8_MEMBER(agat7_state::c800_w) if (offset == 0x7ff) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_cnxx_slot = -1; } diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp index e229140e7c7..fd7d1af0372 100644 --- a/src/mame/drivers/altos8600.cpp +++ b/src/mame/drivers/altos8600.cpp @@ -511,7 +511,7 @@ READ8_MEMBER(altos8600_state::get_slave_ack) void altos8600_state::seterr(offs_t offset, u16 mem_mask, u16 err_mask) { - if(machine().side_effect_disabled()) + if(machine().side_effects_disabled()) return; logerror("Fault at %05x type %04x\n", offset << 1, err_mask); if(!m_nmiinh) @@ -604,7 +604,7 @@ WRITE16_MEMBER(altos8600_state::xtraram_w) READ16_MEMBER(altos8600_state::cpuio_r) { - if(m_user && !machine().side_effect_disabled()) + if(m_user && !machine().side_effects_disabled()) { m_pic1->ir0_w(ASSERT_LINE); return 0; @@ -614,7 +614,7 @@ READ16_MEMBER(altos8600_state::cpuio_r) WRITE16_MEMBER(altos8600_state::cpuio_w) { - if(m_user && !machine().side_effect_disabled()) + if(m_user && !machine().side_effects_disabled()) { m_pic1->ir0_w(ASSERT_LINE); return; diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 3bc2db57174..14e8fd96fa3 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -564,7 +564,7 @@ READ8_MEMBER(napple2_state::keyb_strobe_r) { // reads any key down, clears strobe uint8_t rv = m_transchar | (m_anykeydown ? 0x80 : 0x00); - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_strobe = 0; return rv; } @@ -577,7 +577,7 @@ WRITE8_MEMBER(napple2_state::keyb_strobe_w) READ8_MEMBER(napple2_state::cassette_toggle_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) cassette_toggle_w(space, offset, 0); return read_floatingbus(); } @@ -590,7 +590,7 @@ WRITE8_MEMBER(napple2_state::cassette_toggle_w) READ8_MEMBER(napple2_state::speaker_toggle_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) speaker_toggle_w(space, offset, 0); return read_floatingbus(); } @@ -603,7 +603,7 @@ WRITE8_MEMBER(napple2_state::speaker_toggle_w) READ8_MEMBER(napple2_state::utility_strobe_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) utility_strobe_w(space, offset, 0); return read_floatingbus(); } @@ -615,7 +615,7 @@ WRITE8_MEMBER(napple2_state::utility_strobe_w) READ8_MEMBER(napple2_state::switches_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_softlatch->write_bit((offset & 0x0e) >> 1, offset & 0x01); return read_floatingbus(); } @@ -661,7 +661,7 @@ READ8_MEMBER(napple2_state::flags_r) READ8_MEMBER(napple2_state::controller_strobe_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) controller_strobe_w(space, offset, 0); return read_floatingbus(); } @@ -676,7 +676,7 @@ WRITE8_MEMBER(napple2_state::controller_strobe_w) READ8_MEMBER(napple2_state::c080_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { int slot; @@ -713,7 +713,7 @@ READ8_MEMBER(napple2_state::c100_r) if (m_slotdevice[slotnum] != nullptr) { - if ((m_slotdevice[slotnum]->take_c800()) && (!machine().side_effect_disabled())) + if ((m_slotdevice[slotnum]->take_c800()) && (!machine().side_effects_disabled())) { m_cnxx_slot = slotnum; } @@ -732,7 +732,7 @@ WRITE8_MEMBER(napple2_state::c100_w) if (m_slotdevice[slotnum] != nullptr) { - if ((m_slotdevice[slotnum]->take_c800()) && (!machine().side_effect_disabled())) + if ((m_slotdevice[slotnum]->take_c800()) && (!machine().side_effects_disabled())) { m_cnxx_slot = slotnum; } @@ -745,7 +745,7 @@ READ8_MEMBER(napple2_state::c800_r) { if (offset == 0x7ff) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_cnxx_slot = -1; } @@ -765,7 +765,7 @@ WRITE8_MEMBER(napple2_state::c800_w) { if (offset == 0x7ff) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_cnxx_slot = -1; } diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index 5fd680612d6..246c2436481 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -1309,7 +1309,7 @@ void apple2e_state::cec_lcrom_update() // most softswitches don't care about read vs write, so handle them here void apple2e_state::do_io(address_space &space, int offset, bool is_iic) { - if(machine().side_effect_disabled()) return; + if(machine().side_effects_disabled()) return; // Handle C058-C05F according to IOUDIS if ((offset & 0x58) == 0x58) @@ -1519,7 +1519,7 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic) READ8_MEMBER(apple2e_state::c000_r) { - if(machine().side_effect_disabled()) return read_floatingbus(); + if(machine().side_effects_disabled()) return read_floatingbus(); switch (offset) { @@ -1630,7 +1630,7 @@ READ8_MEMBER(apple2e_state::c000_r) WRITE8_MEMBER(apple2e_state::c000_w) { - if(machine().side_effect_disabled()) return; + if(machine().side_effects_disabled()) return; switch (offset) { @@ -1756,7 +1756,7 @@ WRITE8_MEMBER(apple2e_state::c000_w) READ8_MEMBER(apple2e_state::c000_iic_r) { - if(machine().side_effect_disabled()) return read_floatingbus(); + if(machine().side_effects_disabled()) return read_floatingbus(); switch (offset) { @@ -1900,7 +1900,7 @@ READ8_MEMBER(apple2e_state::c000_iic_r) WRITE8_MEMBER(apple2e_state::c000_iic_w) { - if(machine().side_effect_disabled()) return; + if(machine().side_effects_disabled()) return; switch (offset) { @@ -2098,7 +2098,7 @@ void apple2e_state::update_iic_mouse() READ8_MEMBER(apple2e_state::c080_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { int slot; @@ -2175,7 +2175,7 @@ uint8_t apple2e_state::read_slot_rom(int slotbias, int offset) if (m_slotdevice[slotnum] != nullptr) { - if ((m_cnxx_slot == CNXX_UNCLAIMED) && (m_slotdevice[slotnum]->take_c800()) && (!machine().side_effect_disabled())) + if ((m_cnxx_slot == CNXX_UNCLAIMED) && (m_slotdevice[slotnum]->take_c800()) && (!machine().side_effects_disabled())) { m_cnxx_slot = slotnum; update_slotrom_banks(); @@ -2193,7 +2193,7 @@ void apple2e_state::write_slot_rom(int slotbias, int offset, uint8_t data) if (m_slotdevice[slotnum] != nullptr) { - if ((m_cnxx_slot == CNXX_UNCLAIMED) && (m_slotdevice[slotnum]->take_c800()) && (!machine().side_effect_disabled())) + if ((m_cnxx_slot == CNXX_UNCLAIMED) && (m_slotdevice[slotnum]->take_c800()) && (!machine().side_effects_disabled())) { m_cnxx_slot = slotnum; update_slotrom_banks(); @@ -2296,7 +2296,7 @@ READ8_MEMBER(apple2e_state::c800_r) if (offset == 0x7ff) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_cnxx_slot = CNXX_UNCLAIMED; update_slotrom_banks(); @@ -2320,7 +2320,7 @@ READ8_MEMBER(apple2e_state::c800_int_r) return mig_r(offset-0x600); } - if ((offset == 0x7ff) && !machine().side_effect_disabled()) + if ((offset == 0x7ff) && !machine().side_effects_disabled()) { m_cnxx_slot = CNXX_UNCLAIMED; m_intc8rom = false; @@ -2342,7 +2342,7 @@ READ8_MEMBER(apple2e_state::c800_b2_int_r) return mig_r(offset-0x600); } - if ((offset == 0x7ff) && !machine().side_effect_disabled()) + if ((offset == 0x7ff) && !machine().side_effects_disabled()) { m_cnxx_slot = CNXX_UNCLAIMED; m_intc8rom = false; @@ -2362,7 +2362,7 @@ WRITE8_MEMBER(apple2e_state::c800_w) if (offset == 0x7ff) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_cnxx_slot = CNXX_UNCLAIMED; m_intc8rom = false; diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp index 2e1ea5acde2..5b80ea4d590 100644 --- a/src/mame/drivers/atarist.cpp +++ b/src/mame/drivers/atarist.cpp @@ -433,7 +433,7 @@ WRITE16_MEMBER( st_state::berr_w ) READ16_MEMBER( st_state::berr_r ) { - if(!machine().side_effect_disabled()) { + if(!machine().side_effects_disabled()) { m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE); } diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp index 54822afb7cb..77265b85100 100644 --- a/src/mame/drivers/bombjack.cpp +++ b/src/mame/drivers/bombjack.cpp @@ -111,7 +111,7 @@ READ8_MEMBER(bombjack_state::soundlatch_read_and_clear) // An extra flip-flop is used to clear the LS273 after reading it through a LS245 // (this flip-flop is then cleared in sync with the sound CPU clock) uint8_t res = m_soundlatch->read(space, 0); - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_soundlatch->clear_w(space, 0, 0); return res; } diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp index 9aeca09fbd4..796df763bc2 100644 --- a/src/mame/drivers/c65.cpp +++ b/src/mame/drivers/c65.cpp @@ -224,7 +224,7 @@ READ8_MEMBER(c65_state::vic4567_dummy_r) return m_VIC3_ControlB; } - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) printf("%02x\n",offset); // TODO: PC return res; } diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp index c5964fad409..e3d6fe90ad6 100644 --- a/src/mame/drivers/ccs2810.cpp +++ b/src/mame/drivers/ccs2810.cpp @@ -147,11 +147,11 @@ READ8_MEMBER(ccs_state::memory_read) result = m_rom[offset & 0x7ff]; // wait state forced for 4 MHz operation - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_maincpu->adjust_icount(-1); } - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_power_on_status |= m_power_on_status >> 1; return result; diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp index 5ddbb921927..ae025c0cd76 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 (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) { return 0; } @@ -570,7 +570,7 @@ WRITE8_MEMBER( cdi_state::servo_io_w ) READ8_MEMBER( cdi_state::slave_io_r ) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) { return 0; } diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp index a2276aed0c6..414571dab8f 100644 --- a/src/mame/drivers/champbwl.cpp +++ b/src/mame/drivers/champbwl.cpp @@ -230,7 +230,7 @@ READ8_MEMBER(champbwl_state::trackball_r) READ8_MEMBER(champbwl_state::trackball_reset_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_last_trackball_val[0] = m_fakex->read(); m_last_trackball_val[1] = m_fakey->read(); diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index 4b4e3946709..9e5a27c1ffb 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -837,7 +837,7 @@ void cmi_state::video_write(int offset) READ8_MEMBER( cmi_state::video_r ) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) return m_video_data; m_video_data = m_video_ram[m_y_pos * (512 / 8) + (m_x_pos / 8)]; @@ -883,7 +883,7 @@ WRITE8_MEMBER( cmi_state::vram_w ) READ8_MEMBER( cmi_state::vram_r ) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) return m_video_ram[offset]; /* Latch the current video position */ @@ -947,7 +947,7 @@ template WRITE8_MEMBER( cmi_state::map_w ) template READ8_MEMBER( cmi_state::irq_ram_r ) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) return m_scratch_ram[cpunum][0xf8 + offset]; if (m_m6809_bs_hack_cnt > 0 && m_m6809_bs_hack_cpu == cpunum) @@ -1580,7 +1580,7 @@ WRITE8_MEMBER( cmi_state::fdc_w ) READ8_MEMBER( cmi_state::fdc_r ) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) return 0; if (offset == 0) @@ -2002,7 +2002,7 @@ WRITE8_MEMBER( cmi01a_device::write ) READ8_MEMBER( cmi01a_device::read ) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) return 0; uint8_t data = 0; @@ -2076,7 +2076,7 @@ WRITE_LINE_MEMBER( cmi_state::cmi02_ptm_o2 ) READ8_MEMBER( cmi_state::cmi02_r ) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) return 0; if (offset <= 0x1f) diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp index d86c2dcaeca..3431a18156c 100644 --- a/src/mame/drivers/decwritr.cpp +++ b/src/mame/drivers/decwritr.cpp @@ -141,7 +141,7 @@ WRITE8_MEMBER( decwriter_state::la120_LED_w ) READ8_MEMBER( decwriter_state::la120_NVR_r ) { // one wait state inserted - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_maincpu->adjust_icount(-1); return (m_nvm->data_r() << 7) | 0x7e; @@ -150,7 +150,7 @@ READ8_MEMBER( decwriter_state::la120_NVR_r ) WRITE8_MEMBER( decwriter_state::la120_NVR_w ) { // one wait state inserted - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_maincpu->adjust_icount(-1); // ER1400 has negative logic, but 7406 inverters are used diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index 8c06421f5ef..fd32eb5d40a 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -350,7 +350,7 @@ READ16_MEMBER(esq5505_state::lower_r) m_ram = (uint16_t *)(void *)memshare("osram")->ptr(); } - if (!machine().side_effect_disabled() && m_maincpu->get_fc() == 0x6) // supervisor mode = ROM + if (!machine().side_effects_disabled() && m_maincpu->get_fc() == 0x6) // supervisor mode = ROM { return m_rom[offset]; } diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index 308e8e313c3..6541b605404 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -374,7 +374,7 @@ READ8_MEMBER(fm7_state::fm7_fd04_r) */ READ8_MEMBER(fm7_state::fm7_rom_en_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { uint8_t* RAM = memregion("maincpu")->base(); diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp index e373b294c18..c494ed3260d 100644 --- a/src/mame/drivers/gei.cpp +++ b/src/mame/drivers/gei.cpp @@ -320,7 +320,7 @@ WRITE8_MEMBER(gei_state::geimulti_bank_w) template READ8_MEMBER(gei_state::banksel_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_rombank->set_entry(N); return 0x03; } diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp index da6b1a69b8d..0ac8ef105f3 100644 --- a/src/mame/drivers/grchamp.cpp +++ b/src/mame/drivers/grchamp.cpp @@ -457,7 +457,7 @@ TIMER_CALLBACK_MEMBER(grchamp_state::soundlatch_clear7_w_cb) // RD5000 READ8_MEMBER(grchamp_state::soundlatch_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_soundlatch_flag = false; m_soundnmi->in_w<1>(0); diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index ced1bf29be4..c43134c2399 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -541,14 +541,14 @@ WRITE16_MEMBER(hp_ipc_state::mem_w) READ16_MEMBER(hp_ipc_state::trap_r) { - if (!machine().side_effect_disabled()) set_bus_error((offset << 1) & 0xFFFFFF, 0, mem_mask); + if (!machine().side_effects_disabled()) set_bus_error((offset << 1) & 0xFFFFFF, 0, mem_mask); return 0xffff; } WRITE16_MEMBER(hp_ipc_state::trap_w) { - if (!machine().side_effect_disabled()) set_bus_error((offset << 1) & 0xFFFFFF, 1, mem_mask); + if (!machine().side_effects_disabled()) set_bus_error((offset << 1) & 0xFFFFFF, 1, mem_mask); } @@ -559,7 +559,7 @@ READ16_MEMBER(hp_ipc_state::ram_r) if (ram_address < m_lowest_ram_addr) { - if (!machine().side_effect_disabled()) set_bus_error((offset << 1) + 0x800000, 0, mem_mask); + if (!machine().side_effects_disabled()) set_bus_error((offset << 1) + 0x800000, 0, mem_mask); } else if (ram_address < 0x3c0000) { @@ -576,7 +576,7 @@ WRITE16_MEMBER(hp_ipc_state::ram_w) if (ram_address < m_lowest_ram_addr) { - if (!machine().side_effect_disabled()) set_bus_error((offset << 1) + 0x800000, 1, mem_mask); + if (!machine().side_effects_disabled()) set_bus_error((offset << 1) + 0x800000, 1, mem_mask); } else if (ram_address < 0x3c0000) { diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp index d5d6b7636bc..ffdf52619cc 100644 --- a/src/mame/drivers/hyperscan.cpp +++ b/src/mame/drivers/hyperscan.cpp @@ -226,7 +226,7 @@ READ32_MEMBER(hyperscan_state::spg290_regs_r) #if LOG_SPG290_REGISTER_ACCESS //else { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) log_spg290_regs(this,(offset >> 14) & 0xff, (offset<<2) & 0xffff, mem_mask, false); } #endif @@ -389,7 +389,7 @@ WRITE32_MEMBER(hyperscan_state::spg290_regs_w) #if LOG_SPG290_REGISTER_ACCESS //else { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) log_spg290_regs(this,(offset >> 14) & 0xff, (offset<<2) & 0xffff, mem_mask, true, data); } #endif diff --git a/src/mame/drivers/intellec4.cpp b/src/mame/drivers/intellec4.cpp index d84be918581..e98d5e12b20 100644 --- a/src/mame/drivers/intellec4.cpp +++ b/src/mame/drivers/intellec4.cpp @@ -369,7 +369,7 @@ void intellec4_state::bus_cycle(mcs40_cpu_device_base::phase step, u8 sync, u8 d READ8_MEMBER(intellec4_state::pm_read) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { // always causes data to be latched u16 const addr((u16(m_ram_page) << 8) | ((offset >> 1) & 0x00ffU)); diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index dfcd73e612c..ee65b1e6bb8 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -269,7 +269,7 @@ READ16_MEMBER(interpro_state::sreg_error_r) const u16 result = m_sreg_error; // clear error register on read - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_sreg_error = 0; return result; @@ -278,7 +278,7 @@ READ16_MEMBER(interpro_state::sreg_error_r) READ32_MEMBER(interpro_state::unmapped_r) { // check if non-existent memory errors are enabled - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) if (m_arbga->tctrl_r(space, offset, mem_mask) & interpro_arbga_device::TCTRL_ENNEM) { // flag non-existent memory error in system error register diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index 4e6ac675034..e5f4aeccdb2 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -600,7 +600,7 @@ WRITE8_MEMBER(kurukuru_state::kurukuru_adpcm_reset_w) READ8_MEMBER(kurukuru_state::kurukuru_adpcm_timer_irqack_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_soundirq->rst30_w(0); return 0; } diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp index 7a09dd85d27..4d449a01aa7 100644 --- a/src/mame/drivers/lwriter.cpp +++ b/src/mame/drivers/lwriter.cpp @@ -253,10 +253,10 @@ READ16_MEMBER(lwriter_state::bankedarea_r) } else if (offset <= 0x01ffff) { - if ((offset > 0x7ff) && !machine().side_effect_disabled()) { logerror("Attempt to read banked area (with overlay off) past end of SRAM from offset %08X!\n",offset<<1); } + if ((offset > 0x7ff) && !machine().side_effects_disabled()) { logerror("Attempt to read banked area (with overlay off) past end of SRAM from offset %08X!\n",offset<<1); } return m_sram_ptr[offset&0x7FF]; } - if(!machine().side_effect_disabled()) { logerror("Attempt to read banked area (with overlay off) past end of SRAM from offset %08X! Returning 0xFFFF!\n",offset<<1); } + if(!machine().side_effects_disabled()) { logerror("Attempt to read banked area (with overlay off) past end of SRAM from offset %08X! Returning 0xFFFF!\n",offset<<1); } return 0xFFFF; } @@ -264,16 +264,16 @@ WRITE16_MEMBER(lwriter_state::bankedarea_w) { if (m_overlay) { - if(!machine().side_effect_disabled()) { logerror("Attempt to write banked area (with overlay ON) with data %04X to offset %08X IGNORED!\n",data, offset<<1); } + if(!machine().side_effects_disabled()) { logerror("Attempt to write banked area (with overlay ON) with data %04X to offset %08X IGNORED!\n",data, offset<<1); } return; } else if (offset <= 0x01ffff) { - if ((offset > 0x7ff) && !machine().side_effect_disabled()) { logerror("Attempt to write banked area (with overlay off) with data %04X to offset %08X!\n",data, offset<<1); } + if ((offset > 0x7ff) && !machine().side_effects_disabled()) { logerror("Attempt to write banked area (with overlay off) with data %04X to offset %08X!\n",data, offset<<1); } COMBINE_DATA(&m_sram_ptr[offset&0x7FF]); return; } - if(!machine().side_effect_disabled()) { logerror("Attempt to write banked area (with overlay off) with data %04X to offset %08X IGNORED!\n", data, offset<<1); } + if(!machine().side_effects_disabled()) { logerror("Attempt to write banked area (with overlay off) with data %04X to offset %08X IGNORED!\n", data, offset<<1); } } /* 4 diagnostic LEDs, plus 4 i/o lines for the printer */ diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index d568d664fca..2ca940dc25f 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -4432,7 +4432,7 @@ READ16_MEMBER(megasys1_state::megasys1A_mcu_hs_r) { if(m_mcu_hs && ((m_mcu_hs_ram[8/2] << 6) & 0x3ffc0) == ((offset*2) & 0x3ffc0)) { - if(MCU_HS_LOG && !machine().side_effect_disabled()) + if(MCU_HS_LOG && !machine().side_effects_disabled()) printf("MCU HS R (%04x) <- [%02x]\n",mem_mask,offset*2); return 0x889e; @@ -4460,7 +4460,7 @@ WRITE16_MEMBER(megasys1_state::megasys1A_mcu_hs_w) else m_mcu_hs = 0; - if(MCU_HS_LOG && !machine().side_effect_disabled()) + if(MCU_HS_LOG && !machine().side_effects_disabled()) printf("MCU HS W %04x (%04x) -> [%02x]\n",data,mem_mask,offset*2); } @@ -4579,7 +4579,7 @@ READ16_MEMBER(megasys1_state::iganinju_mcu_hs_r) { if(m_mcu_hs && ((m_mcu_hs_ram[8/2] << 6) & 0x3ffc0) == ((offset*2) & 0x3ffc0)) { - if(MCU_HS_LOG && !machine().side_effect_disabled()) + if(MCU_HS_LOG && !machine().side_effects_disabled()) printf("MCU HS R (%04x) <- [%02x]\n",mem_mask,offset*2); return 0x835d; @@ -4604,7 +4604,7 @@ WRITE16_MEMBER(megasys1_state::iganinju_mcu_hs_w) else m_mcu_hs = 0; - if(MCU_HS_LOG && !machine().side_effect_disabled()) + if(MCU_HS_LOG && !machine().side_effects_disabled()) printf("MCU HS W %04x (%04x) -> [%02x]\n",data,mem_mask,offset*2); } @@ -4728,7 +4728,7 @@ READ16_MEMBER(megasys1_state::stdragon_mcu_hs_r) { if(m_mcu_hs && ((m_mcu_hs_ram[8/2] << 6) & 0x3ffc0) == ((offset*2) & 0x3ffc0)) { - if(MCU_HS_LOG && !machine().side_effect_disabled()) + if(MCU_HS_LOG && !machine().side_effects_disabled()) printf("MCU HS R (%04x) <- [%02x]\n",mem_mask,offset*2); return 0x835d; @@ -4746,7 +4746,7 @@ WRITE16_MEMBER(megasys1_state::stdragon_mcu_hs_w) else m_mcu_hs = 0; - if(MCU_HS_LOG && !machine().side_effect_disabled()) + if(MCU_HS_LOG && !machine().side_effects_disabled()) printf("MCU HS W %04x (%04x) -> [%02x]\n",data,mem_mask,offset*2); } diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp index 2a6505a8f18..65bad1adf83 100644 --- a/src/mame/drivers/next.cpp +++ b/src/mame/drivers/next.cpp @@ -84,14 +84,14 @@ uint32_t next_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, /* map ROM at 0x01000000-0x0101ffff? */ READ32_MEMBER( next_state::rom_map_r ) { - if(0 && !machine().side_effect_disabled()) + if(0 && !machine().side_effects_disabled()) printf("%08x ROM MAP?\n",maincpu->pc()); return 0x01000000; } READ32_MEMBER( next_state::scr2_r ) { - if(0 && !machine().side_effect_disabled()) + if(0 && !machine().side_effects_disabled()) printf("%08x\n",maincpu->pc()); /* x--- ---- ---- ---- ---- ---- ---- ---- dsp reset @@ -128,7 +128,7 @@ READ32_MEMBER( next_state::scr2_r ) WRITE32_MEMBER( next_state::scr2_w ) { - if(0 && !machine().side_effect_disabled()) + if(0 && !machine().side_effects_disabled()) printf("scr2_w %08x (%08x)\n", data, maincpu->pc()); COMBINE_DATA(&scr2); diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index e9f41954820..461dc0721fa 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -1075,7 +1075,7 @@ READ8_MEMBER(pc8801_state::pc8801_mem_r) if(m_misc_ctrl & 0x40) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) m_vram_sel = 3; if(m_alu_ctrl2 & 0x80) @@ -1137,7 +1137,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_mem_w) { if(m_misc_ctrl & 0x40) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) m_vram_sel = 3; if(m_alu_ctrl2 & 0x80) diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp index 6a5a702ca39..90b28f5130a 100644 --- a/src/mame/drivers/pcd.cpp +++ b/src/mame/drivers/pcd.cpp @@ -168,7 +168,7 @@ WRITE_LINE_MEMBER( pcd_state::i186_timer1_w ) READ8_MEMBER( pcd_state::nmi_io_r ) { - if(machine().side_effect_disabled()) + if(machine().side_effects_disabled()) return 0; logerror("%s: unmapped %s %04x\n", machine().describe_context(), space.name(), offset); m_stat |= 0xfd; @@ -178,7 +178,7 @@ READ8_MEMBER( pcd_state::nmi_io_r ) WRITE8_MEMBER( pcd_state::nmi_io_w ) { - if(machine().side_effect_disabled()) + if(machine().side_effects_disabled()) return; logerror("%s: unmapped %s %04x\n", machine().describe_context(), space.name(), offset); m_stat |= 0xfd; @@ -400,7 +400,7 @@ WRITE16_MEMBER(pcd_state::mem_w) reg = m_mmu.regs[((offset >> 10) & 0xff) | ((m_mmu.ctl & 0x18) << 5)]; else reg = m_mmu.regs[((offset >> 10) & 0x7f) | ((m_mmu.ctl & 0x1c) << 5)]; - if(!reg && !machine().side_effect_disabled()) + if(!reg && !machine().side_effects_disabled()) { offset <<= 1; logerror("%s: Null mmu entry %06x\n", machine().describe_context(), offset); @@ -422,7 +422,7 @@ READ16_MEMBER(pcd_state::mem_r) reg = m_mmu.regs[((offset >> 10) & 0xff) | ((m_mmu.ctl & 0x18) << 5)]; else reg = m_mmu.regs[((offset >> 10) & 0x7f) | ((m_mmu.ctl & 0x1c) << 5)]; - if(!reg && !machine().side_effect_disabled()) + if(!reg && !machine().side_effects_disabled()) { offset <<= 1; logerror("%s: Null mmu entry %06x\n", machine().describe_context(), offset); diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp index cb2e3329098..5c189a427e9 100644 --- a/src/mame/drivers/psion.cpp +++ b/src/mame/drivers/psion.cpp @@ -138,7 +138,7 @@ READ8_MEMBER( psion_state::hd63701_int_reg_r ) /* Read/Write common */ void psion_state::io_rw(address_space &space, uint16_t offset) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) return; switch (offset & 0xffc0) diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index ea5e052d9fc..18929fd893e 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -2833,7 +2833,7 @@ WRITE_LINE_MEMBER(rainbow_state::irq_hi_w) READ16_MEMBER(rainbow_state::vram_r) { - if((!(m_GDC_MODE_REGISTER & GDC_MODE_VECTOR)) || machine().side_effect_disabled()) // (NOT VECTOR MODE) + if((!(m_GDC_MODE_REGISTER & GDC_MODE_VECTOR)) || machine().side_effects_disabled()) // (NOT VECTOR MODE) { // SCROLL_MAP IN BITMAP MODE ONLY...? if(m_GDC_MODE_REGISTER & GDC_MODE_HIGHRES) diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp index 8dddb57bd10..fb452c6f635 100644 --- a/src/mame/drivers/sc2.cpp +++ b/src/mame/drivers/sc2.cpp @@ -50,7 +50,7 @@ public: READ8_MEMBER( sc2_state::sc2_beep ) { - //if (!machine().side_effect_disabled()) + //if (!machine().side_effects_disabled()) { m_beep_state = ~m_beep_state; diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index 80afbe2290f..b0263aa4028 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -177,7 +177,7 @@ READ8_MEMBER(segag80r_state::g80r_opcode_r) uint8_t op = m_maincpu->space(AS_PROGRAM).read_byte(offset); // writes via opcode $32 (LD $(XXYY),A) get scrambled - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_scrambled_write_pc = (op == 0x32) ? offset : 0xffff; return op; diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index 8f92f61de73..e704bb76c2e 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -674,7 +674,7 @@ READ8_MEMBER(sigmab98_state::vregs_r) switch (offset) { default: - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) logerror("%s: unknown video reg read: %02x\n", machine().describe_context(), offset); return m_vregs[offset]; } diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index 686fc183063..331e23b11ac 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -446,7 +446,7 @@ READ_LINE_MEMBER(skylncr_state::mbutrfly_prot_r) READ8_MEMBER(skylncr_state::bdream97_opcode_r) { - auto dis = machine().disable_side_effect(); + auto dis = machine().disable_side_effects(); return m_maincpu->space(AS_PROGRAM).read_byte(offset) ^ 0x80; } diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index d3f8d7911ad..92f0a7dcbf4 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -286,7 +286,7 @@ TODO: READ8_MEMBER(snk_state::snk_cpuA_nmi_trigger_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } @@ -300,7 +300,7 @@ WRITE8_MEMBER(snk_state::snk_cpuA_nmi_ack_w) READ8_MEMBER(snk_state::snk_cpuB_nmi_trigger_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { m_subcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 9835fc4f6c3..1c11b52e693 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -100,7 +100,7 @@ READ8_MEMBER(stv_state::stv_ioga_r) uint8_t res; res = 0xff; - if(offset & 0x20 && !machine().side_effect_disabled()) + if(offset & 0x20 && !machine().side_effects_disabled()) printf("Reading from mirror %08x?\n",offset); offset &= 0x1f; // mirror? @@ -131,7 +131,7 @@ READ8_MEMBER(stv_state::stv_ioga_r) WRITE8_MEMBER(stv_state::stv_ioga_w) { - if(offset & 0x20 && !machine().side_effect_disabled()) + if(offset & 0x20 && !machine().side_effects_disabled()) printf("Writing to mirror %08x %02x?\n",offset,data); offset &= 0x1f; // mirror? @@ -304,7 +304,7 @@ READ32_MEMBER(stv_state::critcrsh_ioga_r32) res |= critcrsh_ioga_r(space,offset*4+3); if(ACCESSING_BITS_8_15 || ACCESSING_BITS_24_31) if(!(ACCESSING_BITS_16_23 || ACCESSING_BITS_0_7)) - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) printf("Warning: IOGA reads from odd offset %02x %08x!\n",offset*4,mem_mask); return res; @@ -321,7 +321,7 @@ READ32_MEMBER(stv_state::stvmp_ioga_r32) res |= stvmp_ioga_r(space,offset*4+3); if(ACCESSING_BITS_8_15 || ACCESSING_BITS_24_31) if(!(ACCESSING_BITS_16_23 || ACCESSING_BITS_0_7)) - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) printf("Warning: IOGA reads from odd offset %02x %08x!\n",offset*4,mem_mask); return res; @@ -335,7 +335,7 @@ WRITE32_MEMBER(stv_state::stvmp_ioga_w32) stvmp_ioga_w(space,offset*4+3,data); if(ACCESSING_BITS_8_15 || ACCESSING_BITS_24_31) if(!(ACCESSING_BITS_16_23 || ACCESSING_BITS_0_7)) - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) printf("Warning: IOGA writes to odd offset %02x (%08x) -> %08x!",offset*4,mem_mask,data); } @@ -350,7 +350,7 @@ READ32_MEMBER(stv_state::magzun_ioga_r32) res |= magzun_ioga_r(space,offset*4+3); if(ACCESSING_BITS_8_15 || ACCESSING_BITS_24_31) if(!(ACCESSING_BITS_16_23 || ACCESSING_BITS_0_7)) - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) printf("Warning: IOGA reads from odd offset %02x %08x!\n",offset*4,mem_mask); return res; @@ -364,7 +364,7 @@ WRITE32_MEMBER(stv_state::magzun_ioga_w32) magzun_ioga_w(space,offset*4+3,data); if(ACCESSING_BITS_8_15 || ACCESSING_BITS_24_31) if(!(ACCESSING_BITS_16_23 || ACCESSING_BITS_0_7)) - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) printf("Warning: IOGA writes to odd offset %02x (%08x) -> %08x!",offset*4,mem_mask,data); } diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp index 15bcff610ad..912a8bdc8c0 100644 --- a/src/mame/drivers/sun2.cpp +++ b/src/mame/drivers/sun2.cpp @@ -212,7 +212,7 @@ READ16_MEMBER( sun2_state::tl_mmu_r ) { uint8_t fc = m_maincpu->get_fc(); - if ((fc == 3) && !machine().side_effect_disabled()) + if ((fc == 3) && !machine().side_effects_disabled()) { if (offset & 0x4) // set for CPU space { @@ -271,7 +271,7 @@ READ16_MEMBER( sun2_state::tl_mmu_r ) } // debugger hack - if (machine().side_effect_disabled() && (offset >= (0xef0000>>1)) && (offset <= (0xef8000>>1))) + if (machine().side_effects_disabled() && (offset >= (0xef0000>>1)) && (offset <= (0xef8000>>1))) { return m_rom_ptr[offset & 0x3fff]; } @@ -291,7 +291,7 @@ READ16_MEMBER( sun2_state::tl_mmu_r ) uint32_t tmp = (m_pagemap[entry] & 0xfff) << 10; tmp |= (offset & 0x3ff); - // if (!machine().side_effect_disabled()) + // if (!machine().side_effects_disabled()) // printf("sun2: Translated addr: %08x, type %d (page %d page entry %08x, orig virt %08x, FC %d)\n", tmp << 1, (m_pagemap[entry] >> 22) & 7, entry, m_pagemap[entry], offset<<1, fc); switch ((m_pagemap[entry] >> 22) & 7) @@ -334,10 +334,10 @@ READ16_MEMBER( sun2_state::tl_mmu_r ) } else { - if (!machine().side_effect_disabled()) printf("sun2: pagemap entry not valid!\n"); + if (!machine().side_effects_disabled()) printf("sun2: pagemap entry not valid!\n"); } - if (!machine().side_effect_disabled()) printf("sun2: Unmapped read @ %08x (FC %d, mask %04x, PC=%x, seg %x)\n", offset<<1, fc, mem_mask, m_maincpu->pc(), offset>>15); + if (!machine().side_effects_disabled()) printf("sun2: Unmapped read @ %08x (FC %d, mask %04x, PC=%x, seg %x)\n", offset<<1, fc, mem_mask, m_maincpu->pc(), offset>>15); return 0xffff; } @@ -437,7 +437,7 @@ WRITE16_MEMBER( sun2_state::tl_mmu_w ) uint32_t tmp = (m_pagemap[entry] & 0xfff) << 10; tmp |= (offset & 0x3ff); - //if (!machine().side_effect_disabled()) printf("sun2: Translated addr: %08x, type %d (page entry %08x, orig virt %08x)\n", tmp << 1, (m_pagemap[entry] >> 22) & 7, m_pagemap[entry], offset<<1); + //if (!machine().side_effects_disabled()) printf("sun2: Translated addr: %08x, type %d (page entry %08x, orig virt %08x)\n", tmp << 1, (m_pagemap[entry] >> 22) & 7, m_pagemap[entry], offset<<1); switch ((m_pagemap[entry] >> 22) & 7) { @@ -461,7 +461,7 @@ WRITE16_MEMBER( sun2_state::tl_mmu_w ) } else { - if (!machine().side_effect_disabled()) printf("sun2: pagemap entry not valid!\n"); + if (!machine().side_effects_disabled()) printf("sun2: pagemap entry not valid!\n"); } printf("sun2: Unmapped write %04x (FC %d, mask %04x, PC=%x) to %08x\n", data, fc, mem_mask, m_maincpu->pc(), offset<<1); diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp index 46297ee15b1..62dc2214ea4 100644 --- a/src/mame/drivers/sun3.cpp +++ b/src/mame/drivers/sun3.cpp @@ -404,7 +404,7 @@ READ32_MEMBER( sun3_state::tl_mmu_r ) { uint8_t fc = m_maincpu->get_fc(); - if ((fc == 3) && !machine().side_effect_disabled()) + if ((fc == 3) && !machine().side_effects_disabled()) { int page; @@ -470,7 +470,7 @@ READ32_MEMBER( sun3_state::tl_mmu_r ) } // debugger hack - if (machine().side_effect_disabled() && (offset >= (0xfef0000>>2)) && (offset <= (0xfefffff>>2))) + if (machine().side_effects_disabled() && (offset >= (0xfef0000>>2)) && (offset <= (0xfefffff>>2))) { return m_rom_ptr[offset & 0x3fff]; } @@ -499,7 +499,7 @@ READ32_MEMBER( sun3_state::tl_mmu_r ) //printf("pmeg %d, entry %d = %08x, virt %08x => tmp %08x\n", pmeg, entry, m_pagemap[entry], offset << 2, tmp); - // if (!machine().side_effect_disabled()) + // if (!machine().side_effects_disabled()) //printf("sun3: Translated addr: %08x, type %d (page %d page entry %08x, orig virt %08x, FC %d)\n", tmp << 2, (m_pagemap[entry] >> 26) & 3, entry, m_pagemap[entry], offset<<2, fc); switch ((m_pagemap[entry] >> 26) & 3) @@ -524,7 +524,7 @@ READ32_MEMBER( sun3_state::tl_mmu_r ) } else { -// if (!machine().side_effect_disabled()) printf("sun3: pagemap entry not valid! (PC=%x)\n", m_maincpu->pc()); +// if (!machine().side_effects_disabled()) printf("sun3: pagemap entry not valid! (PC=%x)\n", m_maincpu->pc()); m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE); m_buserr = BE_INVALID; @@ -532,7 +532,7 @@ READ32_MEMBER( sun3_state::tl_mmu_r ) return 0xffffffff; } - if (!machine().side_effect_disabled()) logerror("sun3: Unmapped read @ %08x (FC %d, mask %08x, PC=%x, seg %x)\n", offset<<2, fc, mem_mask, m_maincpu->pc(), offset>>15); + if (!machine().side_effects_disabled()) logerror("sun3: Unmapped read @ %08x (FC %d, mask %08x, PC=%x, seg %x)\n", offset<<2, fc, mem_mask, m_maincpu->pc(), offset>>15); return 0xffffffff; } @@ -650,7 +650,7 @@ WRITE32_MEMBER( sun3_state::tl_mmu_w ) uint32_t tmp = (m_pagemap[entry] & 0x7ffff) << 11; tmp |= (offset & 0x7ff); - //if (!machine().side_effect_disabled()) printf("sun3: Translated addr: %08x, type %d (page entry %08x, orig virt %08x)\n", tmp << 2, (m_pagemap[entry] >> 26) & 3, m_pagemap[entry], offset<<2); + //if (!machine().side_effects_disabled()) printf("sun3: Translated addr: %08x, type %d (page entry %08x, orig virt %08x)\n", tmp << 2, (m_pagemap[entry] >> 26) & 3, m_pagemap[entry], offset<<2); switch ((m_pagemap[entry] >> 26) & 3) { @@ -674,7 +674,7 @@ WRITE32_MEMBER( sun3_state::tl_mmu_w ) } else { - //if (!machine().side_effect_disabled()) printf("sun3: pagemap entry not valid!\n"); + //if (!machine().side_effects_disabled()) printf("sun3: pagemap entry not valid!\n"); m_buserr = BE_INVALID; m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE); diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index 38f4717f161..837af9187cd 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -724,7 +724,7 @@ uint32_t sun4_state::read_insn_data_4c(uint8_t asi, address_space &space, uint32 } else { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { printf("sun4c: INVALID PTE entry %d %08x accessed! vaddr=%x PC=%x\n", entry, m_pagemap[entry], offset <<2, m_maincpu->pc()); //m_maincpu->trap(SPARC_DATA_ACCESS_EXCEPTION); @@ -791,7 +791,7 @@ READ32_MEMBER( sun4_state::sun4c_mmu_r ) uint32_t retval = 0; // make debugger fetches emulate supervisor program for best compatibility with boot PROM execution - if (machine().side_effect_disabled()) asi = 9; + if (machine().side_effects_disabled()) asi = 9; // supervisor program fetches in boot state are special if ((!(m_system_enable & ENA_NOTBOOT)) && (asi == 9)) @@ -870,7 +870,7 @@ READ32_MEMBER( sun4_state::sun4c_mmu_r ) return read_insn_data_4c(asi, space, offset, mem_mask); default: - if (!machine().side_effect_disabled()) printf("sun4c: ASI %d unhandled read @ %x (PC=%x)\n", asi, offset<<2, m_maincpu->pc()); + if (!machine().side_effects_disabled()) printf("sun4c: ASI %d unhandled read @ %x (PC=%x)\n", asi, offset<<2, m_maincpu->pc()); return 0; } @@ -1015,7 +1015,7 @@ uint32_t sun4_state::read_insn_data(uint8_t asi, address_space &space, uint32_t } else { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { printf("sun4: INVALID PTE entry %d %08x accessed! vaddr=%x PC=%x\n", entry, m_pagemap[entry], offset <<2, m_maincpu->pc()); //m_maincpu->trap(SPARC_DATA_ACCESS_EXCEPTION); @@ -1072,7 +1072,7 @@ READ32_MEMBER( sun4_state::sun4_mmu_r ) int page; // make debugger fetches emulate supervisor program for best compatibility with boot PROM execution - if (machine().side_effect_disabled()) asi = 9; + if (machine().side_effects_disabled()) asi = 9; // supervisor program fetches in boot state are special if ((!(m_system_enable & ENA_NOTBOOT)) && (asi == 9)) @@ -1151,7 +1151,7 @@ READ32_MEMBER( sun4_state::sun4_mmu_r ) return read_insn_data(asi, space, offset, mem_mask); default: - if (!machine().side_effect_disabled()) printf("sun4: ASI %d unhandled read @ %x (PC=%x)\n", asi, offset<<2, m_maincpu->pc()); + if (!machine().side_effects_disabled()) printf("sun4: ASI %d unhandled read @ %x (PC=%x)\n", asi, offset<<2, m_maincpu->pc()); return 0; } @@ -1486,7 +1486,7 @@ ADDRESS_MAP_END READ8_MEMBER( sun4_state::fdc_r ) { - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) return 0; switch(offset) diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index 6d64994db85..4535b99a7ff 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -314,7 +314,7 @@ READ8_MEMBER(superqix_state::z80_ay2_iob_r) READ8_MEMBER(superqix_state::z80_semaphore_assert_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(superqix_state::z80_semaphore_assert_cb), this)); } @@ -411,7 +411,7 @@ READ8_MEMBER(superqix_state::mcu_port3_r) READ8_MEMBER(superqix_state_base::nmi_ack_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } @@ -877,7 +877,7 @@ WRITE8_MEMBER(hotsmash_state::hotsmash_Z80_mcu_w) READ8_MEMBER(hotsmash_state::hotsmash_Z80_mcu_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { //if ((m_fromZ80 != 0x04) && (m_fromZ80 != 0x08)) // logerror("%s: z80 read from MCU %02x; Z80HasWritten: %d; MCUHasWritten: %d (and will be 0 after this)\n",machine().describe_context(),m_fromMCU, m_Z80HasWritten, m_MCUHasWritten); diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index b247471a48f..76a4dd90338 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -1148,8 +1148,8 @@ READ8_MEMBER( supracan_state::_6502_soundmem_r ) case 0x410: // Sound IRQ enable data = m_sound_irq_enable_reg; - if(!machine().side_effect_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_r: IRQ enable: %04x\n", data); - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_r: IRQ enable: %04x\n", data); + if(!machine().side_effects_disabled()) { if(m_sound_irq_enable_reg & m_sound_irq_source_reg) { @@ -1164,17 +1164,17 @@ READ8_MEMBER( supracan_state::_6502_soundmem_r ) case 0x411: // Sound IRQ source data = m_sound_irq_source_reg; m_sound_irq_source_reg = 0; - if(!machine().side_effect_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: IRQ source: %04x\n", data); - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: IRQ source: %04x\n", data); + if(!machine().side_effects_disabled()) { m_soundcpu->set_input_line(0, CLEAR_LINE); } break; case 0x420: - if(!machine().side_effect_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: Sound hardware status? (not yet implemented): %02x\n", 0); + if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: Sound hardware status? (not yet implemented): %02x\n", 0); break; case 0x422: - if(!machine().side_effect_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: Sound hardware data? (not yet implemented): %02x\n", 0); + if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: Sound hardware data? (not yet implemented): %02x\n", 0); break; case 0x404: case 0x405: @@ -1185,7 +1185,7 @@ READ8_MEMBER( supracan_state::_6502_soundmem_r ) default: if(offset >= 0x300 && offset < 0x500) { - if(!machine().side_effect_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_r: Unknown register %04x\n", offset); + if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_r: Unknown register %04x\n", offset); } break; } @@ -1467,7 +1467,7 @@ READ16_MEMBER( supracan_state::video_r ) switch(offset) { case 0x00/2: // Video IRQ flags - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { //verboselog("maincpu", 0, "read video IRQ flags (%04x)\n", data); m_maincpu->set_input_line(7, CLEAR_LINE); @@ -1479,16 +1479,16 @@ READ16_MEMBER( supracan_state::video_r ) //data = 0; break; case 0x100/2: - if(!machine().side_effect_disabled()) verboselog("maincpu", 0, "read tilemap_flags[0] (%04x)\n", data); + if(!machine().side_effects_disabled()) verboselog("maincpu", 0, "read tilemap_flags[0] (%04x)\n", data); break; case 0x106/2: - if(!machine().side_effect_disabled()) verboselog("maincpu", 0, "read tilemap_scrolly[0] (%04x)\n", data); + if(!machine().side_effects_disabled()) verboselog("maincpu", 0, "read tilemap_scrolly[0] (%04x)\n", data); break; case 0x120/2: - if(!machine().side_effect_disabled()) verboselog("maincpu", 0, "read tilemap_flags[1] (%04x)\n", data); + if(!machine().side_effects_disabled()) verboselog("maincpu", 0, "read tilemap_flags[1] (%04x)\n", data); break; default: - if(!machine().side_effect_disabled()) verboselog("maincpu", 0, "video_r: Unknown register: %08x (%04x & %04x)\n", 0xf00000 + (offset << 1), data, mem_mask); + if(!machine().side_effects_disabled()) verboselog("maincpu", 0, "video_r: Unknown register: %08x (%04x & %04x)\n", 0xf00000 + (offset << 1), data, mem_mask); break; } diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp index 430bc0d26c0..6d467d56f57 100644 --- a/src/mame/drivers/symbolics.cpp +++ b/src/mame/drivers/symbolics.cpp @@ -114,7 +114,7 @@ public: READ16_MEMBER(symbolics_state::buserror_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE); diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp index f1aec9d902a..275285baa36 100644 --- a/src/mame/drivers/taitosj.cpp +++ b/src/mame/drivers/taitosj.cpp @@ -341,7 +341,7 @@ TIMER_CALLBACK_MEMBER(taitosj_state::sound_semaphore2_clear_w_cb) // RD5000 READ8_MEMBER(taitosj_state::soundlatch_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_soundlatch_flag = false; m_soundnmi->in_w<1>(0); diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp index 99db8ddf733..ae6bd4a6acd 100644 --- a/src/mame/drivers/ti99_4p.cpp +++ b/src/mame/drivers/ti99_4p.cpp @@ -458,7 +458,7 @@ READ16_MEMBER( ti99_4p_state::memread ) int addr_off8k = m_addr_buf & 0x1fff; // If we use the debugger, decode the address now (normally done in setaddress) - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) { m_addr_buf = offset << 1; m_decode = decode_address(m_addr_buf); @@ -501,7 +501,7 @@ READ16_MEMBER( ti99_4p_state::memread ) break; case SGCPU_PEB: - if (machine().side_effect_disabled()) return debugger_read(space, offset); + if (machine().side_effects_disabled()) return debugger_read(space, offset); // The byte from the odd address has already been read into the latch // Reading the even address now m_peribox->readz(space, m_addr_buf, &hbyte); @@ -519,7 +519,7 @@ WRITE16_MEMBER( ti99_4p_state::memwrite ) int address = 0; // If we use the debugger, decode the address now (normally done in setaddress) - if (machine().side_effect_disabled()) + if (machine().side_effects_disabled()) { m_addr_buf = offset << 1; m_decode = decode_address(m_addr_buf); @@ -563,7 +563,7 @@ WRITE16_MEMBER( ti99_4p_state::memwrite ) break; case SGCPU_PEB: - if (machine().side_effect_disabled()) { debugger_write(space, offset, data); return; } + if (machine().side_effects_disabled()) { debugger_write(space, offset, data); return; } // Writing the even address now (addr) // The databus multiplexer puts the even value into the latch and outputs the odd value now. diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp index 9db862421e8..40fe47e4fec 100644 --- a/src/mame/drivers/tk2000.cpp +++ b/src/mame/drivers/tk2000.cpp @@ -174,7 +174,7 @@ uint32_t tk2000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap // most softswitches don't care about read vs write, so handle them here void tk2000_state::do_io(address_space &space, int offset) { - if(machine().side_effect_disabled()) + if(machine().side_effects_disabled()) { return; } diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index 064cac27e8b..88f836e95d0 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -116,7 +116,7 @@ private: READ8_MEMBER( univac_state::ram_r ) { - if (BIT(m_p_parity[offset >> 3], offset & 0x07) && !machine().side_effect_disabled()) + if (BIT(m_p_parity[offset >> 3], offset & 0x07) && !machine().side_effects_disabled()) { LOGPARITY("parity check failed offset = %04X\n", offset); m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 71522532e45..01b1e74ba02 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -79,14 +79,14 @@ void vixen_state::update_interrupt() READ8_MEMBER( vixen_state::opram_r ) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) membank("bank3")->set_entry(0); // read videoram return m_program->read_byte(offset); } READ8_MEMBER( vixen_state::oprom_r ) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) membank("bank3")->set_entry(1); // read rom return m_rom[offset]; } diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index d45cf6e5b0d..5045a6a78c1 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -385,7 +385,7 @@ WRITE8_MEMBER(vt240_state::vom_w) READ16_MEMBER(vt240_state::vram_r) { - if(!BIT(m_reg0, 3) || machine().side_effect_disabled()) + if(!BIT(m_reg0, 3) || machine().side_effects_disabled()) { offset = ((offset & 0x18000) >> 1) | (offset & 0x3fff); return m_video_ram[offset & 0x7fff]; diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index a6cf8bb1e2b..494d8d5163a 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -410,7 +410,7 @@ WRITE8_MEMBER( wicat_state::via_b_w ) READ16_MEMBER( wicat_state::invalid_r ) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { m_maincpu->set_buserror_details(0x300000+offset*2-2,0,m_maincpu->get_fc()); m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); @@ -421,7 +421,7 @@ READ16_MEMBER( wicat_state::invalid_r ) WRITE16_MEMBER( wicat_state::invalid_w ) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { m_maincpu->set_buserror_details(0x300000+offset*2-2,1,m_maincpu->get_fc()); m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index cbdf34cafde..9292cf72430 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -1006,7 +1006,7 @@ WRITE8_MEMBER( x1_state::x1turboz_4096_palette_w ) READ8_MEMBER( x1_state::x1_ex_gfxram_r ) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_iobank->set_bank(0); // any read disables the extended mode return m_iobank->read8(space, offset); diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index ef6458903ea..3d1efcb97f0 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -978,7 +978,7 @@ READ16_MEMBER(x68k_state::x68k_rom0_r) { /* this location contains the address of some expansion device ROM, if no ROM exists, then access causes a bus error */ - if((m_options->read() & 0x02) && !machine().side_effect_disabled()) + if((m_options->read() & 0x02) && !machine().side_effects_disabled()) set_bus_error((offset << 1) + 0xbffffc, 0, mem_mask); return 0xff; } @@ -987,7 +987,7 @@ WRITE16_MEMBER(x68k_state::x68k_rom0_w) { /* this location contains the address of some expansion device ROM, if no ROM exists, then access causes a bus error */ - if((m_options->read() & 0x02) && !machine().side_effect_disabled()) + if((m_options->read() & 0x02) && !machine().side_effects_disabled()) set_bus_error((offset << 1) + 0xbffffc, 1, mem_mask); } @@ -995,7 +995,7 @@ READ16_MEMBER(x68k_state::x68k_emptyram_r) { /* this location is unused RAM, access here causes a bus error Often a method for detecting amount of installed RAM, is to read or write at 1MB intervals, until a bus error occurs */ - if((m_options->read() & 0x02) && !machine().side_effect_disabled()) + if((m_options->read() & 0x02) && !machine().side_effects_disabled()) set_bus_error((offset << 1), 0, mem_mask); return 0xff; } @@ -1004,14 +1004,14 @@ WRITE16_MEMBER(x68k_state::x68k_emptyram_w) { /* this location is unused RAM, access here causes a bus error Often a method for detecting amount of installed RAM, is to read or write at 1MB intervals, until a bus error occurs */ - if((m_options->read() & 0x02) && !machine().side_effect_disabled()) + if((m_options->read() & 0x02) && !machine().side_effects_disabled()) set_bus_error((offset << 1), 1, mem_mask); } READ16_MEMBER(x68k_state::x68k_exp_r) { /* These are expansion devices, if not present, they cause a bus error */ - if((m_options->read() & 0x02) && !machine().side_effect_disabled()) + if((m_options->read() & 0x02) && !machine().side_effects_disabled()) set_bus_error((offset << 1) + 0xeafa00, 0, mem_mask); return 0xff; } @@ -1019,7 +1019,7 @@ READ16_MEMBER(x68k_state::x68k_exp_r) WRITE16_MEMBER(x68k_state::x68k_exp_w) { /* These are expansion devices, if not present, they cause a bus error */ - if((m_options->read() & 0x02) && !machine().side_effect_disabled()) + if((m_options->read() & 0x02) && !machine().side_effects_disabled()) set_bus_error((offset << 1) + 0xeafa00, 1, mem_mask); } diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp index 330c21da49f..aa75582599e 100644 --- a/src/mame/drivers/xor100.cpp +++ b/src/mame/drivers/xor100.cpp @@ -190,7 +190,7 @@ READ8_MEMBER( xor100_state::fdc_wait_r ) */ - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { if (!m_fdc_irq && !m_fdc_drq) { diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index b51f91a665f..fd9ff169411 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -314,7 +314,7 @@ void zorba_state::machine_reset() READ8_MEMBER( zorba_state::ram_r ) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_read_bank->set_entry(0); return 0; } @@ -326,7 +326,7 @@ WRITE8_MEMBER( zorba_state::ram_w ) READ8_MEMBER( zorba_state::rom_r ) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_read_bank->set_entry(1); return 0; } diff --git a/src/mame/machine/3do.cpp b/src/mame/machine/3do.cpp index f2f35b21034..ea3a5a1fa96 100644 --- a/src/mame/machine/3do.cpp +++ b/src/mame/machine/3do.cpp @@ -657,7 +657,7 @@ WRITE32_MEMBER(_3do_state::_3do_madam_w){ READ32_MEMBER(_3do_state::_3do_clio_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { if(offset != 0x200/4 && offset != 0x40/4 && offset != 0x44/4 && offset != 0x48/4 && offset != 0x4c/4 && offset != 0x118/4 && offset != 0x11c/4) @@ -775,7 +775,7 @@ READ32_MEMBER(_3do_state::_3do_clio_r) return m_clio.uncle_rom; default: - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) logerror( "%08X: unhandled CLIO read offset = %08X\n", m_maincpu->pc(), offset * 4 ); break; } diff --git a/src/mame/machine/apple2.cpp b/src/mame/machine/apple2.cpp index da75e20a484..7704f5a9d32 100644 --- a/src/mame/machine/apple2.cpp +++ b/src/mame/machine/apple2.cpp @@ -315,7 +315,7 @@ void apple2_state::apple2_update_memory_postload() READ8_MEMBER(apple2_state::apple2_c0xx_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { read8_delegate handlers[] = { @@ -368,7 +368,7 @@ WRITE8_MEMBER(apple2_state::apple2_c0xx_w) READ8_MEMBER(apple2_state::apple2_c080_r) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { device_a2bus_card_interface *slotdevice; int slot; @@ -425,7 +425,7 @@ int8_t apple2_state::apple2_slotram_r(int slotnum, int offset) { if (m_slot_ram) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { // printf("slotram_r: taking cnxx_slot to -1\n"); m_a2_cnxx_slot = -1; @@ -449,7 +449,7 @@ READ8_MEMBER(apple2_state::apple2_c1xx_r ) if (slotdevice != nullptr) { - if ((slotdevice->take_c800()) && (!machine().side_effect_disabled())) + if ((slotdevice->take_c800()) && (!machine().side_effects_disabled())) { // printf("c1xx_r: taking cnxx_slot to %d\n", slotnum); m_a2_cnxx_slot = slotnum; @@ -499,7 +499,7 @@ READ8_MEMBER(apple2_state::apple2_c3xx_r ) // is a card installed in this slot? if (slotdevice != nullptr) { - if ((slotdevice->take_c800()) && (!machine().side_effect_disabled())) + if ((slotdevice->take_c800()) && (!machine().side_effects_disabled())) { // printf("c3xx_r: taking cnxx_slot to %d\n", slotnum); m_a2_cnxx_slot = slotnum; @@ -527,7 +527,7 @@ WRITE8_MEMBER(apple2_state::apple2_c3xx_w ) if (slotdevice != nullptr) { - if ((slotdevice->take_c800()) && (!machine().side_effect_disabled())) + if ((slotdevice->take_c800()) && (!machine().side_effects_disabled())) { // printf("c3xx_w: taking cnxx_slot to %d\n", slotnum); m_a2_cnxx_slot = slotnum; @@ -553,7 +553,7 @@ READ8_MEMBER(apple2_state::apple2_c4xx_r ) // is a card installed in this slot? if (slotdevice != nullptr) { - if (slotdevice->take_c800() && (m_a2_cnxx_slot != slotnum) && (!machine().side_effect_disabled())) + if (slotdevice->take_c800() && (m_a2_cnxx_slot != slotnum) && (!machine().side_effects_disabled())) { m_a2_cnxx_slot = slotnum; apple2_update_memory(); @@ -580,7 +580,7 @@ WRITE8_MEMBER ( apple2_state::apple2_c4xx_w ) if (slotdevice != nullptr) { - if ((slotdevice->take_c800()) && (!machine().side_effect_disabled())) + if ((slotdevice->take_c800()) && (!machine().side_effects_disabled())) { // printf("c4xx_w: taking cnxx_slot to %d\n", slotnum); m_a2_cnxx_slot = slotnum; @@ -598,7 +598,7 @@ WRITE8_MEMBER ( apple2_state::apple2_c4xx_w ) READ8_MEMBER(apple2_state::apple2_cfff_r) { // debugger guard - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { // printf("cfff_r: taking cnxx_slot to -1\n"); m_a2_cnxx_slot = -1; @@ -610,7 +610,7 @@ READ8_MEMBER(apple2_state::apple2_cfff_r) WRITE8_MEMBER(apple2_state::apple2_cfff_w) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { // printf("cfff_w: taking cnxx_slot to -1\n"); m_a2_cnxx_slot = -1; @@ -1653,7 +1653,7 @@ READ8_MEMBER ( apple2_state::apple2_c00x_r ) { uint8_t result = 0; - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { /* Read the keyboard data and strobe */ g_profiler.start(PROFILER_C00X); @@ -1707,7 +1707,7 @@ READ8_MEMBER( apple2_state::apple2_c01x_r ) { uint8_t result = apple2_getfloatingbusvalue() & 0x7F; - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { g_profiler.start(PROFILER_C01X); @@ -1760,7 +1760,7 @@ WRITE8_MEMBER( apple2_state::apple2_c01x_w ) READ8_MEMBER( apple2_state::apple2_c02x_r ) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { apple2_c02x_w(space, offset, 0, 0); } @@ -1791,7 +1791,7 @@ WRITE8_MEMBER( apple2_state::apple2_c02x_w ) READ8_MEMBER ( apple2_state::apple2_c03x_r ) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { if (!offset) { @@ -1823,7 +1823,7 @@ WRITE8_MEMBER ( apple2_state::apple2_c03x_w ) READ8_MEMBER ( apple2_state::apple2_c05x_r ) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { uint32_t mask; @@ -1871,7 +1871,7 @@ WRITE8_MEMBER ( apple2_state::apple2_c05x_w ) READ8_MEMBER ( apple2_state::apple2_c06x_r ) { int result = 0; - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { switch (offset & 0x0F) { @@ -1934,7 +1934,7 @@ READ8_MEMBER ( apple2_state::apple2_c06x_r ) READ8_MEMBER ( apple2_state::apple2_c07x_r ) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { double x_calibration = attotime::from_usec(12).as_double(); double y_calibration = attotime::from_usec(13).as_double(); diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp index 2febd952e20..6a53eb1d840 100644 --- a/src/mame/machine/apple2gs.cpp +++ b/src/mame/machine/apple2gs.cpp @@ -899,7 +899,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r ) { uint8_t result; - if(machine().side_effect_disabled()) + if(machine().side_effects_disabled()) { return 0; } @@ -1674,7 +1674,7 @@ uint8_t apple2gs_state::apple2gs_xxCxxx_r(address_space &space, offs_t address) slotdevice = nullptr; // if CFFF accessed, reset C800 area to internal ROM - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { if ((address & 0xfff) == 0xfff) { @@ -1708,7 +1708,7 @@ void apple2gs_state::apple2gs_xxCxxx_w(address_space &space, offs_t address, uin int slot; // if CFFF accessed, reset C800 area to internal ROM - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { if ((address & 0xfff) == 0xfff) { diff --git a/src/mame/machine/apple3.cpp b/src/mame/machine/apple3.cpp index 59607ab2af4..dd7c02a0f28 100644 --- a/src/mame/machine/apple3.cpp +++ b/src/mame/machine/apple3.cpp @@ -788,7 +788,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r) uint8_t rv = 0xff; // (zp), y or (zp,x) read - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { if ((m_indir_bank & 0x80) && (offset >= 0x100)) { @@ -832,7 +832,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r) { if (m_via_0_a & ENV_IOENABLE) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { rv = apple3_c0xx_r(space, offset-0xc000); } @@ -957,7 +957,7 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w) { if (m_via_0_a & ENV_IOENABLE) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { apple3_c0xx_w(space, offset-0xc000, data); } @@ -1049,14 +1049,14 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w) } else if (offset >= 0xffd0 && offset <= 0xffdf) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_via_0->write(space, offset, data); } } else if (offset >= 0xffe0 && offset <= 0xffef) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_via_1->write(space, offset, data); } diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp index 8395d40c0e9..11dafe2bfbc 100644 --- a/src/mame/machine/cammu.cpp +++ b/src/mame/machine/cammu.cpp @@ -331,7 +331,7 @@ address_space *cammu_device::translate_address(const offs_t virtual_address, con // check for page faults if (pte & PTE_F) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { LOG("%s page fault address 0x%08x ssw 0x%08x pte 0x%08x (%s)\n", mode == ACCESS_X ? "instruction" : "data", @@ -345,7 +345,7 @@ address_space *cammu_device::translate_address(const offs_t virtual_address, con } // check for protection level faults - if (!machine().side_effect_disabled() && !get_access(mode, pte, ssw)) + if (!machine().side_effects_disabled() && !get_access(mode, pte, ssw)) { LOG("%s protection fault address 0x%08x ssw 0x%08x pte 0x%08x (%s)\n", mode == ACCESS_X ? "execute" : mode == ACCESS_R ? "read" : "write", @@ -386,7 +386,7 @@ address_space *cammu_device::translate_address(const offs_t virtual_address, con // cache purge case ST_7: // main memory, slave mode - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) fatalerror("%s page table entry system tag %d not supported\n", mode == ACCESS_X ? "instruction" : "data", (pte & PTE_ST) >> 9); break; diff --git a/src/mame/machine/decocass.cpp b/src/mame/machine/decocass.cpp index 653c967b014..140e928e2bd 100644 --- a/src/mame/machine/decocass.cpp +++ b/src/mame/machine/decocass.cpp @@ -1037,7 +1037,7 @@ READ8_MEMBER(decocass_widel_state::decocass_widel_r) { if (0 == (offset & E5XX_MASK)) { - if (m_widel_latch && !machine().side_effect_disabled()) + if (m_widel_latch && !machine().side_effects_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", machine().time().as_string(6), m_maincpu->pcbase(), offset, data)); @@ -1057,7 +1057,7 @@ READ8_MEMBER(decocass_widel_state::decocass_widel_r) data = prom[m_widel_ctrs]; LOG(3,("%10s 6502-PC: %04x decocass_widel_r(%02x): $%02x '%c' <- PROM[%04x]\n", machine().time().as_string(6), m_maincpu->pcbase(), offset, data, (data >= 32) ? data : '.', m_widel_ctrs)); - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_widel_ctrs = (m_widel_ctrs + 1) & 0xfffff; } else diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp index 499021e3eeb..120b8f2c01b 100644 --- a/src/mame/machine/inder_sb.cpp +++ b/src/mame/machine/inder_sb.cpp @@ -28,7 +28,7 @@ inder_sb_device::inder_sb_device(const machine_config &mconfig, const char *tag, // hacks for test purposes, these are installed over the program rom so we know when irqs are actually taken READ8_MEMBER(inder_sb_device::vec_bankswitch_r) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_sounddata_bank->set_entry(m_soundbank[(offset & 6) >> 1] & 7); return m_audiocpu_rom[offset + 0x0020]; } diff --git a/src/mame/machine/interpro_ioga.cpp b/src/mame/machine/interpro_ioga.cpp index 27cbaa3d5aa..4a009aea1d8 100644 --- a/src/mame/machine/interpro_ioga.cpp +++ b/src/mame/machine/interpro_ioga.cpp @@ -897,7 +897,7 @@ READ32_MEMBER(interpro_ioga_device::error_businfo_r) const u32 result = m_error_businfo; // clear register after reading - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_error_businfo = 0; return result; @@ -1096,7 +1096,7 @@ READ32_MEMBER(interpro_ioga_device::mouse_status_r) LOGMASKED(LOG_MOUSE, "mouse_status_r status 0x%08x mask 0x%08x (%s)\n", result, mem_mask, machine().describe_context()); // clear xpos and ypos fields - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_mouse_status &= ~(MOUSE_XPOS | MOUSE_YPOS); return result; diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp index e7bc9b3971c..a8b27521983 100644 --- a/src/mame/machine/isbc_215g.cpp +++ b/src/mame/machine/isbc_215g.cpp @@ -133,7 +133,7 @@ READ16_MEMBER(isbc_215g_device::io_r) break; case 0x0c: // reset channel 2 - if(machine().side_effect_disabled()) // reading this is bad + if(machine().side_effects_disabled()) // reading this is bad break; m_dmac->sel_w(1); m_dmac->ca_w(1); @@ -295,7 +295,7 @@ WRITE16_MEMBER(isbc_215g_device::io_w) READ16_MEMBER(isbc_215g_device::mem_r) { // XXX: hack to permit debugger to disassemble rom - if(machine().side_effect_disabled() && (offset < 0x1fff)) + if(machine().side_effects_disabled() && (offset < 0x1fff)) return m_dmac->space(AS_IO).read_word_unaligned(offset*2); switch(offset) diff --git a/src/mame/machine/kay_kbd.cpp b/src/mame/machine/kay_kbd.cpp index 3dacc15285c..fa5578e2d2b 100644 --- a/src/mame/machine/kay_kbd.cpp +++ b/src/mame/machine/kay_kbd.cpp @@ -391,7 +391,7 @@ WRITE8_MEMBER(kaypro_10_keyboard_device::p2_w) { if ((VERBOSE & LOG_TXD) && (0x0014U >= static_cast(m_mcu)->safe_pc())) { - auto const suppressor(machine().disable_side_effect()); + auto const suppressor(machine().disable_side_effects()); address_space &mcu_ram(m_mcu->space(AS_DATA)); std::uint8_t const txd_time(mcu_ram.read_byte(0x1cU)); std::uint8_t const serial_flags(mcu_ram.read_byte(0x1eU)); diff --git a/src/mame/machine/msx_matsushita.cpp b/src/mame/machine/msx_matsushita.cpp index c4fbcdfa9bb..427f22aa0ac 100644 --- a/src/mame/machine/msx_matsushita.cpp +++ b/src/mame/machine/msx_matsushita.cpp @@ -85,7 +85,7 @@ READ8_MEMBER(msx_matsushita_device::switched_read) { uint8_t result = (((m_pattern & 0x80) ? m_nibble1 : m_nibble2) << 4) | ((m_pattern & 0x40) ? m_nibble1 : m_nibble2); - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_pattern = (m_pattern << 2) | (m_pattern >> 6); return result; diff --git a/src/mame/machine/msx_s1985.cpp b/src/mame/machine/msx_s1985.cpp index f596600c15c..25df008defd 100644 --- a/src/mame/machine/msx_s1985.cpp +++ b/src/mame/machine/msx_s1985.cpp @@ -67,7 +67,7 @@ READ8_MEMBER(msx_s1985_device::switched_read) // Pattern and foreground/background color read uint8_t data = (m_pattern & 0x80) ? m_color2 : m_color1; - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) m_pattern = (m_pattern << 1) | (m_pattern >> 7); return data; diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp index f6d771319e4..eb4e2cd7443 100644 --- a/src/mame/machine/n64.cpp +++ b/src/mame/machine/n64.cpp @@ -2674,7 +2674,7 @@ WRITE32_MEMBER( n64_periphs::dd_reg_w ) READ32_MEMBER( n64_periphs::pif_ram_r ) { - if(!machine().side_effect_disabled()) + if(!machine().side_effects_disabled()) { if( offset == ( 0x24 / 4 ) ) { diff --git a/src/mame/machine/osborne1.cpp b/src/mame/machine/osborne1.cpp index 29e00df8dfb..7c57ca4ca3b 100644 --- a/src/mame/machine/osborne1.cpp +++ b/src/mame/machine/osborne1.cpp @@ -103,7 +103,7 @@ WRITE8_MEMBER( osborne1_state::videoram_w ) READ8_MEMBER( osborne1_state::opcode_r ) { - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { // Update the flipflops that control bank selection and NMI uint8_t const new_ub6a_q = (m_btn_reset->read() & 0x80) ? 1 : 0; diff --git a/src/mame/machine/stfight.cpp b/src/mame/machine/stfight.cpp index 199659d145c..299304a7547 100644 --- a/src/mame/machine/stfight.cpp +++ b/src/mame/machine/stfight.cpp @@ -200,7 +200,7 @@ READ8_MEMBER(stfight_state::stfight_fm_r) uint8_t const data = m_fm_data; // Acknowledge the command - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_fm_data &= ~0x80; return data; diff --git a/src/mame/machine/taito68705interface.cpp b/src/mame/machine/taito68705interface.cpp index 8c95feafead..0082bf174ff 100644 --- a/src/mame/machine/taito68705interface.cpp +++ b/src/mame/machine/taito68705interface.cpp @@ -55,7 +55,7 @@ READ8_MEMBER(taito68705_mcu_device_base::data_r) { // clear MCU semaphore flag and return data u8 const result(m_mcu_latch); - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) { m_mcu_flag = false; m_semaphore_cb(CLEAR_LINE); diff --git a/src/mame/machine/taitocchip.cpp b/src/mame/machine/taitocchip.cpp index 56816f9c241..53dec88e261 100644 --- a/src/mame/machine/taitocchip.cpp +++ b/src/mame/machine/taitocchip.cpp @@ -122,7 +122,7 @@ ADDRESS_MAP_END READ8_MEMBER(taito_cchip_device::asic_r) { - if ((offset != 0x001) && (!machine().side_effect_disabled())) // prevent logerror spam for now + if ((offset != 0x001) && (!machine().side_effects_disabled())) // prevent logerror spam for now logerror("%s: asic_r %04x\n", machine().describe_context(), offset); if (offset<0x200) // 400-5ff is asic 'ram' return m_asic_ram[offset&3]; diff --git a/src/mame/machine/taitosjsec.cpp b/src/mame/machine/taitosjsec.cpp index e0561dae527..3f779bde819 100644 --- a/src/mame/machine/taitosjsec.cpp +++ b/src/mame/machine/taitosjsec.cpp @@ -44,7 +44,7 @@ READ8_MEMBER(taito_sj_security_mcu_device::data_r) else { // ZLREAD - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_zaccept = true; return m_mcu_data; } diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index 567e0d88dd6..2ae86f46038 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -375,7 +375,7 @@ READ8_MEMBER( thomson_state::to7_cartridge_r ) { uint8_t* pos = memregion( "maincpu" )->base() + 0x10000; uint8_t data = pos[offset + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_thom_cart_bank = offset & 3; to7_update_cart_bank(); @@ -668,7 +668,7 @@ void thomson_state::to7_modem_init() READ8_MEMBER( thomson_state::to7_modem_mea8000_r ) { - if ( machine().side_effect_disabled() ) + if ( machine().side_effects_disabled() ) { return 0; } @@ -1534,7 +1534,7 @@ READ8_MEMBER( thomson_state::mo5_cartridge_r ) { uint8_t* pos = memregion( "maincpu" )->base() + 0x10000; uint8_t data = pos[offset + 0xbffc + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_thom_cart_bank = offset & 3; mo5_update_cart_bank(); @@ -1757,7 +1757,7 @@ READ8_MEMBER( thomson_state::to9_vreg_r ) case 0: /* palette data */ { uint8_t c = m_to9_palette_data[ m_to9_palette_idx ]; - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_to9_palette_idx = ( m_to9_palette_idx + 1 ) & 31; } @@ -1937,7 +1937,7 @@ READ8_MEMBER( thomson_state::to9_cartridge_r ) { uint8_t* pos = memregion( "maincpu" )->base() + 0x10000; uint8_t data = pos[offset + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_thom_cart_bank = offset & 3; to9_update_cart_bank(); @@ -2091,7 +2091,7 @@ READ8_MEMBER( thomson_state::to9_kbd_r ) return m_to9_kbd_status; case 1: /* get input data */ - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_to9_kbd_status &= ~(ACIA_6850_irq | ACIA_6850_PE); if ( m_to9_kbd_overrun ) @@ -3141,7 +3141,7 @@ READ8_MEMBER( thomson_state::to8_cartridge_r ) { uint8_t* pos = memregion( "maincpu" )->base() + 0x10000; uint8_t data = pos[offset + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_thom_cart_bank = offset & 3; to8_update_cart_bank(); @@ -3175,7 +3175,7 @@ void thomson_state::to8_floppy_reset() READ8_MEMBER( thomson_state::to8_floppy_r ) { - if ( machine().side_effect_disabled() ) + if ( machine().side_effects_disabled() ) return 0; if ( (m_to8_reg_sys1 & 0x80) && THOM_FLOPPY_EXT ) @@ -3234,7 +3234,7 @@ READ8_MEMBER( thomson_state::to8_gatearray_r ) case 1: /* ram register / lightpen register 2 */ if ( m_to7_lightpen ) { - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_mainfirq->in_w<2>(0); m_to8_lightpen_intr = 0; @@ -3319,7 +3319,7 @@ READ8_MEMBER( thomson_state::to8_vreg_r ) /* 0xe7dc from external floppy drive aliases the video gate-array */ if ( ( offset == 3 ) && ( m_to8_reg_ram & 0x80 ) && ( m_to8_reg_sys1 & 0x80 ) ) { - if ( machine().side_effect_disabled() ) + if ( machine().side_effects_disabled() ) return 0; if ( THOM_FLOPPY_EXT ) @@ -3333,7 +3333,7 @@ READ8_MEMBER( thomson_state::to8_vreg_r ) case 0: /* palette data */ { uint8_t c = m_to9_palette_data[ m_to9_palette_idx ]; - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_to9_palette_idx = ( m_to9_palette_idx + 1 ) & 31; } @@ -4013,7 +4013,7 @@ READ8_MEMBER( thomson_state::mo6_cartridge_r ) { uint8_t* pos = memregion( "maincpu" )->base() + 0x10000; uint8_t data = pos[offset + 0xbffc + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_thom_cart_bank = offset & 3; mo6_update_cart_bank(); @@ -4187,7 +4187,7 @@ READ8_MEMBER( thomson_state::mo6_gatearray_r ) case 1: /* ram register / lightpen register 2 */ if ( m_to7_lightpen ) { - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) { m_mainfirq->in_w<2>(0); m_to8_lightpen_intr = 0; @@ -4269,7 +4269,7 @@ READ8_MEMBER( thomson_state::mo6_vreg_r ) /* 0xa7dc from external floppy drive aliases the video gate-array */ if ( ( offset == 3 ) && ( m_to8_reg_ram & 0x80 ) ) { - if ( !machine().side_effect_disabled() ) + if ( !machine().side_effects_disabled() ) return to7_floppy_r( space, 0xc ); } @@ -4449,7 +4449,7 @@ MACHINE_START_MEMBER( thomson_state, mo6 ) READ8_MEMBER( thomson_state::mo5nr_net_r ) { - if ( machine().side_effect_disabled() ) + if ( machine().side_effects_disabled() ) return 0; if ( to7_controller_type ) diff --git a/src/mame/machine/ti85.cpp b/src/mame/machine/ti85.cpp index b13d862d8dc..bb7bdb18136 100644 --- a/src/mame/machine/ti85.cpp +++ b/src/mame/machine/ti85.cpp @@ -273,7 +273,7 @@ READ8_MEMBER(ti85_state::ti83p_membank2_r) { /// http://wikiti.brandonw.net/index.php?title=83Plus:State_of_the_calculator_at_boot /// should only trigger when fetching opcodes - if (m_booting && !machine().side_effect_disabled()) + if (m_booting && !machine().side_effects_disabled()) { m_booting = false; @@ -295,7 +295,7 @@ READ8_MEMBER(ti85_state::ti83p_membank3_r) /// http://wikiti.brandonw.net/index.php?title=83Plus:State_of_the_calculator_at_boot /// should only trigger when fetching opcodes /// should be using port 6 instead of 4 - if (m_booting && (m_ti83p_port4 & 1) && !machine().side_effect_disabled()) + if (m_booting && (m_ti83p_port4 & 1) && !machine().side_effects_disabled()) { m_booting = false; diff --git a/src/mame/machine/tigeroad.cpp b/src/mame/machine/tigeroad.cpp index 449c35daa09..baa91d83646 100644 --- a/src/mame/machine/tigeroad.cpp +++ b/src/mame/machine/tigeroad.cpp @@ -129,7 +129,7 @@ READ16_MEMBER(pushman_state::mcu_comm_r) switch (offset & 0x03) { case 0: // read and acknowledge MCU reply - if (!machine().side_effect_disabled()) + if (!machine().side_effects_disabled()) m_mcu_semaphore = false; return m_mcu_latch; case 2: // expects bit 0 to be high when MCU has accepted command (other bits ignored) diff --git a/src/mame/video/pc9801.cpp b/src/mame/video/pc9801.cpp index c8305605156..fc8b30e2760 100644 --- a/src/mame/video/pc9801.cpp +++ b/src/mame/video/pc9801.cpp @@ -491,7 +491,7 @@ READ16_MEMBER(pc9801_state::upd7220_grcg_r) { uint16_t res = 0; - if(!(m_grcg.mode & 0x80) || machine().side_effect_disabled()) + if(!(m_grcg.mode & 0x80) || machine().side_effects_disabled()) res = m_video_ram_2[offset]; else if(m_ex_video_ff[2]) res = egc_blit_r(offset, mem_mask); diff --git a/src/mame/video/zx.cpp b/src/mame/video/zx.cpp index 3bbb09677d5..c3c7904861f 100644 --- a/src/mame/video/zx.cpp +++ b/src/mame/video/zx.cpp @@ -95,7 +95,7 @@ void zx_state::recalc_hsync() READ8_MEMBER(zx_state::ula_low_r) { uint8_t cdata = m_program->read_byte(offset); - if(machine().side_effect_disabled()) + if(machine().side_effects_disabled()) return cdata; if(m_maincpu->state_int(Z80_HALT)) @@ -114,7 +114,7 @@ READ8_MEMBER(zx_state::ula_high_r) { uint8_t cdata = m_program->read_byte(offset); - if(machine().side_effect_disabled()) + if(machine().side_effects_disabled()) return cdata; if(m_maincpu->state_int(Z80_HALT)) -- cgit v1.2.3