diff --git a/src/emu/diexec.h b/src/emu/diexec.h index ecfeba6eba8..03ac4e76bc8 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -220,6 +220,10 @@ public: // required operation overrides void run() { execute_run(); } + // deliberately ambiguous functions; if you have the execute interface + // just use it + device_execute_interface &execute() { return *this; } + protected: // internal helpers void run_thread_wrapper(); diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h index c6efce57ebe..fa1df6c8382 100644 --- a/src/emu/dimemory.h +++ b/src/emu/dimemory.h @@ -123,6 +123,10 @@ public: bool write(address_spacenum spacenum, offs_t offset, int size, UINT64 value) { return memory_write(spacenum, offset, size, value); } bool readop(offs_t offset, int size, UINT64 &value) { return memory_readop(offset, size, value); } + // deliberately ambiguous functions; if you have the memory interface + // just use it + device_memory_interface &memory() { return *this; } + protected: // required overrides virtual const address_space_config *memory_space_config(address_spacenum spacenum) const = 0; diff --git a/src/emu/distate.h b/src/emu/distate.h index 286ca2f8823..2893fa88741 100644 --- a/src/emu/distate.h +++ b/src/emu/distate.h @@ -233,18 +233,4 @@ inline offs_t device_t::safe_pcbase() } -//------------------------------------------------- -// device_state - return a pointer to the device -// state interface for this device -//------------------------------------------------- - -inline device_state_interface *device_state(device_t *device) -{ - device_state_interface *intf; - if (!device->interface(intf)) - throw emu_fatalerror("Device '%s' does not have state interface", device->tag()); - return intf; -} - - #endif /* __DISTATE_H__ */ diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c index d84fd06f8f4..6a40e336d92 100644 --- a/src/emu/machine/latch8.c +++ b/src/emu/machine/latch8.c @@ -82,7 +82,7 @@ READ8_DEVICE_HANDLER( latch8_r ) if (latch8->has_read) { /* temporary hack until all relevant systems are devices */ - address_space *space = device->machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space = device->machine().firstcpu->space(AS_PROGRAM); int i; for (i=0; i<8; i++) { diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index 4254525c24a..7407a62c040 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -702,7 +702,7 @@ static void SCSP_UpdateSlotReg(scsp_state *scsp,int s,int r) static void SCSP_UpdateReg(scsp_state *scsp, int reg) { /* temporary hack until this is converted to a device */ - address_space *space = scsp->device->machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space = scsp->device->machine().firstcpu->space(AS_PROGRAM); switch(reg&0x3f) { @@ -1325,7 +1325,7 @@ WRITE16_DEVICE_HANDLER( scsp_w ) case 0x416: COMBINE_DATA(&scsp->dma_regs[((offset-0x412)/2) & 3]); if(ACCESSING_BITS_8_15 && offset*2 == 0x416) - dma_scsp(device->machine().firstcpu->memory().space(AS_PROGRAM), scsp); + dma_scsp(device->machine().firstcpu->space(AS_PROGRAM), scsp); break; case 0x42a: //check main cpu IRQ scsp->main_irq(1); diff --git a/src/emu/video/pc_cga.c b/src/emu/video/pc_cga.c index 7c5e11e9871..579b336eda7 100644 --- a/src/emu/video/pc_cga.c +++ b/src/emu/video/pc_cga.c @@ -329,11 +329,11 @@ static int internal_pc_cga_video_start(running_machine &machine) static VIDEO_START( pc_cga ) { int buswidth; - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); - address_space *spaceio = machine.firstcpu->memory().space(AS_IO); + address_space *space = machine.firstcpu->space(AS_PROGRAM); + address_space *spaceio = machine.firstcpu->space(AS_IO); space->install_readwrite_bank(0xb8000, 0xbbfff, 0, 0x04000, "bank11" ); - buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; UINT64 mask = 0; switch(buswidth) { @@ -370,12 +370,12 @@ static VIDEO_START( pc_cga ) static VIDEO_START( pc_cga32k ) { int buswidth; - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); - address_space *spaceio = machine.firstcpu->memory().space(AS_IO); + address_space *space = machine.firstcpu->space(AS_PROGRAM); + address_space *spaceio = machine.firstcpu->space(AS_IO); space->install_readwrite_bank(0xb8000, 0xbffff, "bank11" ); - buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; UINT64 mask = 0; switch(buswidth) { @@ -1201,8 +1201,8 @@ static WRITE8_HANDLER( pc_cga8_w ) case 0x0f: // Not sure if some all CGA cards have ability to upload char definition // The original CGA card had a char rom - UINT8 buswidth = space->machine().firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; - address_space *space_prg = space->machine().firstcpu->memory().space(AS_PROGRAM); + UINT8 buswidth = space->machine().firstcpu->space_config(AS_PROGRAM)->m_databus_width; + address_space *space_prg = space->machine().firstcpu->space(AS_PROGRAM); cga.p3df = data; if (data & 1) { UINT64 mask = 0; @@ -1635,8 +1635,8 @@ static VIDEO_START( pc1512 ) cga.videoram_size = 0x10000; cga.videoram = auto_alloc_array(machine, UINT8, 0x10000 ); - address_space *space = machine.firstcpu->memory().space( AS_PROGRAM ); - address_space *io_space = machine.firstcpu->memory().space( AS_IO ); + address_space *space = machine.firstcpu->space( AS_PROGRAM ); + address_space *io_space = machine.firstcpu->space( AS_IO ); space->install_read_bank( 0xb8000, 0xbbfff, 0, 0x0C000, "bank1" ); machine.root_device().membank("bank1")->set_base(cga.videoram + videoram_offset[0]); diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index d07e232e5f8..4706ecb6726 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -2015,7 +2015,7 @@ void pc_vga_io_init(running_machine &machine, address_space *mem_space, offs_t m int buswidth; UINT64 mask = 0; - buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; switch(buswidth) { case 8: @@ -2440,7 +2440,7 @@ void pc_svga_trident_io_init(running_machine &machine, address_space *mem_space, int buswidth; UINT64 mask = 0; - buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; switch(buswidth) { case 8: @@ -4461,7 +4461,7 @@ void pc_vga_gamtor_io_init(running_machine &machine, address_space *mem_space, o int buswidth; UINT64 mask = 0; - buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; switch(buswidth) { case 8: diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c index 2dc4395e9f7..ad745e28132 100644 --- a/src/mame/audio/8080bw.c +++ b/src/mame/audio/8080bw.c @@ -898,7 +898,7 @@ static TIMER_CALLBACK( schaser_effect_555_cb ) static void schaser_reinit_555_time_remain(_8080bw_state *state) { - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); state->m_schaser_effect_555_time_remain = attotime::from_double(state->m_schaser_effect_555_time_remain_savable); state->schaser_sh_port_2_w(*space, 0, state->m_port_2_last_extra); } diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c index 309056c650a..da1b4d3e0fd 100644 --- a/src/mame/audio/atarijsa.c +++ b/src/mame/audio/atarijsa.c @@ -147,7 +147,7 @@ void atarijsa_init(running_machine &machine, const char *testport, int testmask) /* install POKEY memory handlers */ if (pokey != NULL) - jsacpu->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2c00, 0x2c0f, read8_delegate(FUNC(pokey_device::read),pokey), write8_delegate(FUNC(pokey_device::write),pokey)); + jsacpu->space(AS_PROGRAM)->install_readwrite_handler(0x2c00, 0x2c0f, read8_delegate(FUNC(pokey_device::read),pokey), write8_delegate(FUNC(pokey_device::write),pokey)); init_save_state(machine); atarijsa_reset(); diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index dcb8f39cbe5..d321ea7b8b2 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -177,7 +177,7 @@ void cage_init(running_machine &machine, offs_t speedup) state->timer[1] = machine.device("cage_timer1"); if (speedup) - state->speedup_ram = state->cpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(speedup, speedup, FUNC(speedup_w)); + state->speedup_ram = state->cpu->space(AS_PROGRAM)->install_legacy_write_handler(speedup, speedup, FUNC(speedup_w)); for (chan = 0; chan < DAC_BUFFER_CHANNELS; chan++) { diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index f93607b4922..46555f8d9fd 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -2141,7 +2141,7 @@ static TIMER_CALLBACK( s1_ack_callback2 ) machine.scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback2), param); return; } - output_latch_w(dcs.cpu->memory().space(AS_PROGRAM), 0, 0x000a, 0xffff); + output_latch_w(dcs.cpu->space(AS_PROGRAM), 0, 0x000a, 0xffff); } @@ -2153,7 +2153,7 @@ static TIMER_CALLBACK( s1_ack_callback1 ) machine.scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback1), param); return; } - output_latch_w(dcs.cpu->memory().space(AS_PROGRAM), 0, param, 0xffff); + output_latch_w(dcs.cpu->space(AS_PROGRAM), 0, param, 0xffff); /* chain to the next word we need to write back */ machine.scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback2)); @@ -2285,7 +2285,7 @@ static int preprocess_stage_1(running_machine &machine, UINT16 data) static TIMER_CALLBACK( s2_ack_callback ) { - address_space *space = dcs.cpu->memory().space(AS_PROGRAM); + address_space *space = dcs.cpu->space(AS_PROGRAM); /* if the output is full, stall for a usec */ if (IS_OUTPUT_FULL()) diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c index dbfc3e27253..ee2aec6bb47 100644 --- a/src/mame/audio/harddriv.c +++ b/src/mame/audio/harddriv.c @@ -231,15 +231,13 @@ WRITE16_MEMBER(harddriv_state::hdsnd68k_320ram_w) READ16_MEMBER(harddriv_state::hdsnd68k_320ports_r) { - address_space *iospace = m_sounddsp->memory().space(AS_IO); - return iospace->read_word((offset & 7) << 1); + return m_sounddsp->space(AS_IO)->read_word((offset & 7) << 1); } WRITE16_MEMBER(harddriv_state::hdsnd68k_320ports_w) { - address_space *iospace = m_sounddsp->memory().space(AS_IO); - iospace->write_word((offset & 7) << 1, data); + m_sounddsp->space(AS_IO)->write_word((offset & 7) << 1, data); } diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 52f4a811fa2..e23d24af3b2 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -2533,7 +2533,7 @@ static MACHINE_RESET( invmulti ) { _8080bw_state *state = machine.driver_data<_8080bw_state>(); - state->invmulti_bank_w(*state->m_maincpu->memory().space(AS_PROGRAM), 0, 0); + state->invmulti_bank_w(*state->m_maincpu->space(AS_PROGRAM), 0, 0); MACHINE_RESET_CALL(mw8080bw); } diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c index e01b267aac9..f753b3d6d79 100644 --- a/src/mame/drivers/deshoros.c +++ b/src/mame/drivers/deshoros.c @@ -252,7 +252,7 @@ void destiny_state::machine_start() void destiny_state::machine_reset() { - bank_select_w(*m_maincpu->memory().space(AS_PROGRAM), 0, 0); + bank_select_w(*m_maincpu->space(AS_PROGRAM), 0, 0); } static MACHINE_CONFIG_START( destiny, destiny_state ) diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index 9845d958bb8..fba493a34c7 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -443,7 +443,7 @@ READ32_MEMBER(gunbustr_state::main_cycle_r) DRIVER_INIT_MEMBER(gunbustr_state,gunbustr) { /* Speedup handler */ - m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x203acc, 0x203acf, read32_delegate(FUNC(gunbustr_state::main_cycle_r),this)); + m_maincpu->space(AS_PROGRAM)->install_read_handler(0x203acc, 0x203acf, read32_delegate(FUNC(gunbustr_state::main_cycle_r),this)); } DRIVER_INIT_MEMBER(gunbustr_state,gunbustrj) diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index 5b39172bf83..5e334754b00 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -3999,9 +3999,9 @@ static void init_multisync(running_machine &machine, int compact_inputs) /* install handlers for the compact driving games' inputs */ if (compact_inputs) { - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400001, FUNC(hdc68k_wheel_r)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x408000, 0x408001, FUNC(hdc68k_wheel_edge_reset_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hdc68k_port1_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400001, FUNC(hdc68k_wheel_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x408000, 0x408001, FUNC(hdc68k_wheel_edge_reset_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hdc68k_port1_r)); } } @@ -4012,18 +4012,18 @@ static void init_adsp(running_machine &machine) harddriv_state *state = machine.driver_data(); /* install ADSP program RAM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x800000, 0x807fff, FUNC(hd68k_adsp_program_r), FUNC(hd68k_adsp_program_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x800000, 0x807fff, FUNC(hd68k_adsp_program_r), FUNC(hd68k_adsp_program_w)); /* install ADSP data RAM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x808000, 0x80bfff, FUNC(hd68k_adsp_data_r), FUNC(hd68k_adsp_data_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x808000, 0x80bfff, FUNC(hd68k_adsp_data_r), FUNC(hd68k_adsp_data_w)); /* install ADSP serial buffer RAM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x810000, 0x813fff, FUNC(hd68k_adsp_buffer_r), FUNC(hd68k_adsp_buffer_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x810000, 0x813fff, FUNC(hd68k_adsp_buffer_r), FUNC(hd68k_adsp_buffer_w)); /* install ADSP control locations */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x818000, 0x81801f, FUNC(hd68k_adsp_control_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x818060, 0x81807f, FUNC(hd68k_adsp_irq_clear_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x838000, 0x83ffff, FUNC(hd68k_adsp_irq_state_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x818000, 0x81801f, FUNC(hd68k_adsp_control_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x818060, 0x81807f, FUNC(hd68k_adsp_irq_clear_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x838000, 0x83ffff, FUNC(hd68k_adsp_irq_state_r)); } @@ -4033,21 +4033,21 @@ static void init_ds3(running_machine &machine) harddriv_state *state = machine.driver_data(); /* install ADSP program RAM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x800000, 0x807fff, FUNC(hd68k_ds3_program_r), FUNC(hd68k_ds3_program_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x800000, 0x807fff, FUNC(hd68k_ds3_program_r), FUNC(hd68k_ds3_program_w)); /* install ADSP data RAM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x808000, 0x80bfff, FUNC(hd68k_adsp_data_r), FUNC(hd68k_adsp_data_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x80c000, 0x80dfff, FUNC(hdds3_special_r), FUNC(hdds3_special_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x808000, 0x80bfff, FUNC(hd68k_adsp_data_r), FUNC(hd68k_adsp_data_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x80c000, 0x80dfff, FUNC(hdds3_special_r), FUNC(hdds3_special_w)); /* install ADSP control locations */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x820000, 0x8207ff, FUNC(hd68k_ds3_gdata_r)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x820800, 0x820fff, FUNC(hd68k_ds3_girq_state_r)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x820000, 0x8207ff, FUNC(hd68k_ds3_gdata_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x821000, 0x8217ff, FUNC(hd68k_adsp_irq_clear_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x822000, 0x8227ff, FUNC(hd68k_ds3_sdata_r)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x822800, 0x822fff, FUNC(hd68k_ds3_sirq_state_r)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x822000, 0x8227ff, FUNC(hd68k_ds3_sdata_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x823800, 0x823fff, FUNC(hd68k_ds3_control_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x820000, 0x8207ff, FUNC(hd68k_ds3_gdata_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x820800, 0x820fff, FUNC(hd68k_ds3_girq_state_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x820000, 0x8207ff, FUNC(hd68k_ds3_gdata_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x821000, 0x8217ff, FUNC(hd68k_adsp_irq_clear_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x822000, 0x8227ff, FUNC(hd68k_ds3_sdata_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x822800, 0x822fff, FUNC(hd68k_ds3_sirq_state_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x822000, 0x8227ff, FUNC(hd68k_ds3_sdata_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x823800, 0x823fff, FUNC(hd68k_ds3_control_w)); /* if we have a sound DSP, boot it */ if (state->m_ds4cpu1 != NULL) @@ -4132,26 +4132,26 @@ static void init_dsk(running_machine &machine) UINT8 *usr3 = state->memregion("user3")->base(); /* install ASIC61 */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x85c000, 0x85c7ff, FUNC(hd68k_dsk_dsp32_r), FUNC(hd68k_dsk_dsp32_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x85c000, 0x85c7ff, FUNC(hd68k_dsk_dsp32_r), FUNC(hd68k_dsk_dsp32_w)); /* install control registers */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x85c800, 0x85c81f, FUNC(hd68k_dsk_control_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x85c800, 0x85c81f, FUNC(hd68k_dsk_control_w)); /* install extra RAM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x900000, 0x90ffff, FUNC(hd68k_dsk_ram_r), FUNC(hd68k_dsk_ram_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x900000, 0x90ffff, FUNC(hd68k_dsk_ram_r), FUNC(hd68k_dsk_ram_w)); state->m_dsk_ram = (UINT16 *)(usr3 + 0x40000); /* install extra ZRAM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x910000, 0x910fff, FUNC(hd68k_dsk_zram_r), FUNC(hd68k_dsk_zram_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x910000, 0x910fff, FUNC(hd68k_dsk_zram_r), FUNC(hd68k_dsk_zram_w)); state->m_dsk_zram = (UINT16 *)(usr3 + 0x50000); /* install ASIC65 */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x914000, 0x917fff, FUNC(asic65_data_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x914000, 0x917fff, FUNC(asic65_r)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x918000, 0x91bfff, FUNC(asic65_io_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x914000, 0x917fff, FUNC(asic65_data_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x914000, 0x917fff, FUNC(asic65_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x918000, 0x91bfff, FUNC(asic65_io_r)); /* install extra ROM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x940000, 0x9fffff, FUNC(hd68k_dsk_small_rom_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x940000, 0x9fffff, FUNC(hd68k_dsk_small_rom_r)); state->m_dsk_rom = (UINT16 *)(usr3 + 0x00000); /* set up the ASIC65 */ @@ -4166,22 +4166,22 @@ static void init_dsk2(running_machine &machine) UINT8 *usr3 = state->memregion("user3")->base(); /* install ASIC65 */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x824000, 0x824003, FUNC(asic65_data_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x824000, 0x824003, FUNC(asic65_r)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x825000, 0x825001, FUNC(asic65_io_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x824000, 0x824003, FUNC(asic65_data_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x824000, 0x824003, FUNC(asic65_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x825000, 0x825001, FUNC(asic65_io_r)); /* install ASIC61 */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x827000, 0x8277ff, FUNC(hd68k_dsk_dsp32_r), FUNC(hd68k_dsk_dsp32_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x827000, 0x8277ff, FUNC(hd68k_dsk_dsp32_r), FUNC(hd68k_dsk_dsp32_w)); /* install control registers */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x827800, 0x82781f, FUNC(hd68k_dsk_control_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x827800, 0x82781f, FUNC(hd68k_dsk_control_w)); /* install extra RAM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x880000, 0x8bffff, FUNC(hd68k_dsk_ram_r), FUNC(hd68k_dsk_ram_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x880000, 0x8bffff, FUNC(hd68k_dsk_ram_r), FUNC(hd68k_dsk_ram_w)); state->m_dsk_ram = (UINT16 *)(usr3 + 0x100000); /* install extra ROM */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x900000, 0x9fffff, FUNC(hd68k_dsk_rom_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x900000, 0x9fffff, FUNC(hd68k_dsk_rom_r)); state->m_dsk_rom = (UINT16 *)(usr3 + 0x000000); /* set up the ASIC65 */ @@ -4195,15 +4195,15 @@ static void init_dspcom(running_machine &machine) harddriv_state *state = machine.driver_data(); /* install ASIC65 */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x900000, 0x900003, FUNC(asic65_data_w)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x900000, 0x900003, FUNC(asic65_r)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x901000, 0x910001, FUNC(asic65_io_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x900000, 0x900003, FUNC(asic65_data_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x900000, 0x900003, FUNC(asic65_r)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x901000, 0x910001, FUNC(asic65_io_r)); /* set up the ASIC65 */ asic65_config(machine, ASIC65_STEELTAL); /* install DSPCOM control */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x904000, 0x90401f, FUNC(hddspcom_control_w)); + state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x904000, 0x90401f, FUNC(hddspcom_control_w)); } @@ -4215,9 +4215,9 @@ static void init_driver_sound(running_machine &machine) hdsnd_init(machine); /* install sound handlers */ - state->m_maincpu->memory().space(AS_PROGRAM)->install_readwrite_handler(0x840000, 0x840001, read16_delegate(FUNC(harddriv_state::hd68k_snd_data_r),state), write16_delegate(FUNC(harddriv_state::hd68k_snd_data_w),state)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x844000, 0x844001, read16_delegate(FUNC(harddriv_state::hd68k_snd_status_r),state)); - state->m_maincpu->memory().space(AS_PROGRAM)->install_write_handler(0x84c000, 0x84c001, write16_delegate(FUNC(harddriv_state::hd68k_snd_reset_w),state)); + state->m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x840000, 0x840001, read16_delegate(FUNC(harddriv_state::hd68k_snd_data_r),state), write16_delegate(FUNC(harddriv_state::hd68k_snd_data_w),state)); + state->m_maincpu->space(AS_PROGRAM)->install_read_handler(0x844000, 0x844001, read16_delegate(FUNC(harddriv_state::hd68k_snd_status_r),state)); + state->m_maincpu->space(AS_PROGRAM)->install_write_handler(0x84c000, 0x84c001, write16_delegate(FUNC(harddriv_state::hd68k_snd_reset_w),state)); } @@ -4238,18 +4238,18 @@ DRIVER_INIT_MEMBER(harddriv_state,harddriv) init_driver_sound(machine()); /* set up gsp speedup handler */ - m_gsp_speedup_addr[0] = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w)); - m_gsp_speedup_addr[1] = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w)); - m_gsp->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r)); + m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w)); + m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w)); + m_gsp->space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r)); m_gsp_speedup_pc = 0xffc00f10; /* set up msp speedup handler */ - m_msp_speedup_addr = m_msp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_w)); - m_msp->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_r)); + m_msp_speedup_addr = m_msp->space(AS_PROGRAM)->install_legacy_write_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_w)); + m_msp->space(AS_PROGRAM)->install_legacy_read_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_r)); m_msp_speedup_pc = 0x00723b00; /* set up adsp speedup handlers */ - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); } @@ -4262,18 +4262,18 @@ DRIVER_INIT_MEMBER(harddriv_state,harddrivc) init_driver_sound(machine()); /* set up gsp speedup handler */ - m_gsp_speedup_addr[0] = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w)); - m_gsp_speedup_addr[1] = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w)); - m_gsp->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r)); + m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w)); + m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w)); + m_gsp->space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r)); m_gsp_speedup_pc = 0xfff40ff0; /* set up msp speedup handler */ - m_msp_speedup_addr = m_msp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_w)); - m_msp->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_r)); + m_msp_speedup_addr = m_msp->space(AS_PROGRAM)->install_legacy_write_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_w)); + m_msp->space(AS_PROGRAM)->install_legacy_read_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_r)); m_msp_speedup_pc = 0x00723b00; /* set up adsp speedup handlers */ - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); } @@ -4286,13 +4286,13 @@ DRIVER_INIT_MEMBER(harddriv_state,stunrun) atarijsa_init(machine(), "IN0", 0x0020); /* set up gsp speedup handler */ - m_gsp_speedup_addr[0] = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w)); - m_gsp_speedup_addr[1] = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w)); - m_gsp->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r)); + m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w)); + m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w)); + m_gsp->space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r)); m_gsp_speedup_pc = 0xfff41070; /* set up adsp speedup handlers */ - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); } @@ -4307,14 +4307,14 @@ DRIVER_INIT_MEMBER(harddriv_state,racedriv) /* set up the slapstic */ slapstic_init(machine(), 117); - m_m68k_slapstic_base = m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w)); + m_m68k_slapstic_base = m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w)); /* synchronization */ - m_rddsp32_sync[0] = m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w)); - m_rddsp32_sync[1] = m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w)); + m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w)); + m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w)); /* set up adsp speedup handlers */ - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); } @@ -4330,22 +4330,22 @@ static void racedrivc_init_common(running_machine &machine, offs_t gsp_protectio /* set up the slapstic */ slapstic_init(machine, 117); - state->m_m68k_slapstic_base = state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w)); + state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w)); /* synchronization */ - state->m_rddsp32_sync[0] = state->m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w)); - state->m_rddsp32_sync[1] = state->m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w)); + state->m_rddsp32_sync[0] = state->m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w)); + state->m_rddsp32_sync[1] = state->m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w)); /* set up protection hacks */ - state->m_gsp_protection = state->m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(gsp_protection, gsp_protection + 0x0f, FUNC(hdgsp_protection_w)); + state->m_gsp_protection = state->m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(gsp_protection, gsp_protection + 0x0f, FUNC(hdgsp_protection_w)); /* set up gsp speedup handler */ - state->m_gsp_speedup_addr[0] = state->m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff76f60, 0xfff76f6f, FUNC(rdgsp_speedup1_w)); - state->m_gsp->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xfff76f60, 0xfff76f6f, FUNC(rdgsp_speedup1_r)); + state->m_gsp_speedup_addr[0] = state->m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff76f60, 0xfff76f6f, FUNC(rdgsp_speedup1_w)); + state->m_gsp->space(AS_PROGRAM)->install_legacy_read_handler(0xfff76f60, 0xfff76f6f, FUNC(rdgsp_speedup1_r)); state->m_gsp_speedup_pc = 0xfff43a00; /* set up adsp speedup handlers */ - state->m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + state->m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); } DRIVER_INIT_MEMBER(harddriv_state,racedrivc) { racedrivc_init_common(machine(), 0xfff95cd0); } @@ -4357,8 +4357,8 @@ DRIVER_INIT_MEMBER(harddriv_state,racedrivb1) /* this unpleasantness prevents racedrivb1 and racedrivg1 from crashing MAME during boot */ /* both clear the DSP32C's RAM and then release it from reset, causing it to run through */ /* its address space recursively executing instructions */ - m_dsp32->memory().space(AS_PROGRAM)->install_read_handler(0x002000, 0x5fffff, read32_delegate(FUNC(harddriv_state::rddsp_unmap_r),this)); - m_dsp32->memory().space(AS_PROGRAM)->install_read_handler(0x640000, 0xfff7ff, read32_delegate(FUNC(harddriv_state::rddsp_unmap_r),this)); + m_dsp32->space(AS_PROGRAM)->install_read_handler(0x002000, 0x5fffff, read32_delegate(FUNC(harddriv_state::rddsp_unmap_r),this)); + m_dsp32->space(AS_PROGRAM)->install_read_handler(0x640000, 0xfff7ff, read32_delegate(FUNC(harddriv_state::rddsp_unmap_r),this)); DRIVER_INIT_CALL(racedriv); } @@ -4385,23 +4385,23 @@ static void steeltal_init_common(running_machine &machine, offs_t ds3_transfer_p init_dspcom(machine); atarijsa_init(machine, "IN0", 0x0020); - state->m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x908000, 0x908001, read16_delegate(FUNC(harddriv_state::steeltal_dummy_r),state)); + state->m_maincpu->space(AS_PROGRAM)->install_read_handler(0x908000, 0x908001, read16_delegate(FUNC(harddriv_state::steeltal_dummy_r),state)); /* set up the SLOOP */ if (!proto_sloop) { - state->m_m68k_slapstic_base = state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(st68k_sloop_r), FUNC(st68k_sloop_w)); - state->m_m68k_sloop_alt_base = state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4e000, 0x4ffff, FUNC(st68k_sloop_alt_r)); + state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(st68k_sloop_r), FUNC(st68k_sloop_w)); + state->m_m68k_sloop_alt_base = state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x4e000, 0x4ffff, FUNC(st68k_sloop_alt_r)); } else - state->m_m68k_slapstic_base = state->m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(st68k_protosloop_r), FUNC(st68k_protosloop_w)); + state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(st68k_protosloop_r), FUNC(st68k_protosloop_w)); /* set up protection hacks */ - state->m_gsp_protection = state->m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff965d0, 0xfff965df, FUNC(hdgsp_protection_w)); + state->m_gsp_protection = state->m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff965d0, 0xfff965df, FUNC(hdgsp_protection_w)); /* set up adsp speedup handlers */ - state->m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); - state->m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r)); + state->m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + state->m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r)); state->m_ds3_speedup_addr = &state->m_adsp_data_memory[0x1f99]; state->m_ds3_speedup_pc = 0xff; state->m_ds3_transfer_pc = ds3_transfer_pc; @@ -4423,20 +4423,20 @@ DRIVER_INIT_MEMBER(harddriv_state,strtdriv) /* set up the slapstic */ slapstic_init(machine(), 117); - m_m68k_slapstic_base = m_maincpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w)); + m_m68k_slapstic_base = m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w)); - m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r)); + m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r)); /* synchronization */ - m_rddsp32_sync[0] = m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w)); - m_rddsp32_sync[1] = m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w)); + m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w)); + m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w)); /* set up protection hacks */ - m_gsp_protection = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff960a0, 0xfff960af, FUNC(hdgsp_protection_w)); + m_gsp_protection = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff960a0, 0xfff960af, FUNC(hdgsp_protection_w)); /* set up adsp speedup handlers */ - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r)); m_ds3_speedup_addr = &m_adsp_data_memory[0x1f99]; m_ds3_speedup_pc = 0xff; m_ds3_transfer_pc = 0x43672; @@ -4451,18 +4451,18 @@ DRIVER_INIT_MEMBER(harddriv_state,hdrivair) init_ds3(machine()); init_dsk2(machine()); - m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r)); + m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r)); /* synchronization */ - m_rddsp32_sync[0] = m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x21fe00, 0x21fe03, FUNC(rddsp32_sync0_w)); - m_rddsp32_sync[1] = m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x21ff00, 0x21ff03, FUNC(rddsp32_sync1_w)); + m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x21fe00, 0x21fe03, FUNC(rddsp32_sync0_w)); + m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x21ff00, 0x21ff03, FUNC(rddsp32_sync1_w)); /* set up protection hacks */ - m_gsp_protection = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff943f0, 0xfff943ff, FUNC(hdgsp_protection_w)); + m_gsp_protection = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff943f0, 0xfff943ff, FUNC(hdgsp_protection_w)); /* set up adsp speedup handlers */ - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r)); m_ds3_speedup_addr = &m_adsp_data_memory[0x1f99]; m_ds3_speedup_pc = 0x2da; m_ds3_transfer_pc = 0x407b8; @@ -4477,18 +4477,18 @@ DRIVER_INIT_MEMBER(harddriv_state,hdrivairp) init_ds3(machine()); init_dsk2(machine()); - m_maincpu->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r)); + m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r)); /* synchronization */ - m_rddsp32_sync[0] = m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x21fe00, 0x21fe03, FUNC(rddsp32_sync0_w)); - m_rddsp32_sync[1] = m_dsp32->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x21ff00, 0x21ff03, FUNC(rddsp32_sync1_w)); + m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x21fe00, 0x21fe03, FUNC(rddsp32_sync0_w)); + m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x21ff00, 0x21ff03, FUNC(rddsp32_sync1_w)); /* set up protection hacks */ - m_gsp_protection = m_gsp->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff916c0, 0xfff916cf, FUNC(hdgsp_protection_w)); + m_gsp_protection = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff916c0, 0xfff916cf, FUNC(hdgsp_protection_w)); /* set up adsp speedup handlers */ - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); - m_adsp->memory().space(AS_DATA)->install_legacy_read_handler(0x1f9a, 0x1f9a, FUNC(hdds3_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r)); + m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1f9a, 0x1f9a, FUNC(hdds3_speedup_r)); m_ds3_speedup_addr = &m_adsp_data_memory[0x1f9a]; m_ds3_speedup_pc = 0x2d9; m_ds3_transfer_pc = 0X407da; diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 13a77631357..70e630a4271 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -3399,7 +3399,7 @@ static MACHINE_RESET( lhzb2a ) { igs017_state *state = machine.driver_data(); MACHINE_RESET_CALL( mgcs ); - state->lhzb2a_input_addr_w(*state->m_maincpu->memory().space(AS_PROGRAM), 0, 0xf0); + state->lhzb2a_input_addr_w(*state->m_maincpu->space(AS_PROGRAM), 0, 0xf0); } static MACHINE_CONFIG_START( lhzb2a, igs017_state ) diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c index 7684f5b9a51..72ba6adc2c5 100644 --- a/src/mame/drivers/magictg.c +++ b/src/mame/drivers/magictg.c @@ -761,9 +761,9 @@ WRITE16_MEMBER( magictg_state::adsp_control_w ) UINT32 src_addr = (page << 14) | m_adsp_regs.bdma_external_addr; if (type == 0) - addr_space = m_adsp->memory().space(AS_PROGRAM); + addr_space = m_adsp->space(AS_PROGRAM); else - addr_space = m_adsp->memory().space(AS_DATA); + addr_space = m_adsp->space(AS_DATA); if (dir == 0) { diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index fb5fa2fe821..3adb3465130 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -133,7 +133,7 @@ READ16_MEMBER(metro_state::metro_irq_cause_r) static void update_irq_state( running_machine &machine ) { metro_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); /* Get the pending IRQs (only the enabled ones, e.g. where irq_enable is *0*) */ UINT16 irq = state->metro_irq_cause_r(*space, 0, 0xffff) & ~*state->m_irq_enable; @@ -266,7 +266,7 @@ static void ymf278b_interrupt( device_t *device, int active ) static int metro_io_callback( device_t *device, int ioline, int state ) { metro_state *driver_state = device->machine().driver_data(); - address_space *space = driver_state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = driver_state->m_maincpu->space(AS_PROGRAM); UINT8 data = 0; switch (ioline) diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c index 55d1224ea55..64f127c3d42 100644 --- a/src/mame/drivers/midqslvr.c +++ b/src/mame/drivers/midqslvr.c @@ -251,7 +251,7 @@ static void intel82439tx_pci_w(device_t *busdevice, device_t *device, int functi static UINT8 piix4_config_r(device_t *busdevice, device_t *device, int function, int reg) { - address_space *space = busdevice->machine().firstcpu->memory().space( AS_PROGRAM ); + address_space *space = busdevice->machine().firstcpu->space( AS_PROGRAM ); midqslvr_state *state = busdevice->machine().driver_data(); function &= 3; diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index e9699ec8f59..722548aa5de 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -872,8 +872,8 @@ static void supergm3_set_bank(running_machine &machine) state->m_supergm3_chr_bank == 0x40 ) { // VRAM - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "bank1"); - ppu->memory().space(AS_PROGRAM)->install_write_bank(0x0000, 0x1fff, "bank1"); + ppu->space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "bank1"); + ppu->space(AS_PROGRAM)->install_write_bank(0x0000, 0x1fff, "bank1"); state->membank("bank1")->set_base(state->m_vram); if (state->m_supergm3_chr_bank == 0x40) @@ -881,15 +881,15 @@ static void supergm3_set_bank(running_machine &machine) } else { - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x03ff, "bank2"); - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x0400, 0x07ff, "bank3"); - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x0800, 0x0bff, "bank4"); - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x0c00, 0x0fff, "bank5"); - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x1000, 0x13ff, "bank6"); - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x1400, 0x17ff, "bank7"); - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x1800, 0x1bff, "bank8"); - ppu->memory().space(AS_PROGRAM)->install_read_bank(0x1c00, 0x1fff, "bank9"); - ppu->memory().space(AS_PROGRAM)->unmap_write(0x0000, 0x1fff); + ppu->space(AS_PROGRAM)->install_read_bank(0x0000, 0x03ff, "bank2"); + ppu->space(AS_PROGRAM)->install_read_bank(0x0400, 0x07ff, "bank3"); + ppu->space(AS_PROGRAM)->install_read_bank(0x0800, 0x0bff, "bank4"); + ppu->space(AS_PROGRAM)->install_read_bank(0x0c00, 0x0fff, "bank5"); + ppu->space(AS_PROGRAM)->install_read_bank(0x1000, 0x13ff, "bank6"); + ppu->space(AS_PROGRAM)->install_read_bank(0x1400, 0x17ff, "bank7"); + ppu->space(AS_PROGRAM)->install_read_bank(0x1800, 0x1bff, "bank8"); + ppu->space(AS_PROGRAM)->install_read_bank(0x1c00, 0x1fff, "bank9"); + ppu->space(AS_PROGRAM)->unmap_write(0x0000, 0x1fff); set_videorom_bank(machine, 0, 8, 0, 8); } diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index 638ed0e6bc1..e844ff2946e 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -2691,7 +2691,7 @@ READ8_MEMBER(namcos22_state::propcycle_mcu_adc_r) int i; for (i = 0; i < 16; i++) { - generic_pulse_irq_line(m_mcu->execute(), M37710_LINE_TIMERA3TICK, 1); + generic_pulse_irq_line(*m_mcu, M37710_LINE_TIMERA3TICK, 1); } } @@ -5448,7 +5448,7 @@ static void install_c74_speedup(running_machine &machine) { namcos22_state *state = machine.driver_data(); if (MCU_SPEEDUP) - state->m_mcu->memory().space(AS_PROGRAM)->install_readwrite_handler(0x80, 0x81, read16_delegate(FUNC(namcos22_state::mcuc74_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state)); + state->m_mcu->space(AS_PROGRAM)->install_readwrite_handler(0x80, 0x81, read16_delegate(FUNC(namcos22_state::mcuc74_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state)); } static void install_130_speedup(running_machine &machine) @@ -5456,7 +5456,7 @@ static void install_130_speedup(running_machine &machine) namcos22_state *state = machine.driver_data(); // install speedup cheat for 1.30 MCU BIOS if (MCU_SPEEDUP) - state->m_mcu->memory().space(AS_PROGRAM)->install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos22_state::mcu130_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state)); + state->m_mcu->space(AS_PROGRAM)->install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos22_state::mcu130_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state)); } static void install_141_speedup(running_machine &machine) @@ -5464,7 +5464,7 @@ static void install_141_speedup(running_machine &machine) namcos22_state *state = machine.driver_data(); // install speedup cheat for 1.41 MCU BIOS if (MCU_SPEEDUP) - state->m_mcu->memory().space(AS_PROGRAM)->install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos22_state::mcu141_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state)); + state->m_mcu->space(AS_PROGRAM)->install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos22_state::mcu141_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state)); } static void namcos22_init( running_machine &machine, int game_type ) @@ -5487,8 +5487,8 @@ static void alpine_init_common( running_machine &machine, int game_type ) namcos22_state *state = machine.driver_data(); namcos22_init(machine, game_type); - state->m_mcu->memory().space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::alpineracer_mcu_adc_r),state)); - state->m_mcu->memory().space(AS_IO)->install_write_handler(M37710_PORT5, M37710_PORT5, write8_delegate(FUNC(namcos22_state::alpine_mcu_port5_w),state)); + state->m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::alpineracer_mcu_adc_r),state)); + state->m_mcu->space(AS_IO)->install_write_handler(M37710_PORT5, M37710_PORT5, write8_delegate(FUNC(namcos22_state::alpine_mcu_port5_w),state)); state->m_motor_timer = machine.scheduler().timer_alloc(FUNC(alpine_steplock_callback)); state->m_motor_timer->reset(); @@ -5517,8 +5517,8 @@ DRIVER_INIT_MEMBER(namcos22_state,alpinesa) { alpine_init_common(machine(), NAMCOS22_ALPINE_SURFER); - m_maincpu->memory().space(AS_PROGRAM)->install_read_handler (0x200000, 0x200003, read32_delegate(FUNC(namcos22_state::alpinesa_prot_r),this)); - m_maincpu->memory().space(AS_PROGRAM)->install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(namcos22_state::alpinesa_prot_w),this)); + m_maincpu->space(AS_PROGRAM)->install_read_handler (0x200000, 0x200003, read32_delegate(FUNC(namcos22_state::alpinesa_prot_r),this)); + m_maincpu->space(AS_PROGRAM)->install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(namcos22_state::alpinesa_prot_w),this)); install_141_speedup(machine()); m_keycus_id = 0x01a9; @@ -5529,7 +5529,7 @@ DRIVER_INIT_MEMBER(namcos22_state,airco22) namcos22_init(machine(), NAMCOS22_AIR_COMBAT22); // S22-BIOS ver1.20 namco all rights reserved 94/12/21 - m_mcu->memory().space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::airco22_mcu_adc_r),this)); + m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::airco22_mcu_adc_r),this)); } DRIVER_INIT_MEMBER(namcos22_state,propcycl) @@ -5552,8 +5552,8 @@ DRIVER_INIT_MEMBER(namcos22_state,propcycl) // pROM[0x22296/4] |= 0x00004e75; namcos22_init(machine(), NAMCOS22_PROP_CYCLE); - m_mcu->memory().space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::propcycle_mcu_adc_r),this)); - m_mcu->memory().space(AS_IO)->install_write_handler(M37710_PORT5, M37710_PORT5, write8_delegate(FUNC(namcos22_state::propcycle_mcu_port5_w),this)); + m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::propcycle_mcu_adc_r),this)); + m_mcu->space(AS_IO)->install_write_handler(M37710_PORT5, M37710_PORT5, write8_delegate(FUNC(namcos22_state::propcycle_mcu_port5_w),this)); install_141_speedup(machine()); } @@ -5613,7 +5613,7 @@ DRIVER_INIT_MEMBER(namcos22_state,cybrcyc) { namcos22_init(machine(), NAMCOS22_CYBER_CYCLES); - m_mcu->memory().space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::cybrcycc_mcu_adc_r),this)); + m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::cybrcycc_mcu_adc_r),this)); install_130_speedup(machine()); m_keycus_id = 0x0387; @@ -5630,7 +5630,7 @@ DRIVER_INIT_MEMBER(namcos22_state,tokyowar) { namcos22_init(machine(), NAMCOS22_TOKYO_WARS); - m_mcu->memory().space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::tokyowar_mcu_adc_r),this)); + m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::tokyowar_mcu_adc_r),this)); install_141_speedup(machine()); m_keycus_id = 0x01a8; @@ -5639,7 +5639,7 @@ DRIVER_INIT_MEMBER(namcos22_state,tokyowar) DRIVER_INIT_MEMBER(namcos22_state,aquajet) { namcos22_init(machine(), NAMCOS22_AQUA_JET); - m_mcu->memory().space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::aquajet_mcu_adc_r),this)); + m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::aquajet_mcu_adc_r),this)); install_141_speedup(machine()); } @@ -5647,7 +5647,7 @@ DRIVER_INIT_MEMBER(namcos22_state,dirtdash) { namcos22_init(machine(), NAMCOS22_DIRT_DASH); - m_mcu->memory().space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::cybrcycc_mcu_adc_r),this)); + m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::cybrcycc_mcu_adc_r),this)); install_141_speedup(machine()); m_keycus_id = 0x01a2; diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index b56cd429d16..f130e1e0dc9 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -389,7 +389,7 @@ static MACHINE_RESET( mschamp ) static MACHINE_RESET( superabc ) { pacman_state *state = machine.driver_data(); - state->superabc_bank_w(*state->m_maincpu->memory().space(AS_PROGRAM), 0, 0); + state->superabc_bank_w(*state->m_maincpu->space(AS_PROGRAM), 0, 0); } @@ -5745,7 +5745,7 @@ ROM_END static void maketrax_rom_decode(running_machine &machine) { pacman_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000); UINT8 *rom = machine.root_device().memregion("maincpu")->base(); @@ -5769,8 +5769,8 @@ static void maketrax_rom_decode(running_machine &machine) DRIVER_INIT_MEMBER(pacman_state,maketrax) { /* set up protection handlers */ - m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x5080, 0x50bf, read8_delegate(FUNC(pacman_state::maketrax_special_port2_r),this)); - m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x50c0, 0x50ff, read8_delegate(FUNC(pacman_state::maketrax_special_port3_r),this)); + m_maincpu->space(AS_PROGRAM)->install_read_handler(0x5080, 0x50bf, read8_delegate(FUNC(pacman_state::maketrax_special_port2_r),this)); + m_maincpu->space(AS_PROGRAM)->install_read_handler(0x50c0, 0x50ff, read8_delegate(FUNC(pacman_state::maketrax_special_port3_r),this)); maketrax_rom_decode(machine()); } @@ -5778,7 +5778,7 @@ DRIVER_INIT_MEMBER(pacman_state,maketrax) static void korosuke_rom_decode(running_machine &machine) { pacman_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000); UINT8 *rom = machine.root_device().memregion("maincpu")->base(); @@ -5802,8 +5802,8 @@ static void korosuke_rom_decode(running_machine &machine) DRIVER_INIT_MEMBER(pacman_state,korosuke) { /* set up protection handlers */ - m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x5080, 0x5080, read8_delegate(FUNC(pacman_state::korosuke_special_port2_r),this)); - m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x50c0, 0x50ff, read8_delegate(FUNC(pacman_state::korosuke_special_port3_r),this)); + m_maincpu->space(AS_PROGRAM)->install_read_handler(0x5080, 0x5080, read8_delegate(FUNC(pacman_state::korosuke_special_port2_r),this)); + m_maincpu->space(AS_PROGRAM)->install_read_handler(0x50c0, 0x50ff, read8_delegate(FUNC(pacman_state::korosuke_special_port3_r),this)); korosuke_rom_decode(machine()); } @@ -6105,7 +6105,7 @@ READ8_MEMBER(pacman_state::mspacii_protection_r) DRIVER_INIT_MEMBER(pacman_state,mspacii) { // protection - m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x504d, 0x506f, read8_delegate(FUNC(pacman_state::mspacii_protection_r), this)); + m_maincpu->space(AS_PROGRAM)->install_read_handler(0x504d, 0x506f, read8_delegate(FUNC(pacman_state::mspacii_protection_r), this)); } DRIVER_INIT_MEMBER(pacman_state,superabc) @@ -6166,10 +6166,10 @@ DRIVER_INIT_MEMBER(pacman_state,cannonbp) { /* extra memory */ - m_maincpu->memory().space(AS_PROGRAM)->install_ram(0x4800, 0x4bff); + m_maincpu->space(AS_PROGRAM)->install_ram(0x4800, 0x4bff); /* protection? */ - m_maincpu->memory().space(AS_PROGRAM)->install_read_handler(0x3000, 0x3fff, read8_delegate(FUNC(pacman_state::cannonbp_protection_r),this)); + m_maincpu->space(AS_PROGRAM)->install_read_handler(0x3000, 0x3fff, read8_delegate(FUNC(pacman_state::cannonbp_protection_r),this)); } diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index 630d2b02055..020802e1ed6 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -323,7 +323,7 @@ INPUT_CHANGED_MEMBER(pntnpuzl_state::coin_inserted) /* TODO: change this! */ if(newval) - generic_pulse_irq_line(m_maincpu->execute(), (UINT8)(FPTR)param, 1); + generic_pulse_irq_line(*m_maincpu, (UINT8)(FPTR)param, 1); } static INPUT_PORTS_START( pntnpuzl ) diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index 379e82cca1d..96d0a0792ec 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -511,8 +511,8 @@ void ridleofp_state::driver_start() { systeme_state::driver_start(); - m_maincpu->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(systeme_state::ridleofp_port_f8_read), this)); - m_maincpu->memory().space(AS_IO)->install_write_handler(0xfa, 0xfa, write8_delegate(FUNC(systeme_state::ridleofp_port_fa_write), this)); + m_maincpu->space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(systeme_state::ridleofp_port_f8_read), this)); + m_maincpu->space(AS_IO)->install_write_handler(0xfa, 0xfa, write8_delegate(FUNC(systeme_state::ridleofp_port_fa_write), this)); } @@ -520,8 +520,8 @@ void hangonjr_state::driver_start() { systeme_state::driver_start(); - m_maincpu->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(systeme_state::hangonjr_port_f8_read), this)); - m_maincpu->memory().space(AS_IO)->install_write_handler(0xfa, 0xfa, write8_delegate(FUNC(systeme_state::hangonjr_port_fa_write), this)); + m_maincpu->space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(systeme_state::hangonjr_port_f8_read), this)); + m_maincpu->space(AS_IO)->install_write_handler(0xfa, 0xfa, write8_delegate(FUNC(systeme_state::hangonjr_port_fa_write), this)); } diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 3efe257e484..abf3347195f 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -135,7 +135,7 @@ static TIMER_CALLBACK( snes_reset_oam_address ) { snes_state *state = machine.driver_data(); // make sure we're in the 65816's context since we're messing with the OAM and stuff - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); if (!(snes_ppu.screen_disabled)) //Reset OAM address, byuu says it happens at H=10 { @@ -148,14 +148,14 @@ static TIMER_CALLBACK( snes_reset_oam_address ) static TIMER_CALLBACK( snes_reset_hdma ) { snes_state *state = machine.driver_data(); - address_space *cpu0space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *cpu0space = state->m_maincpu->space(AS_PROGRAM); snes_hdma_init(cpu0space); } static TIMER_CALLBACK( snes_update_io ) { snes_state *state = machine.driver_data(); - address_space *cpu0space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *cpu0space = state->m_maincpu->space(AS_PROGRAM); state->m_io_read(cpu0space->machine()); snes_ram[HVBJOY] &= 0xfe; /* Clear busy bit */ @@ -233,7 +233,7 @@ static TIMER_CALLBACK( snes_scanline_tick ) // hdma reset happens at scanline 0, H=~6 if (snes_ppu.beam.current_vert == 0) { - address_space *cpu0space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *cpu0space = state->m_maincpu->space(AS_PROGRAM); snes_hdma_init(cpu0space); } @@ -257,7 +257,7 @@ static TIMER_CALLBACK( snes_scanline_tick ) static TIMER_CALLBACK( snes_hblank_tick ) { snes_state *state = machine.driver_data(); - address_space *cpu0space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *cpu0space = state->m_maincpu->space(AS_PROGRAM); int nextscan; snes_ppu.beam.current_vert = machine.primary_screen->vpos(); diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index b143d21996d..1e8ed3a866b 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -2818,7 +2818,7 @@ SCREEN_UPDATE_RGB32( namcos22s ) FILE *f = fopen( "dump.txt", "wb" ); if( f ) { - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); if (1) // czram { @@ -2883,7 +2883,7 @@ SCREEN_UPDATE_RGB32( namcos22 ) FILE *f = fopen( "dump.txt", "wb" ); if( f ) { - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); //Dump(space, f,0x90000000, 0x90000003, "led?" ); Dump(space, f,0x90010000, 0x90017fff, "cz_ram"); diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c index a5e00b7268e..5d4045731e3 100644 --- a/src/mess/drivers/a5105.c +++ b/src/mess/drivers/a5105.c @@ -220,7 +220,7 @@ READ8_MEMBER( a5105_state::a5105_memsel_r ) WRITE8_MEMBER( a5105_state::a5105_memsel_w ) { - address_space *prog = m_maincpu->memory().space( AS_PROGRAM ); + address_space *prog = m_maincpu->space( AS_PROGRAM ); if (m_memsel[0] != ((data & 0x03) >> 0)) { @@ -455,7 +455,7 @@ INPUT_PORTS_END MACHINE_RESET_MEMBER(a5105_state) { - address_space *space = m_maincpu->memory().space(AS_PROGRAM); + address_space *space = m_maincpu->space(AS_PROGRAM); a5105_ab_w(*space, 0, 9); // turn motor off beep_set_frequency(m_beep, 500); diff --git a/src/mess/drivers/a7000.c b/src/mess/drivers/a7000.c index 63b52c3879a..d2676e64d58 100644 --- a/src/mess/drivers/a7000.c +++ b/src/mess/drivers/a7000.c @@ -604,7 +604,7 @@ static TIMER_CALLBACK( flyback_timer_callback ) void a7000_state::viddma_transfer_start() { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); UINT32 src = m_viddma_addr_start; UINT32 dst = 0; UINT32 size = m_viddma_addr_end; diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c index 32d2436ea2a..c78a4b14e02 100644 --- a/src/mess/drivers/abc1600.c +++ b/src/mess/drivers/abc1600.c @@ -182,7 +182,7 @@ UINT8 abc1600_state::read_ram(offs_t offset) else if (offset < 0x180000) { // video RAM - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); data = video_ram_r(*program, offset); } else @@ -209,7 +209,7 @@ void abc1600_state::write_ram(offs_t offset, UINT8 data) else if (offset < 0x180000) { // video RAM - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); video_ram_w(*program, offset, data); } else @@ -242,7 +242,7 @@ UINT8 abc1600_state::read_io(offs_t offset) UINT8 abc1600_state::read_internal_io(offs_t offset) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 data = 0; if (X11) @@ -467,7 +467,7 @@ void abc1600_state::write_io(offs_t offset, UINT8 data) void abc1600_state::write_internal_io(offs_t offset, UINT8 data) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); if (X11) { @@ -770,7 +770,7 @@ void abc1600_state::write_user_memory(offs_t offset, UINT8 data) UINT8 abc1600_state::read_supervisor_memory(offs_t offset) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 data = 0; if (!A2 && !A1) @@ -799,7 +799,7 @@ UINT8 abc1600_state::read_supervisor_memory(offs_t offset) void abc1600_state::write_supervisor_memory(offs_t offset, UINT8 data) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); if (!A2 && !A1) { @@ -1879,7 +1879,7 @@ void abc1600_state::machine_start() void abc1600_state::machine_reset() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); // clear special control register for (int i = 0; i < 8; i++) diff --git a/src/mess/drivers/abc80x.c b/src/mess/drivers/abc80x.c index b3310f85281..f74b5311316 100644 --- a/src/mess/drivers/abc80x.c +++ b/src/mess/drivers/abc80x.c @@ -192,7 +192,7 @@ READ8_MEMBER( abc802_state::pling_r ) void abc800_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); if (m_fetch_charram) { @@ -213,7 +213,7 @@ void abc800_state::bankswitch() void abc802_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); if (m_lrs) { @@ -235,7 +235,7 @@ void abc802_state::bankswitch() void abc806_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT32 videoram_mask = m_ram->size() - (32 * 1024) - 1; int bank; char bank_name[10]; diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c index e32dead7a8b..3335d4186a5 100644 --- a/src/mess/drivers/ace.c +++ b/src/mess/drivers/ace.c @@ -590,7 +590,7 @@ static Z80PIO_INTERFACE( pio_intf ) void ace_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* configure RAM */ switch (m_ram->size()) diff --git a/src/mess/drivers/adam.c b/src/mess/drivers/adam.c index b2b8bb6ee85..d71398dd4ff 100644 --- a/src/mess/drivers/adam.c +++ b/src/mess/drivers/adam.c @@ -245,7 +245,7 @@ enum void adam_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); switch (m_mioc & 0x03) diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 576fa5958e3..8dc79faa328 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -256,7 +256,7 @@ static const mc6845_interface apricot_mc6845_intf = DRIVER_INIT_MEMBER(apricot_state,apricot) { - address_space *prg = m_maincpu->memory().space(AS_PROGRAM); + address_space *prg = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); UINT32 ram_size = m_ram->size(); diff --git a/src/mess/drivers/apricotf.c b/src/mess/drivers/apricotf.c index 43689fda052..c2ecc565b79 100644 --- a/src/mess/drivers/apricotf.c +++ b/src/mess/drivers/apricotf.c @@ -32,7 +32,7 @@ UINT32 f1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int lines = m_200_256 ? 200 : 256; for (int y = 0; y < lines; y++) diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c index 9ba108021ef..08a83897d52 100644 --- a/src/mess/drivers/atarist.c +++ b/src/mess/drivers/atarist.c @@ -67,7 +67,7 @@ void st_state::flush_dma_fifo() if (m_fdc_fifo_empty[m_fdc_fifo_sel]) return; if (m_fdc_dmabytes) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); for (int i = 0; i < 8; i++) { UINT16 data = m_fdc_fifo[m_fdc_fifo_sel][i]; @@ -98,7 +98,7 @@ void st_state::flush_dma_fifo() void st_state::fill_dma_fifo() { if (m_fdc_dmabytes) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); for (int i = 0; i < 8; i++) { UINT16 data = program->read_word(m_dma_base); @@ -2142,7 +2142,7 @@ static IRQ_CALLBACK( atarist_int_ack ) void st_state::configure_memory() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); switch (m_ram->size()) { @@ -2292,7 +2292,7 @@ void megaste_state::machine_start() void stbook_state::machine_start() { /* configure RAM banking */ - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); switch (m_ram->size()) { diff --git a/src/mess/drivers/atom.c b/src/mess/drivers/atom.c index 7d1026cc05e..05a7ce15790 100644 --- a/src/mess/drivers/atom.c +++ b/src/mess/drivers/atom.c @@ -123,7 +123,7 @@ Hardware: PPIA 8255 void atom_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *eprom = memregion(EXTROM_TAG)->base() + (m_eprom << 12); @@ -648,7 +648,7 @@ void atom_state::machine_start() generator. I don't know if this is hardware, or random data because the ram chips are not cleared at start-up. So at this time, these numbers are poked into the memory to simulate it. When I have more details I will fix it */ - UINT8 *m_baseram = (UINT8 *)m_maincpu->memory().space(AS_PROGRAM)->get_write_ptr(0x0000); + UINT8 *m_baseram = (UINT8 *)m_maincpu->space(AS_PROGRAM)->get_write_ptr(0x0000); m_baseram[0x08] = machine().rand() & 0x0ff; m_baseram[0x09] = machine().rand() & 0x0ff; diff --git a/src/mess/drivers/avigo.c b/src/mess/drivers/avigo.c index 7b80929cefc..d8d5b07f454 100644 --- a/src/mess/drivers/avigo.c +++ b/src/mess/drivers/avigo.c @@ -158,7 +158,7 @@ static RP5C01_INTERFACE( rtc_intf ) void avigo_state::refresh_memory(UINT8 bank, UINT8 chip_select) { - address_space* space = m_maincpu->memory().space(AS_PROGRAM); + address_space* space = m_maincpu->space(AS_PROGRAM); int &active_flash = (bank == 1 ? m_flash_at_0x4000 : m_flash_at_0x8000); char bank_tag[6]; @@ -830,7 +830,7 @@ static TIMER_DEVICE_CALLBACK( avigo_1hz_timer ) static QUICKLOAD_LOAD(avigo) { avigo_state *state = image.device().machine().driver_data(); - address_space* flash1 = state->m_flashes[1]->memory().space(0); + address_space* flash1 = state->m_flashes[1]->space(0); const char *systemname = image.device().machine().system().name; UINT32 first_app_page = (0x50000>>14); int app_page; diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c index 33eefd55694..a9a9b1cf0a5 100644 --- a/src/mess/drivers/bigbord2.c +++ b/src/mess/drivers/bigbord2.c @@ -415,7 +415,7 @@ static TIMER_DEVICE_CALLBACK( ctc_tick ) WRITE_LINE_MEMBER( bigbord2_state::frame ) { - address_space *space = m_maincpu->memory().space(AS_PROGRAM); + address_space *space = m_maincpu->space(AS_PROGRAM); static UINT8 framecnt; framecnt++; diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c index c4b9689ebad..8678c870ead 100644 --- a/src/mess/drivers/bml3.c +++ b/src/mess/drivers/bml3.c @@ -634,7 +634,7 @@ static MACHINE_START(bml3) void bml3_state::machine_reset() { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); /* defaults */ mem->install_rom(0xa000, 0xfeff,mem->machine().root_device().memregion("maincpu")->base() + 0xa000); @@ -698,7 +698,7 @@ const mc6843_interface bml3_6843_if = { NULL }; WRITE8_MEMBER(bml3_state::bml3_piaA_w) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); /* ROM banking: -0-- --0- 0xa000 - 0xbfff ROM R RAM W -1-- --0- 0xa000 - 0xbfff RAM R/W diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c index 0dc4f1e9cb4..87cf6aaccb9 100644 --- a/src/mess/drivers/bw12.c +++ b/src/mess/drivers/bw12.c @@ -51,7 +51,7 @@ void bw12_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); switch (m_bank) { diff --git a/src/mess/drivers/bw2.c b/src/mess/drivers/bw2.c index e724fe1e632..2802705d58b 100644 --- a/src/mess/drivers/bw2.c +++ b/src/mess/drivers/bw2.c @@ -51,7 +51,7 @@ void bw2_state::bankswitch(UINT8 data) */ - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int max_ram_bank = 0; @@ -133,7 +133,7 @@ void bw2_state::ramcard_bankswitch(UINT8 data) */ - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int max_ram_bank = BANK_RAM1; @@ -200,7 +200,7 @@ void bw2_state::ramcard_bankswitch(UINT8 data) WRITE8_MEMBER( bw2_state::ramcard_bank_w ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 ramcard_bank = data & 0x0f; UINT32 bank_offset = ramcard_bank * 0x8000; diff --git a/src/mess/drivers/c64.c b/src/mess/drivers/c64.c index 6b28a1f78f4..64f84cb65e9 100644 --- a/src/mess/drivers/c64.c +++ b/src/mess/drivers/c64.c @@ -849,12 +849,12 @@ static CBM_IEC_INTERFACE( iec_intf ) READ8_MEMBER( c64_state::exp_dma_r ) { - return m_maincpu->memory().space(AS_PROGRAM)->read_byte(offset); + return m_maincpu->space(AS_PROGRAM)->read_byte(offset); } WRITE8_MEMBER( c64_state::exp_dma_w ) { - m_maincpu->memory().space(AS_PROGRAM)->write_byte(offset, data); + m_maincpu->space(AS_PROGRAM)->write_byte(offset, data); } WRITE_LINE_MEMBER( c64_state::exp_irq_w ) diff --git a/src/mess/drivers/camplynx.c b/src/mess/drivers/camplynx.c index 3c44fbe841c..3c7fb755975 100644 --- a/src/mess/drivers/camplynx.c +++ b/src/mess/drivers/camplynx.c @@ -127,7 +127,7 @@ WRITE8_MEMBER( camplynx_state::lynx48k_bank_w ) WRITE8_MEMBER( camplynx_state::lynx128k_bank_w ) { /* get address space */ - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); UINT8 *base = mem->machine().root_device().memregion("maincpu")->base(); /* Set read banks */ @@ -328,7 +328,7 @@ INPUT_PORTS_END static MACHINE_RESET( lynx128k ) { camplynx_state *state = machine.driver_data(); - address_space *mem = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = state->m_maincpu->space(AS_PROGRAM); mem->install_read_bank (0x0000, 0x1fff, "bank1"); mem->install_read_bank (0x2000, 0x3fff, "bank2"); mem->install_read_bank (0x4000, 0x5fff, "bank3"); diff --git a/src/mess/drivers/cosmicos.c b/src/mess/drivers/cosmicos.c index fc303180b6b..b2a4f260050 100644 --- a/src/mess/drivers/cosmicos.c +++ b/src/mess/drivers/cosmicos.c @@ -252,7 +252,7 @@ INPUT_CHANGED_MEMBER( cosmicos_state::clear_data ) void cosmicos_state::set_ram_mode() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); if (m_ram_disable) @@ -486,7 +486,7 @@ static COSMAC_INTERFACE( cosmicos_config ) void cosmicos_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* initialize LED display */ m_led->rbi_w(1); diff --git a/src/mess/drivers/cxhumax.c b/src/mess/drivers/cxhumax.c index 5a42354d15f..f1466d540b5 100644 --- a/src/mess/drivers/cxhumax.c +++ b/src/mess/drivers/cxhumax.c @@ -154,7 +154,7 @@ READ32_MEMBER( cxhumax_state::cx_scratch_r ) //we're in disabled debug_printf unsigned char* buf = (unsigned char *)alloca(200); unsigned char temp; - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); memset(buf,0,200); diff --git a/src/mess/drivers/elf.c b/src/mess/drivers/elf.c index abb9660f85f..01690d9b360 100644 --- a/src/mess/drivers/elf.c +++ b/src/mess/drivers/elf.c @@ -236,7 +236,7 @@ static CDP1861_INTERFACE( elf2_cdp1861_intf ) void elf2_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* initialize LED displays */ m_led_l->rbi_w(1); diff --git a/src/mess/drivers/exp85.c b/src/mess/drivers/exp85.c index e10afb215c2..72209215bea 100644 --- a/src/mess/drivers/exp85.c +++ b/src/mess/drivers/exp85.c @@ -190,7 +190,7 @@ static const serial_terminal_interface terminal_intf = void exp85_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* setup memory banking */ program->install_read_bank(0x0000, 0x07ff, "bank1"); diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c index 383efcb2cc7..6ed747fe070 100644 --- a/src/mess/drivers/fk1.c +++ b/src/mess/drivers/fk1.c @@ -295,7 +295,7 @@ WRITE8_MEMBER( fk1_state::fk1_intr_w ) READ8_MEMBER( fk1_state::fk1_bank_ram_r ) { - address_space *space_mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *space_mem = m_maincpu->space(AS_PROGRAM); UINT8 *ram = machine().device(RAM_TAG)->pointer(); space_mem->install_write_bank(0x0000, 0x3fff, "bank1"); @@ -306,7 +306,7 @@ READ8_MEMBER( fk1_state::fk1_bank_ram_r ) READ8_MEMBER( fk1_state::fk1_bank_rom_r ) { - address_space *space_mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *space_mem = m_maincpu->space(AS_PROGRAM); space_mem->unmap_write(0x0000, 0x3fff); membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base()); membank("bank2")->set_base(machine().device(RAM_TAG)->pointer() + 0x10000); @@ -425,7 +425,7 @@ static TIMER_DEVICE_CALLBACK( vsync_callback ) MACHINE_RESET_MEMBER( fk1_state ) { - address_space *space = m_maincpu->memory().space(AS_PROGRAM); + address_space *space = m_maincpu->space(AS_PROGRAM); UINT8 *ram = machine().device(RAM_TAG)->pointer(); space->unmap_write(0x0000, 0x3fff); diff --git a/src/mess/drivers/fp1100.c b/src/mess/drivers/fp1100.c index 21206afa20b..6a69013e7e4 100644 --- a/src/mess/drivers/fp1100.c +++ b/src/mess/drivers/fp1100.c @@ -171,7 +171,7 @@ WRITE8_MEMBER( fp1100_state::irq_mask_w ) irq_mask = data; ///printf("%02x\n",data); // FIXME - the below 2 lines are needed, otherwise nothing ever gets written to videoram - address_space *mem = m_subcpu->memory().space(AS_PROGRAM); + address_space *mem = m_subcpu->space(AS_PROGRAM); data = mem->read_byte(0xe800); } diff --git a/src/mess/drivers/kyocera.c b/src/mess/drivers/kyocera.c index f23b8d5665d..ee073857016 100644 --- a/src/mess/drivers/kyocera.c +++ b/src/mess/drivers/kyocera.c @@ -104,7 +104,7 @@ READ8_MEMBER( pc8201_state::bank_r ) void pc8201_state::bankswitch(UINT8 data) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int rom_bank = data & 0x03; int ram_bank = (data >> 2) & 0x03; @@ -454,7 +454,7 @@ READ8_MEMBER( kc85_state::keyboard_r ) void tandy200_state::bankswitch(UINT8 data) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int rom_bank = data & 0x03; int ram_bank = (data >> 2) & 0x03; @@ -1127,7 +1127,7 @@ static const i8251_interface tandy200_uart_intf = void kc85_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* initialize RTC */ m_rtc->cs_w(1); @@ -1194,7 +1194,7 @@ void pc8201_state::machine_start() void trsm100_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* initialize RTC */ m_rtc->cs_w(1); diff --git a/src/mess/drivers/lc80.c b/src/mess/drivers/lc80.c index fa4f393769e..a2aaa185114 100644 --- a/src/mess/drivers/lc80.c +++ b/src/mess/drivers/lc80.c @@ -296,7 +296,7 @@ static const z80_daisy_config lc80_daisy_chain[] = void lc80_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* setup memory banking */ membank("bank1")->configure_entry(0, memregion(Z80_TAG)->base()); // TODO diff --git a/src/mess/drivers/m5.c b/src/mess/drivers/m5.c index d855bc5e448..795b0919174 100644 --- a/src/mess/drivers/m5.c +++ b/src/mess/drivers/m5.c @@ -617,7 +617,7 @@ static const z80_daisy_config m5_daisy_chain[] = void m5_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); // configure RAM switch (m_ram->size()) diff --git a/src/mess/drivers/mc1000.c b/src/mess/drivers/mc1000.c index 0258217508f..72cc2792579 100644 --- a/src/mess/drivers/mc1000.c +++ b/src/mess/drivers/mc1000.c @@ -26,7 +26,7 @@ void mc1000_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* MC6845 video RAM */ membank("bank2")->set_entry(m_mc6845_bank); @@ -323,7 +323,7 @@ static const ay8910_interface ay8910_intf = void mc1000_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* setup memory banking */ UINT8 *rom = memregion(Z80_TAG)->base(); diff --git a/src/mess/drivers/micronic.c b/src/mess/drivers/micronic.c index 56af116bfa7..92155156777 100644 --- a/src/mess/drivers/micronic.c +++ b/src/mess/drivers/micronic.c @@ -164,12 +164,12 @@ WRITE8_MEMBER( micronic_state::bank_select_w ) if (data < 2) { membank("bank1")->set_entry(data); - m_maincpu->memory().space(AS_PROGRAM)->unmap_write(0x0000, 0x7fff); + m_maincpu->space(AS_PROGRAM)->unmap_write(0x0000, 0x7fff); } else { membank("bank1")->set_entry((data <= m_banks_num) ? data : m_banks_num); - m_maincpu->memory().space(AS_PROGRAM)->install_write_bank(0x0000, 0x7fff, "bank1"); + m_maincpu->space(AS_PROGRAM)->install_write_bank(0x0000, 0x7fff, "bank1"); } } @@ -342,7 +342,7 @@ void micronic_state::machine_start() void micronic_state::machine_reset() { membank("bank1")->set_entry(0); - m_maincpu->memory().space(AS_PROGRAM)->unmap_write(0x0000, 0x7fff); + m_maincpu->space(AS_PROGRAM)->unmap_write(0x0000, 0x7fff); } diff --git a/src/mess/drivers/mikromik.c b/src/mess/drivers/mikromik.c index 8e2b368dba7..c9a70dce2e4 100644 --- a/src/mess/drivers/mikromik.c +++ b/src/mess/drivers/mikromik.c @@ -757,7 +757,7 @@ void mm1_state::machine_start() void mm1_state::machine_reset() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int i; // reset LS259 diff --git a/src/mess/drivers/mpf1.c b/src/mess/drivers/mpf1.c index 9533fecd929..2ff0e70abeb 100644 --- a/src/mess/drivers/mpf1.c +++ b/src/mess/drivers/mpf1.c @@ -479,7 +479,7 @@ DIRECT_UPDATE_MEMBER(mpf1_state::mpf1_direct_update_handler) DRIVER_INIT_MEMBER(mpf1_state,mpf1) { - m_maincpu->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(mpf1_state::mpf1_direct_update_handler), this)); + m_maincpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(mpf1_state::mpf1_direct_update_handler), this)); } COMP( 1979, mpf1, 0, 0, mpf1, mpf1, mpf1_state, mpf1, "Multitech", "Micro Professor 1", 0) diff --git a/src/mess/drivers/msbc1.c b/src/mess/drivers/msbc1.c index cd2312b451f..b2794507576 100644 --- a/src/mess/drivers/msbc1.c +++ b/src/mess/drivers/msbc1.c @@ -65,7 +65,7 @@ INPUT_PORTS_END void msbc1_state::machine_reset() { - void *ram = machine().firstcpu->memory().space(AS_PROGRAM)->get_write_ptr(0); + void *ram = machine().firstcpu->space(AS_PROGRAM)->get_write_ptr(0); UINT8 *rom = memregion(MC68000R12_TAG)->base(); memcpy(ram, rom, 8); diff --git a/src/mess/drivers/mstation.c b/src/mess/drivers/mstation.c index 1635ba6009b..a22b65fbea2 100644 --- a/src/mess/drivers/mstation.c +++ b/src/mess/drivers/mstation.c @@ -173,7 +173,7 @@ UINT32 mstation_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap void mstation_state::refresh_memory(UINT8 bank, UINT8 chip_select) { - address_space* program = m_maincpu->memory().space(AS_PROGRAM); + address_space* program = m_maincpu->space(AS_PROGRAM); int &active_flash = (bank == 1 ? m_flash_at_0x4000 : m_flash_at_0x8000); char bank_tag[6]; diff --git a/src/mess/drivers/newbrain.c b/src/mess/drivers/newbrain.c index ad690d92040..0724ea2b622 100644 --- a/src/mess/drivers/newbrain.c +++ b/src/mess/drivers/newbrain.c @@ -66,7 +66,7 @@ void newbrain_state::check_interrupt() void newbrain_eim_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int bank; for (bank = 1; bank < 9; bank++) @@ -104,7 +104,7 @@ void newbrain_eim_state::bankswitch() void newbrain_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int bank; for (bank = 1; bank < 9; bank++) diff --git a/src/mess/drivers/next.c b/src/mess/drivers/next.c index 9d146522f65..bab9ff5c841 100644 --- a/src/mess/drivers/next.c +++ b/src/mess/drivers/next.c @@ -304,7 +304,7 @@ void next_state::dma_drq_w(int slot, bool state) dma_slot &ds = dma_slots[slot]; ds.drq = state; if(state && (ds.state & DMA_ENABLE)) { - address_space *space = maincpu->memory().space(AS_PROGRAM); + address_space *space = maincpu->space(AS_PROGRAM); if(ds.state & DMA_READ) { while(ds.drq) { dma_check_update(slot); diff --git a/src/mess/drivers/ob68k1a.c b/src/mess/drivers/ob68k1a.c index 5c522f4fb1e..d4ad42e52a9 100644 --- a/src/mess/drivers/ob68k1a.c +++ b/src/mess/drivers/ob68k1a.c @@ -288,7 +288,7 @@ static serial_terminal_interface terminal_intf = void ob68k1a_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); // configure RAM switch (m_ram->size()) @@ -306,7 +306,7 @@ void ob68k1a_state::machine_start() void ob68k1a_state::machine_reset() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); // initialize COM8116 // m_dbrg->stt_w(program, 0, 0x01); diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c index a83bb63f7c8..42ea961fbd7 100644 --- a/src/mess/drivers/osi.c +++ b/src/mess/drivers/osi.c @@ -674,7 +674,7 @@ static ACIA6850_INTERFACE( osi470_acia_intf ) void sb2m600_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* configure RAM banking */ membank("bank1")->configure_entry(0, memregion(M6502_TAG)->base()); @@ -699,7 +699,7 @@ void sb2m600_state::machine_start() void c1p_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* configure RAM banking */ membank("bank1")->configure_entry(0, memregion(M6502_TAG)->base()); diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c index 37b649473d3..eb2e91e73ae 100644 --- a/src/mess/drivers/pasopia7.c +++ b/src/mess/drivers/pasopia7.c @@ -576,7 +576,7 @@ READ8_MEMBER( pasopia7_state::pasopia7_io_r ) if(m_mio_sel) { - address_space *ram_space = m_maincpu->memory().space(AS_PROGRAM); + address_space *ram_space = m_maincpu->space(AS_PROGRAM); m_mio_sel = 0; //printf("%08x\n",offset); @@ -627,7 +627,7 @@ WRITE8_MEMBER( pasopia7_state::pasopia7_io_w ) if(m_mio_sel) { - address_space *ram_space = m_maincpu->memory().space(AS_PROGRAM); + address_space *ram_space = m_maincpu->space(AS_PROGRAM); m_mio_sel = 0; ram_space->write_byte(offset, data); return; diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c index abd5566cc1e..9f7511afbe3 100644 --- a/src/mess/drivers/pc1512.c +++ b/src/mess/drivers/pc1512.c @@ -888,7 +888,7 @@ WRITE_LINE_MEMBER( pc1512_state::eop_w ) READ8_MEMBER( pc1512_state::memr_r ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); offs_t page_offset = m_dma_page[m_dma_channel] << 16; return program->read_byte(page_offset + offset); @@ -896,7 +896,7 @@ READ8_MEMBER( pc1512_state::memr_r ) WRITE8_MEMBER( pc1512_state::memw_w ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); offs_t page_offset = m_dma_page[m_dma_channel] << 16; program->write_byte(page_offset + offset, data); @@ -1210,7 +1210,7 @@ void pc1512_state::machine_start() if (ram_size < 640 * 1024) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); program->unmap_readwrite(ram_size, 0x9ffff); } diff --git a/src/mess/drivers/pc8001.c b/src/mess/drivers/pc8001.c index 117006b2d5a..a829bd3f982 100644 --- a/src/mess/drivers/pc8001.c +++ b/src/mess/drivers/pc8001.c @@ -448,14 +448,14 @@ WRITE8_MEMBER( pc8001_state::dma_mem_w ) READ8_MEMBER( pc8001_state::dma_io_r ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); return program->read_byte(offset); } WRITE8_MEMBER( pc8001_state::dma_io_w ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); program->write_byte(offset, data); } @@ -483,7 +483,7 @@ static UPD1990A_INTERFACE( rtc_intf ) void pc8001_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* initialize RTC */ m_rtc->cs_w(1); diff --git a/src/mess/drivers/pc8401a.c b/src/mess/drivers/pc8401a.c index 092fc6d0619..edc357f8eab 100644 --- a/src/mess/drivers/pc8401a.c +++ b/src/mess/drivers/pc8401a.c @@ -72,7 +72,7 @@ static TIMER_DEVICE_CALLBACK( pc8401a_keyboard_tick ) void pc8401a_state::bankswitch(UINT8 data) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int rombank = data & 0x03; int ram0000 = (data >> 2) & 0x03; diff --git a/src/mess/drivers/pce220.c b/src/mess/drivers/pce220.c index b799b9fb881..ee8562b6706 100644 --- a/src/mess/drivers/pce220.c +++ b/src/mess/drivers/pce220.c @@ -337,7 +337,7 @@ WRITE8_MEMBER( pce220_state::boot_bank_w ) // set to 1 after boot for restore the ram in the first bank if (data & 0x01) { - address_space *space_prg = m_maincpu->memory().space(AS_PROGRAM); + address_space *space_prg = m_maincpu->space(AS_PROGRAM); space_prg->install_write_bank(0x0000, 0x3fff, "bank1"); membank("bank1")->set_entry(0); } @@ -469,7 +469,7 @@ READ8_MEMBER( pcg850v_state::g850v_bank_r ) WRITE8_MEMBER( pcg850v_state::g850v_bank_w ) { - address_space *space_prg = m_maincpu->memory().space(AS_PROGRAM); + address_space *space_prg = m_maincpu->space(AS_PROGRAM); if (data < 0x16) { @@ -872,7 +872,7 @@ void pcg850v_state::machine_start() void pce220_state::machine_reset() { - address_space *space = m_maincpu->memory().space(AS_PROGRAM); + address_space *space = m_maincpu->space(AS_PROGRAM); space->unmap_write(0x0000, 0x3fff); // install the boot code into the first bank diff --git a/src/mess/drivers/pcfx.c b/src/mess/drivers/pcfx.c index 611ab01402b..f5acebf1fd5 100644 --- a/src/mess/drivers/pcfx.c +++ b/src/mess/drivers/pcfx.c @@ -67,14 +67,14 @@ public: READ8_MEMBER(pcfx_state::extio_r) { - address_space *io_space = m_maincpu->memory().space(AS_IO); + address_space *io_space = m_maincpu->space(AS_IO); return io_space->read_byte(offset); } WRITE8_MEMBER(pcfx_state::extio_w) { - address_space *io_space = m_maincpu->memory().space(AS_IO); + address_space *io_space = m_maincpu->space(AS_IO); io_space->write_byte(offset, data); } diff --git a/src/mess/drivers/plus4.c b/src/mess/drivers/plus4.c index b14a6366298..8de3c5eba31 100644 --- a/src/mess/drivers/plus4.c +++ b/src/mess/drivers/plus4.c @@ -802,12 +802,12 @@ static CBM_IEC_INTERFACE( c16_iec_intf ) READ8_MEMBER( plus4_state::exp_dma_r ) { - return m_maincpu->memory().space(AS_PROGRAM)->read_byte(offset); + return m_maincpu->space(AS_PROGRAM)->read_byte(offset); } WRITE8_MEMBER( plus4_state::exp_dma_w ) { - m_maincpu->memory().space(AS_PROGRAM)->write_byte(offset, data); + m_maincpu->space(AS_PROGRAM)->write_byte(offset, data); } WRITE_LINE_MEMBER( plus4_state::exp_irq_w ) diff --git a/src/mess/drivers/poly.c b/src/mess/drivers/poly.c index 6c27deb5dad..9920a77b411 100644 --- a/src/mess/drivers/poly.c +++ b/src/mess/drivers/poly.c @@ -165,7 +165,7 @@ WRITE8_MEMBER( poly_state::kbd_put ) { m_term_data = data; //m_term_key = 1; - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); mem->write_byte(0xebec, data); // this has to be 0xecf1 for bios 1 mem->write_byte(0xebd0, 1); // any non-zero here } diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c index 1a215ea5222..9600bde67ae 100644 --- a/src/mess/drivers/portfoli.c +++ b/src/mess/drivers/portfoli.c @@ -438,7 +438,7 @@ WRITE8_MEMBER( portfolio_state::counter_w ) WRITE8_MEMBER( portfolio_state::ncc1_w ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); if (BIT(data, 0)) { @@ -763,7 +763,7 @@ static DEVICE_IMAGE_LOAD( portfolio_cart ) void portfolio_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* set CPU interrupt vector callback */ device_set_irq_callback(m_maincpu, portfolio_int_ack); @@ -801,7 +801,7 @@ void portfolio_state::machine_start() void portfolio_state::machine_reset() { - address_space *io = m_maincpu->memory().space(AS_IO); + address_space *io = m_maincpu->space(AS_IO); // peripherals m_pid = ioport("PERIPHERAL")->read(); diff --git a/src/mess/drivers/prestige.c b/src/mess/drivers/prestige.c index 7d0f8981234..0ac8bf95f3d 100644 --- a/src/mess/drivers/prestige.c +++ b/src/mess/drivers/prestige.c @@ -120,7 +120,7 @@ READ8_MEMBER( prestige_state::bankswitch_r ) WRITE8_MEMBER( prestige_state::bankswitch_w ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); switch (offset) { diff --git a/src/mess/drivers/prof80.c b/src/mess/drivers/prof80.c index 00bf97eb066..3b40862c7f9 100644 --- a/src/mess/drivers/prof80.c +++ b/src/mess/drivers/prof80.c @@ -48,7 +48,7 @@ void prof80_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); UINT8 *rom = memregion(Z80_TAG)->base(); int bank; diff --git a/src/mess/drivers/px8.c b/src/mess/drivers/px8.c index 23a2d3dfd23..5b8ba6157b6 100644 --- a/src/mess/drivers/px8.c +++ b/src/mess/drivers/px8.c @@ -75,7 +75,7 @@ enum void px8_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); UINT8 *ipl_rom = memregion(UPD70008_TAG)->base(); diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c index 91c3fff5e8d..e59cb378f55 100644 --- a/src/mess/drivers/ql.c +++ b/src/mess/drivers/ql.c @@ -941,7 +941,7 @@ void ql_state::machine_start() void ql_state::machine_reset() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); m_disk_type=ioport(QL_CONFIG_PORT)->read() & DISK_TYPE_MASK; logerror("disktype=%d\n",m_disk_type); diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c index c2769fd3cdf..91b519051cc 100644 --- a/src/mess/drivers/rex6000.c +++ b/src/mess/drivers/rex6000.c @@ -153,7 +153,7 @@ READ8_MEMBER( rex6000_state::bankswitch_r ) WRITE8_MEMBER( rex6000_state::bankswitch_w ) { - address_space* program = m_maincpu->memory().space(AS_PROGRAM); + address_space* program = m_maincpu->space(AS_PROGRAM); m_bank[offset&3] = data; @@ -451,7 +451,7 @@ void rex6000_state::machine_start() } void rex6000_state::machine_reset() { - address_space* program = m_maincpu->memory().space(AS_PROGRAM); + address_space* program = m_maincpu->space(AS_PROGRAM); program->install_readwrite_handler(0x8000, 0x9fff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0x8000_r), this), write8_delegate(FUNC(rex6000_state::flash_0x8000_w), this)); program->install_readwrite_handler(0xa000, 0xbfff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0xa000_r), this), write8_delegate(FUNC(rex6000_state::flash_0xa000_w), this)); @@ -492,7 +492,7 @@ UINT32 rex6000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } else { - data = m_flash[mem_type]->memory().space(0)->read_byte(((lcd_bank & 0x7f)<<13) | (y*30 + x)); + data = m_flash[mem_type]->space(0)->read_byte(((lcd_bank & 0x7f)<<13) | (y*30 + x)); } diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c index c4cda812616..d54b8ea4ed5 100644 --- a/src/mess/drivers/sg1000.c +++ b/src/mess/drivers/sg1000.c @@ -642,7 +642,7 @@ const cassette_interface sc3000_cassette_interface = void sg1000_state::install_cartridge(UINT8 *ptr, int size) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); switch (size) { @@ -825,7 +825,7 @@ static DEVICE_IMAGE_LOAD( omv_cart ) void sc3000_state::install_cartridge(UINT8 *ptr, int size) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* include SG-1000 mapping */ sg1000_state::install_cartridge(ptr, size); diff --git a/src/mess/drivers/super6.c b/src/mess/drivers/super6.c index 49a489bdb75..fe6e75cab64 100644 --- a/src/mess/drivers/super6.c +++ b/src/mess/drivers/super6.c @@ -30,7 +30,7 @@ void super6_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); UINT8 *rom = memregion(Z80_TAG)->base(); diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c index 3aed17cf1f4..cb3a68d6185 100644 --- a/src/mess/drivers/supracan.c +++ b/src/mess/drivers/supracan.c @@ -990,7 +990,7 @@ WRITE16_MEMBER( supracan_state::supracan_dma_w ) { acan_dma_regs_t *acan_dma_regs = &m_acan_dma_regs; int ch = (offset < 0x10/2) ? 0 : 1; - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); switch(offset) { @@ -1125,7 +1125,7 @@ ADDRESS_MAP_END READ8_MEMBER( supracan_state::supracan_6502_soundmem_r ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); UINT8 data = m_soundram[offset]; switch(offset) @@ -1354,7 +1354,7 @@ static PALETTE_INIT( supracan ) WRITE16_MEMBER( supracan_state::supracan_68k_soundram_w ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); m_soundram[offset*2 + 1] = data & 0xff; m_soundram[offset*2 + 0] = data >> 8; @@ -1377,7 +1377,7 @@ WRITE16_MEMBER( supracan_state::supracan_68k_soundram_w ) READ16_MEMBER( supracan_state::supracan_68k_soundram_r ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); UINT16 val = m_soundram[offset*2 + 0] << 8; val |= m_soundram[offset*2 + 1]; @@ -1451,7 +1451,7 @@ WRITE16_MEMBER( supracan_state::supracan_sound_w ) READ16_MEMBER( supracan_state::supracan_video_r ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); UINT16 data = m_video_regs[offset]; switch(offset) @@ -1554,7 +1554,7 @@ static TIMER_CALLBACK( supracan_video_callback ) WRITE16_MEMBER( supracan_state::supracan_video_w ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); acan_sprdma_regs_t *acan_sprdma_regs = &m_acan_sprdma_regs; int i; diff --git a/src/mess/drivers/tandy2k.c b/src/mess/drivers/tandy2k.c index c42fd280b6f..d07481aa7bc 100644 --- a/src/mess/drivers/tandy2k.c +++ b/src/mess/drivers/tandy2k.c @@ -49,7 +49,7 @@ void tandy2k_state::speaker_update() READ8_MEMBER( tandy2k_state::videoram_r ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_vram_base << 15) | (offset << 1); UINT16 data = program->read_word(addr); @@ -319,7 +319,7 @@ UINT32 tandy2k_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, static CRT9007_DRAW_SCANLINE( tandy2k_crt9007_display_pixels ) { tandy2k_state *state = device->machine().driver_data(); - address_space *program = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *program = state->m_maincpu->space(AS_PROGRAM); for (int sx = 0; sx < x_count; sx++) { @@ -670,7 +670,7 @@ static TANDY2K_KEYBOARD_INTERFACE( kb_intf ) void tandy2k_state::machine_start() { // memory banking - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); int ram_size = m_ram->size(); diff --git a/src/mess/drivers/tek405x.c b/src/mess/drivers/tek405x.c index c5ab769f909..e1f9337cd7b 100644 --- a/src/mess/drivers/tek405x.c +++ b/src/mess/drivers/tek405x.c @@ -117,7 +117,7 @@ static TIMER_DEVICE_CALLBACK( keyboard_tick ) void tek4051_state::bankswitch(UINT8 data) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); //int d = data & 0x07; int lbs = (data >> 3) & 0x07; @@ -1167,7 +1167,7 @@ static IEEE488_INTERFACE( ieee488_intf ) void tek4051_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); // configure RAM switch (m_ram->size()) diff --git a/src/mess/drivers/tiki100.c b/src/mess/drivers/tiki100.c index d463bdc8918..983c291fb1d 100644 --- a/src/mess/drivers/tiki100.c +++ b/src/mess/drivers/tiki100.c @@ -44,7 +44,7 @@ WRITE8_MEMBER( tiki100_state::gfxram_w ) void tiki100_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); if (m_vire) { diff --git a/src/mess/drivers/tmc1800.c b/src/mess/drivers/tmc1800.c index 1e246785b99..15042e9afe9 100644 --- a/src/mess/drivers/tmc1800.c +++ b/src/mess/drivers/tmc1800.c @@ -167,7 +167,7 @@ WRITE8_MEMBER( nano_state::keylatch_w ) void tmc2000_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); UINT8 *rom = memregion(CDP1802_TAG)->base(); @@ -220,7 +220,7 @@ WRITE8_MEMBER( tmc2000_state::bankswitch_w ) WRITE8_MEMBER( nano_state::bankswitch_w ) { /* enable RAM */ - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); program->install_ram(0x0000, 0x0fff, 0, 0x7000, ram); @@ -745,7 +745,7 @@ void nano_state::machine_reset() m_cti->reset(); /* enable ROM */ - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *rom = memregion(CDP1802_TAG)->base(); program->install_rom(0x0000, 0x01ff, 0, 0x7e00, rom); } diff --git a/src/mess/drivers/tmc600.c b/src/mess/drivers/tmc600.c index 2c99bbbdae8..40dbced60b3 100644 --- a/src/mess/drivers/tmc600.c +++ b/src/mess/drivers/tmc600.c @@ -237,7 +237,7 @@ static COSMAC_INTERFACE( cosmac_intf ) void tmc600_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); /* configure RAM */ switch (m_ram->size()) diff --git a/src/mess/drivers/tvc.c b/src/mess/drivers/tvc.c index f6b5a5fb415..7c0e506ce09 100644 --- a/src/mess/drivers/tvc.c +++ b/src/mess/drivers/tvc.c @@ -32,7 +32,7 @@ void tvc_state::tvc_set_mem_page(UINT8 data) { - address_space *space = m_maincpu->memory().space(AS_PROGRAM); + address_space *space = m_maincpu->space(AS_PROGRAM); switch(data & 0x18) { case 0x00 : // system ROM selected diff --git a/src/mess/drivers/unixpc.c b/src/mess/drivers/unixpc.c index 26bd7cf3971..aa4da776274 100644 --- a/src/mess/drivers/unixpc.c +++ b/src/mess/drivers/unixpc.c @@ -71,7 +71,7 @@ WRITE16_MEMBER( unixpc_state::romlmap_w ) void unixpc_state::machine_reset() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); // force ROM into lower mem on reset romlmap_w(*program, 0, 0, 0xffff); diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index 1d2318b5f35..f57a0787b1a 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -126,7 +126,7 @@ void v1050_state::set_interrupt(UINT8 mask, int state) void v1050_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int bank = (m_bank >> 1) & 0x03; @@ -1020,7 +1020,7 @@ static IRQ_CALLBACK( v1050_int_ack ) void v1050_state::machine_start() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); // initialize SASI bus m_sasibus->init_scsibus(256); diff --git a/src/mess/drivers/vic10.c b/src/mess/drivers/vic10.c index adc53772fe0..40ae406ef7e 100644 --- a/src/mess/drivers/vic10.c +++ b/src/mess/drivers/vic10.c @@ -124,7 +124,7 @@ WRITE8_MEMBER( vic10_state::write ) READ8_MEMBER( vic10_state::vic_videoram_r ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); if (offset < 0x3000) return program->read_byte(offset); diff --git a/src/mess/drivers/victor9k.c b/src/mess/drivers/victor9k.c index cea733d3b96..9bd1c1a8f35 100644 --- a/src/mess/drivers/victor9k.c +++ b/src/mess/drivers/victor9k.c @@ -75,7 +75,7 @@ INPUT_PORTS_END static MC6845_UPDATE_ROW( victor9k_update_row ) { victor9k_state *state = device->machine().driver_data(); - address_space *program = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *program = state->m_maincpu->space(AS_PROGRAM); const rgb_t *palette = palette_entry_list_raw(bitmap.palette()); if (BIT(ma, 13)) @@ -926,7 +926,7 @@ void victor9k_state::machine_start() device_set_irq_callback(m_maincpu, victor9k_irq_callback); // memory banking - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); program->install_ram(0x00000, m_ram->size() - 1, m_ram->pointer()); } diff --git a/src/mess/drivers/vii.c b/src/mess/drivers/vii.c index a955210106e..7ee501755e0 100644 --- a/src/mess/drivers/vii.c +++ b/src/mess/drivers/vii.c @@ -441,7 +441,7 @@ static SCREEN_UPDATE_RGB32( vii ) void vii_state::vii_do_dma(UINT32 len) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); UINT32 src = m_video_regs[0x70]; UINT32 dst = m_video_regs[0x71] + 0x2c00; UINT32 j; @@ -612,7 +612,7 @@ void vii_state::vii_do_i2c() void vii_state::spg_do_dma(UINT32 len) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); UINT32 src = ((m_io_regs[0x101] & 0x3f) << 16) | m_io_regs[0x100]; UINT32 dst = m_io_regs[0x103] & 0x3fff; diff --git a/src/mess/drivers/vixen.c b/src/mess/drivers/vixen.c index fdfbd82fe54..d871fd6f394 100644 --- a/src/mess/drivers/vixen.c +++ b/src/mess/drivers/vixen.c @@ -809,7 +809,7 @@ void vixen_state::machine_start() void vixen_state::machine_reset() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); program->install_read_bank(0x0000, 0xefff, 0xfff, 0, "bank1"); program->install_write_bank(0x0000, 0xefff, 0xfff, 0, "bank2"); @@ -910,7 +910,7 @@ DIRECT_UPDATE_MEMBER(vixen_state::vixen_direct_update_handler) { if (m_reset) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); program->install_read_bank(0x0000, 0xefff, "bank1"); program->install_write_bank(0x0000, 0xefff, "bank2"); diff --git a/src/mess/drivers/wangpc.c b/src/mess/drivers/wangpc.c index 95b9d4e1cdc..a6cdaabf50d 100644 --- a/src/mess/drivers/wangpc.c +++ b/src/mess/drivers/wangpc.c @@ -696,7 +696,7 @@ WRITE_LINE_MEMBER( wangpc_state::eop_w ) READ8_MEMBER( wangpc_state::memr_r ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_page[m_dack] << 16) | offset; return program->read_byte(addr); @@ -704,7 +704,7 @@ READ8_MEMBER( wangpc_state::memr_r ) WRITE8_MEMBER( wangpc_state::memw_w ) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_page[m_dack] << 16) | offset; program->write_byte(addr, data); diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c index af4ba357c47..c1b3ace8eb9 100644 --- a/src/mess/drivers/x07.c +++ b/src/mess/drivers/x07.c @@ -1042,7 +1042,7 @@ static DEVICE_IMAGE_LOAD( x07_card ) { running_machine &machine = image.device().machine(); x07_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = state->m_maincpu->space( AS_PROGRAM ); UINT16 ram_size = state->m_ram->size(); if (image.software_entry() == NULL) @@ -1454,7 +1454,7 @@ void x07_state::machine_start() save_item(NAME(m_cursor.on)); /* install RAM */ - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); program->install_ram(0x0000, m_ram->size() - 1, m_ram->pointer()); } diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c index 00374dcf478..6db7d062bce 100644 --- a/src/mess/drivers/xerox820.c +++ b/src/mess/drivers/xerox820.c @@ -143,7 +143,7 @@ static TIMER_DEVICE_CALLBACK( xerox820_keyboard_tick ) void xerox820_state::bankswitch(int bank) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); if (bank) @@ -162,7 +162,7 @@ void xerox820_state::bankswitch(int bank) void xerox820ii_state::bankswitch(int bank) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); if (bank) diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c index 856877c8e73..91b5ed33d0d 100644 --- a/src/mess/drivers/xor100.c +++ b/src/mess/drivers/xor100.c @@ -57,7 +57,7 @@ enum void xor100_state::bankswitch() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int banks = m_ram->size() / 0x10000; switch (m_mode) diff --git a/src/mess/drivers/z88.c b/src/mess/drivers/z88.c index dc80ae821cb..d05a5cfc2de 100644 --- a/src/mess/drivers/z88.c +++ b/src/mess/drivers/z88.c @@ -67,8 +67,8 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams) // install read bank if (m_bank_type[bank] != Z88_BANK_ROM) { - m_maincpu->memory().space(AS_PROGRAM)->install_read_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag); - m_maincpu->memory().space(AS_PROGRAM)->unmap_write(bank<<14, (bank<<14) + 0x3fff); + m_maincpu->space(AS_PROGRAM)->install_read_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag); + m_maincpu->space(AS_PROGRAM)->unmap_write(bank<<14, (bank<<14) + 0x3fff); m_bank_type[bank] = Z88_BANK_ROM; } @@ -81,7 +81,7 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams) // install readwrite bank if (m_bank_type[bank] != Z88_BANK_RAM) { - m_maincpu->memory().space(AS_PROGRAM)->install_readwrite_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag); + m_maincpu->space(AS_PROGRAM)->install_readwrite_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag); m_bank_type[bank] = Z88_BANK_RAM; } @@ -92,7 +92,7 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams) { if (m_bank_type[bank] != Z88_BANK_UNMAP) { - m_maincpu->memory().space(AS_PROGRAM)->unmap_readwrite(bank<<14, (bank<<14) + 0x3fff); + m_maincpu->space(AS_PROGRAM)->unmap_readwrite(bank<<14, (bank<<14) + 0x3fff); m_bank_type[bank] = Z88_BANK_UNMAP; } } @@ -107,16 +107,16 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams) switch (bank) { case 0: - m_maincpu->memory().space(AS_PROGRAM)->install_readwrite_handler(0x0000, 0x3fff, 0, 0, read8_delegate(FUNC(z88_state::bank0_cart_r), this), write8_delegate(FUNC(z88_state::bank0_cart_w), this)); + m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x0000, 0x3fff, 0, 0, read8_delegate(FUNC(z88_state::bank0_cart_r), this), write8_delegate(FUNC(z88_state::bank0_cart_w), this)); break; case 1: - m_maincpu->memory().space(AS_PROGRAM)->install_readwrite_handler(0x4000, 0x7fff, 0, 0, read8_delegate(FUNC(z88_state::bank1_cart_r), this), write8_delegate(FUNC(z88_state::bank1_cart_w), this)); + m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x4000, 0x7fff, 0, 0, read8_delegate(FUNC(z88_state::bank1_cart_r), this), write8_delegate(FUNC(z88_state::bank1_cart_w), this)); break; case 2: - m_maincpu->memory().space(AS_PROGRAM)->install_readwrite_handler(0x8000, 0xbfff, 0, 0, read8_delegate(FUNC(z88_state::bank2_cart_r), this), write8_delegate(FUNC(z88_state::bank2_cart_w), this)); + m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x8000, 0xbfff, 0, 0, read8_delegate(FUNC(z88_state::bank2_cart_r), this), write8_delegate(FUNC(z88_state::bank2_cart_w), this)); break; case 3: - m_maincpu->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc000, 0xffff, 0, 0, read8_delegate(FUNC(z88_state::bank3_cart_r), this), write8_delegate(FUNC(z88_state::bank3_cart_w), this)); + m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0xc000, 0xffff, 0, 0, read8_delegate(FUNC(z88_state::bank3_cart_r), this), write8_delegate(FUNC(z88_state::bank3_cart_w), this)); break; } @@ -128,13 +128,13 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams) // override setting for lower 8k of bank 0 if (bank == 0) { - m_maincpu->memory().space(AS_PROGRAM)->install_read_bank(0, 0x1fff, "bank1"); + m_maincpu->space(AS_PROGRAM)->install_read_bank(0, 0x1fff, "bank1"); // enable RAM if (rams) - m_maincpu->memory().space(AS_PROGRAM)->install_write_bank(0, 0x1fff, "bank1"); + m_maincpu->space(AS_PROGRAM)->install_write_bank(0, 0x1fff, "bank1"); else - m_maincpu->memory().space(AS_PROGRAM)->unmap_write(0, 0x1fff); + m_maincpu->space(AS_PROGRAM)->unmap_write(0, 0x1fff); membank("bank1")->set_entry(rams & 1); } diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c index 4d82b537da6..7a2e610d1dd 100644 --- a/src/mess/drivers/z9001.c +++ b/src/mess/drivers/z9001.c @@ -147,7 +147,7 @@ WRITE_LINE_MEMBER( z9001_state::cass_w ) static TIMER_DEVICE_CALLBACK( timer_callback ) { z9001_state *state = timer.machine().driver_data(); - state->m_maincpu->memory().space(AS_PROGRAM)->write_byte(0x006a, 0); + state->m_maincpu->space(AS_PROGRAM)->write_byte(0x006a, 0); } MACHINE_RESET_MEMBER( z9001_state ) @@ -221,7 +221,7 @@ static const gfx_layout z9001_charlayout = WRITE8_MEMBER( z9001_state::kbd_put ) { - m_maincpu->memory().space(AS_PROGRAM)->write_byte(0x0025, data); + m_maincpu->space(AS_PROGRAM)->write_byte(0x0025, data); } static ASCII_KEYBOARD_INTERFACE( keyboard_intf ) diff --git a/src/mess/formats/ace_ace.c b/src/mess/formats/ace_ace.c index 267441c2344..50270920112 100644 --- a/src/mess/formats/ace_ace.c +++ b/src/mess/formats/ace_ace.c @@ -27,7 +27,7 @@ SNAPSHOT_LOAD( ace ) { cpu_device *cpu = image.device().machine().firstcpu; UINT8 *RAM = image.device().machine().root_device().memregion(cpu->tag())->base(); - address_space *space = cpu->memory().space(AS_PROGRAM); + address_space *space = cpu->space(AS_PROGRAM); unsigned char ace_repeat, ace_byte, loop; int done=0, ace_index=0x2000; diff --git a/src/mess/formats/atom_atm.c b/src/mess/formats/atom_atm.c index 88f7bef2a94..70b38b7a273 100644 --- a/src/mess/formats/atom_atm.c +++ b/src/mess/formats/atom_atm.c @@ -26,7 +26,7 @@ static void image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count) { - void *ptr = image.device().machine().firstcpu->memory().space(AS_PROGRAM)->get_write_ptr(addr); + void *ptr = image.device().machine().firstcpu->space(AS_PROGRAM)->get_write_ptr(addr); image.fread( ptr, count); } diff --git a/src/mess/formats/cbm_snqk.c b/src/mess/formats/cbm_snqk.c index 99ffe81b7ef..76ad3cfe76c 100644 --- a/src/mess/formats/cbm_snqk.c +++ b/src/mess/formats/cbm_snqk.c @@ -30,7 +30,7 @@ static int general_cbm_loadsnap( device_image_interface &image, const char *file UINT32 bytesread; UINT16 address = 0; int i; - address_space *space = image.device().machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space = image.device().machine().firstcpu->space(AS_PROGRAM); if (!file_type) goto error; @@ -93,7 +93,7 @@ error: static void cbm_quick_sethiaddress( running_machine &machine, UINT16 hiaddress ) { - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); + address_space *space = machine.firstcpu->space(AS_PROGRAM); space->write_byte(0x31, hiaddress & 0xff); space->write_byte(0x2f, hiaddress & 0xff); @@ -120,7 +120,7 @@ QUICKLOAD_LOAD( cbm_vc20 ) static void cbm_pet_quick_sethiaddress( running_machine &machine, UINT16 hiaddress ) { - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); + address_space *space = machine.firstcpu->space(AS_PROGRAM); space->write_byte(0x2e, hiaddress & 0xff); space->write_byte(0x2c, hiaddress & 0xff); @@ -137,7 +137,7 @@ QUICKLOAD_LOAD( cbm_pet ) static void cbm_pet1_quick_sethiaddress(running_machine &machine, UINT16 hiaddress) { - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); + address_space *space = machine.firstcpu->space(AS_PROGRAM); space->write_byte(0x80, hiaddress & 0xff); space->write_byte(0x7e, hiaddress & 0xff); @@ -154,7 +154,7 @@ QUICKLOAD_LOAD( cbm_pet1 ) static void cbmb_quick_sethiaddress(running_machine &machine, UINT16 hiaddress) { - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); + address_space *space = machine.firstcpu->space(AS_PROGRAM); space->write_byte(0xf0046, hiaddress & 0xff); space->write_byte(0xf0047, hiaddress >> 8); @@ -172,7 +172,7 @@ QUICKLOAD_LOAD( p500 ) static void cbm_c65_quick_sethiaddress( running_machine &machine, UINT16 hiaddress ) { - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); + address_space *space = machine.firstcpu->space(AS_PROGRAM); space->write_byte(0x82, hiaddress & 0xff); space->write_byte(0x83, hiaddress >> 8); diff --git a/src/mess/formats/comx35_comx.c b/src/mess/formats/comx35_comx.c index 9ace12e1292..345d1f6416e 100644 --- a/src/mess/formats/comx35_comx.c +++ b/src/mess/formats/comx35_comx.c @@ -47,7 +47,7 @@ static void image_fread_memory(device_image_interface &image, UINT16 addr, UINT3 QUICKLOAD_LOAD( comx35_comx ) { - address_space *program = image.device().machine().firstcpu->memory().space(AS_PROGRAM); + address_space *program = image.device().machine().firstcpu->space(AS_PROGRAM); UINT8 header[16] = {0}; int size = image.length(); diff --git a/src/mess/formats/trs_cmd.c b/src/mess/formats/trs_cmd.c index 90dd6b57b94..d29a8d4acc2 100644 --- a/src/mess/formats/trs_cmd.c +++ b/src/mess/formats/trs_cmd.c @@ -35,7 +35,7 @@ QUICKLOAD_LOAD( trs80_cmd ) { - address_space *program = image.device().machine().firstcpu->memory().space(AS_PROGRAM); + address_space *program = image.device().machine().firstcpu->space(AS_PROGRAM); UINT8 type, length; UINT8 data[0x100]; diff --git a/src/mess/machine/advision.c b/src/mess/machine/advision.c index 36672d0c319..928afd84e0b 100644 --- a/src/mess/machine/advision.c +++ b/src/mess/machine/advision.c @@ -30,7 +30,7 @@ void advision_state::machine_start() /* configure EA banking */ membank("bank1")->configure_entry(0, memregion("bios")->base()); membank("bank1")->configure_entry(1, memregion(I8048_TAG)->base()); - m_maincpu->memory().space(AS_PROGRAM)->install_readwrite_bank(0x0000, 0x03ff, "bank1"); + m_maincpu->space(AS_PROGRAM)->install_readwrite_bank(0x0000, 0x03ff, "bank1"); membank("bank1")->set_entry(0); /* allocate external RAM */ diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c index b82010070aa..ca7ed3522ce 100644 --- a/src/mess/machine/amstrad.c +++ b/src/mess/machine/amstrad.c @@ -1197,7 +1197,7 @@ static void amstrad_setLowerRom(running_machine &machine) } else // CPC+/GX4000 { - //address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + //address_space *space = state->m_maincpu->space(AS_PROGRAM); /* if ( state->m_asic.enabled && ( state->m_asic.rmr2 & 0x18 ) == 0x18 ) { @@ -2176,7 +2176,7 @@ The exception is the case where none of b7-b0 are reset (i.e. port &FBFF), which static void amstrad_handle_snapshot(running_machine &machine, unsigned char *pSnapshot) { amstrad_state *state = machine.driver_data(); - address_space* space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space* space = state->m_maincpu->space(AS_PROGRAM); mc6845_device *mc6845 = state->m_crtc; device_t *ay8910 = state->m_ay; int RegData; @@ -2459,7 +2459,7 @@ BDIR BC1 | static void update_psg(running_machine &machine) { amstrad_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); device_t *ay8910 = state->m_ay; mc146818_device *rtc = state->m_rtc; @@ -2833,7 +2833,7 @@ static const UINT8 amstrad_cycle_table_ex[256]= static void amstrad_common_init(running_machine &machine) { amstrad_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); device_t* romexp; rom_image_device* romimage; char str[20]; @@ -2982,7 +2982,7 @@ MACHINE_START( plus ) MACHINE_RESET( plus ) { amstrad_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); int i; UINT8 *rom = state->memregion("maincpu")->base(); @@ -3034,7 +3034,7 @@ MACHINE_START( gx4000 ) MACHINE_RESET( gx4000 ) { amstrad_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); int i; UINT8 *rom = state->memregion("maincpu")->base(); diff --git a/src/mess/machine/c128.c b/src/mess/machine/c128.c index d51f38e080d..cbaa6f38d38 100644 --- a/src/mess/machine/c128.c +++ b/src/mess/machine/c128.c @@ -452,12 +452,12 @@ void c128_state::bankswitch_64(int reset) if ((!m_game && m_exrom) || (charen && (loram || hiram))) { - m_subcpu->memory().space(AS_PROGRAM)->install_read_handler(0xd000, 0xdfff, read8_delegate(FUNC(c128_state::read_io), this)); + m_subcpu->space(AS_PROGRAM)->install_read_handler(0xd000, 0xdfff, read8_delegate(FUNC(c128_state::read_io), this)); m_write_io = 1; } else { - m_subcpu->memory().space(AS_PROGRAM)->install_read_bank(0xd000, 0xdfff, "bank5"); + m_subcpu->space(AS_PROGRAM)->install_read_bank(0xd000, 0xdfff, "bank5"); m_write_io = 0; if ((!charen && (loram || hiram))) membank("bank13")->set_base(m_chargen); @@ -636,17 +636,17 @@ void c128_state::bankswitch_128(int reset) else m_ram_top = 0x10000; - m_subcpu->memory().space(AS_PROGRAM)->install_read_handler(0xff00, 0xff04, read8_delegate(FUNC(c128_state::mmu8722_ff00_r), this)); + m_subcpu->space(AS_PROGRAM)->install_read_handler(0xff00, 0xff04, read8_delegate(FUNC(c128_state::mmu8722_ff00_r), this)); if (MMU_IO_ON) { m_write_io = 1; - m_subcpu->memory().space(AS_PROGRAM)->install_read_handler(0xd000, 0xdfff, read8_delegate(FUNC(c128_state::read_io), this)); + m_subcpu->space(AS_PROGRAM)->install_read_handler(0xd000, 0xdfff, read8_delegate(FUNC(c128_state::read_io), this)); } else { m_write_io = 0; - m_subcpu->memory().space(AS_PROGRAM)->install_read_bank(0xd000, 0xdfff, "bank13"); + m_subcpu->space(AS_PROGRAM)->install_read_bank(0xd000, 0xdfff, "bank13"); } @@ -1025,8 +1025,8 @@ WRITE8_MEMBER( c128_state::cpu_w ) bankswitch_64(0); - m_memory[0x000] = m_subcpu->memory().space(AS_PROGRAM)->read_byte(0); - m_memory[0x001] = m_subcpu->memory().space(AS_PROGRAM)->read_byte(1); + m_memory[0x000] = m_subcpu->space(AS_PROGRAM)->read_byte(0); + m_memory[0x001] = m_subcpu->space(AS_PROGRAM)->read_byte(1); } READ8_MEMBER( c128_state::cpu_r) diff --git a/src/mess/machine/c64.c b/src/mess/machine/c64.c index 0d0f36d00af..f770300b30f 100644 --- a/src/mess/machine/c64.c +++ b/src/mess/machine/c64.c @@ -1260,13 +1260,13 @@ static int c64_crt_load( device_image_interface &image ) ***************************************************************************/ #define install_write_handler(_start, _end, _handler) \ - image.device().machine().firstcpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(_start, _end, FUNC(_handler)); + image.device().machine().firstcpu->space(AS_PROGRAM)->install_legacy_write_handler(_start, _end, FUNC(_handler)); #define install_io1_handler(_handler) \ - image.device().machine().firstcpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xde00, 0xde00, 0, 0xff, FUNC(_handler)); + image.device().machine().firstcpu->space(AS_PROGRAM)->install_legacy_write_handler(0xde00, 0xde00, 0, 0xff, FUNC(_handler)); #define install_io2_handler(_handler) \ - image.device().machine().firstcpu->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xdf00, 0xdf00, 0, 0xff, FUNC(_handler)); + image.device().machine().firstcpu->space(AS_PROGRAM)->install_legacy_write_handler(0xdf00, 0xdf00, 0, 0xff, FUNC(_handler)); #define allocate_cartridge_timer(_period, _func) \ legacy_c64_state *state = image.device().machine().driver_data(); \ @@ -1577,7 +1577,7 @@ static void load_super_explode_cartridge(device_image_interface &image) map_cartridge_roml(image.device().machine(), 0x0000); - address_space *space = image.device().machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space = image.device().machine().firstcpu->space(AS_PROGRAM); space->install_legacy_read_handler(0xdf00, 0xdfff, FUNC(super_explode_r)); install_io2_handler(super_explode_bank_w); diff --git a/src/mess/machine/compis.c b/src/mess/machine/compis.c index 0ba1cae72ec..5fe94784031 100644 --- a/src/mess/machine/compis.c +++ b/src/mess/machine/compis.c @@ -1054,8 +1054,8 @@ READ16_MEMBER( compis_state::compis_i186_internal_port_r ) WRITE16_MEMBER( compis_state::compis_i186_internal_port_w ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); - address_space *io = m_maincpu->memory().space(AS_IO); + address_space *mem = m_maincpu->space(AS_PROGRAM); + address_space *io = m_maincpu->space(AS_IO); int temp, which, data16 = data; switch (offset) diff --git a/src/mess/machine/comx_clm.c b/src/mess/machine/comx_clm.c index 775bfdb3c63..41ddcb834b9 100644 --- a/src/mess/machine/comx_clm.c +++ b/src/mess/machine/comx_clm.c @@ -251,7 +251,7 @@ void comx_clm_device::comx_ds_w(int state) UINT8 comx_clm_device::comx_mrd_r(offs_t offset, int *extrom) { - address_space *space = machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space = machine().firstcpu->space(AS_PROGRAM); UINT8 data = 0xff; @@ -278,7 +278,7 @@ UINT8 comx_clm_device::comx_mrd_r(offs_t offset, int *extrom) void comx_clm_device::comx_mwr_w(offs_t offset, UINT8 data) { - address_space *space = machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space = machine().firstcpu->space(AS_PROGRAM); if (offset >= 0xd000 && offset < 0xd800) { diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c index b015f9ab862..9b77cbdb5b1 100644 --- a/src/mess/machine/genpc.c +++ b/src/mess/machine/genpc.c @@ -570,14 +570,14 @@ ibm5160_mb_device::ibm5160_mb_device(const machine_config &mconfig, const char * void ibm5160_mb_device::install_device(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_device_func rhandler, const char* rhandler_name, write8_device_func whandler, const char *whandler_name) { - int buswidth = machine().firstcpu->memory().space_config(AS_IO)->m_databus_width; + int buswidth = machine().firstcpu->space_config(AS_IO)->m_databus_width; switch(buswidth) { case 8: - m_maincpu->memory().space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0); + m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0); break; case 16: - m_maincpu->memory().space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff); + m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff); break; default: fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth); @@ -587,14 +587,14 @@ void ibm5160_mb_device::install_device(device_t *dev, offs_t start, offs_t end, void ibm5160_mb_device::install_device_write(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, write8_device_func whandler, const char *whandler_name) { - int buswidth = machine().firstcpu->memory().space_config(AS_IO)->m_databus_width; + int buswidth = machine().firstcpu->space_config(AS_IO)->m_databus_width; switch(buswidth) { case 8: - m_maincpu->memory().space(AS_IO)->install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name,0); + m_maincpu->space(AS_IO)->install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name,0); break; case 16: - m_maincpu->memory().space(AS_IO)->install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name, 0xffff); + m_maincpu->space(AS_IO)->install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name, 0xffff); break; default: fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth); @@ -604,14 +604,14 @@ void ibm5160_mb_device::install_device_write(device_t *dev, offs_t start, offs_t void ibm5160_mb_device::install_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler) { - int buswidth = m_maincpu->memory().space_config(AS_IO)->m_databus_width; + int buswidth = m_maincpu->space_config(AS_IO)->m_databus_width; switch(buswidth) { case 8: - m_maincpu->memory().space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0); + m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0); break; case 16: - m_maincpu->memory().space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffff); + m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffff); break; default: fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth); @@ -631,14 +631,14 @@ void ibm5160_mb_device::device_start() install_device(m_pit8253, 0x0040, 0x0043, 0, 0, FUNC(pit8253_r), FUNC(pit8253_w) ); // install_device(m_ppi8255, 0x0060, 0x0063, 0, 0, FUNC(i8255a_r), FUNC(i8255a_w) ); - int buswidth = machine().firstcpu->memory().space_config(AS_IO)->m_databus_width; + int buswidth = machine().firstcpu->space_config(AS_IO)->m_databus_width; switch(buswidth) { case 8: - m_maincpu->memory().space(AS_IO)->install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0); + m_maincpu->space(AS_IO)->install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0); break; case 16: - m_maincpu->memory().space(AS_IO)->install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0xffff); + m_maincpu->space(AS_IO)->install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0xffff); break; default: fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth); diff --git a/src/mess/machine/hd63450.c b/src/mess/machine/hd63450.c index fee45682dff..4a40204b11e 100644 --- a/src/mess/machine/hd63450.c +++ b/src/mess/machine/hd63450.c @@ -239,7 +239,7 @@ void hd63450_write(device_t* device, int offset, int data, UINT16 mem_mask) static void dma_transfer_start(device_t* device, int channel, int dir) { - address_space *space = device->machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space = device->machine().firstcpu->space(AS_PROGRAM); hd63450_t* dmac = get_safe_token(device); dmac->in_progress[channel] = 1; dmac->reg[channel].csr &= ~0xe0; @@ -316,7 +316,7 @@ static void dma_transfer_continue(device_t* device, int channel) void hd63450_single_transfer(device_t* device, int x) { - address_space *space = device->machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space = device->machine().firstcpu->space(AS_PROGRAM); int data; int datasize = 1; hd63450_t* dmac = get_safe_token(device); diff --git a/src/mess/machine/kaypro.c b/src/mess/machine/kaypro.c index e8f3f6596be..f417f3f8682 100644 --- a/src/mess/machine/kaypro.c +++ b/src/mess/machine/kaypro.c @@ -42,7 +42,7 @@ WRITE8_MEMBER( kaypro_state::common_pio_system_w ) d0 drive A */ /* get address space */ - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); if (data & 0x80) { @@ -329,7 +329,7 @@ MACHINE_RESET( kayproii ) MACHINE_RESET( kaypro2x ) { kaypro_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); state->kaypro2x_system_port_w(*space, 0, 0x80); MACHINE_RESET_CALL(kay_kbd); } @@ -348,7 +348,7 @@ MACHINE_RESET( kaypro2x ) QUICKLOAD_LOAD( kayproii ) { kaypro_state *state = image.device().machine().driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); UINT8 *RAM = state->memregion("rambank")->base(); UINT16 i; UINT8 data; @@ -371,7 +371,7 @@ QUICKLOAD_LOAD( kayproii ) QUICKLOAD_LOAD( kaypro2x ) { kaypro_state *state = image.device().machine().driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); UINT8 *RAM = state->memregion("rambank")->base(); UINT16 i; UINT8 data; diff --git a/src/mess/machine/kc.c b/src/mess/machine/kc.c index 40f1f52f840..a9ca5981cac 100644 --- a/src/mess/machine/kc.c +++ b/src/mess/machine/kc.c @@ -61,7 +61,7 @@ QUICKLOAD_LOAD(kc) datasize = image.length() - 128; } - address_space *space = state->m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = state->m_maincpu->space( AS_PROGRAM ); for (i=0; iwrite_byte((addr+i) & 0xffff, data[i+128]); @@ -290,7 +290,7 @@ void kc_state::cassette_set_motor(int motor_state) /* update status of memory area 0x0000-0x03fff */ void kc_state::update_0x00000() { - address_space *space = m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = m_maincpu->space( AS_PROGRAM ); /* access ram? */ if (m_pio_data[0] & (1<<1)) @@ -330,7 +330,7 @@ void kc_state::update_0x00000() /* update status of memory area 0x4000-0x07fff */ void kc_state::update_0x04000() { - address_space *space = m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = m_maincpu->space( AS_PROGRAM ); LOG(("Module at 0x4000\n")); @@ -343,7 +343,7 @@ void kc_state::update_0x04000() /* update memory address 0x0c000-0x0e000 */ void kc_state::update_0x0c000() { - address_space *space = m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = m_maincpu->space( AS_PROGRAM ); if ((m_pio_data[0] & (1<<7)) && memregion("basic")->base() != NULL) { @@ -366,7 +366,7 @@ void kc_state::update_0x0c000() /* update memory address 0x0e000-0x0ffff */ void kc_state::update_0x0e000() { - address_space *space = m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = m_maincpu->space( AS_PROGRAM ); if (m_pio_data[0] & (1<<0)) { @@ -390,7 +390,7 @@ void kc_state::update_0x0e000() /* update status of memory area 0x08000-0x0ffff */ void kc_state::update_0x08000() { - address_space *space = m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = m_maincpu->space( AS_PROGRAM ); if (m_pio_data[0] & (1<<2)) { @@ -413,7 +413,7 @@ void kc_state::update_0x08000() /* update status of memory area 0x4000-0x07fff */ void kc85_4_state::update_0x04000() { - address_space *space = m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = m_maincpu->space( AS_PROGRAM ); /* access ram? */ if (m_port_86_data & (1<<0)) @@ -455,7 +455,7 @@ void kc85_4_state::update_0x04000() /* update memory address 0x0c000-0x0e000 */ void kc85_4_state::update_0x0c000() { - address_space *space = m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = m_maincpu->space( AS_PROGRAM ); if (m_port_86_data & (1<<7)) { @@ -491,7 +491,7 @@ void kc85_4_state::update_0x0c000() void kc85_4_state::update_0x08000() { - address_space *space = m_maincpu->memory().space( AS_PROGRAM ); + address_space *space = m_maincpu->space( AS_PROGRAM ); if (m_pio_data[0] & (1<<2)) { diff --git a/src/mess/machine/kc_d004.c b/src/mess/machine/kc_d004.c index 226edee3a6e..b902867cd26 100644 --- a/src/mess/machine/kc_d004.c +++ b/src/mess/machine/kc_d004.c @@ -336,7 +336,7 @@ void kc_d004_device::io_write(offs_t offset, UINT8 data) if (data & 0x02) { for (int i=0; i<0xfc00; i++) - m_cpu->memory().space(AS_PROGRAM)->write_byte(i, 0); + m_cpu->space(AS_PROGRAM)->write_byte(i, 0); device_set_input_line(m_cpu, INPUT_LINE_RESET, ASSERT_LINE); } diff --git a/src/mess/machine/mac.c b/src/mess/machine/mac.c index 54bf66dafd8..f7d9b275b0e 100644 --- a/src/mess/machine/mac.c +++ b/src/mess/machine/mac.c @@ -1814,7 +1814,7 @@ void mac_state::machine_reset() if (m_model >= MODEL_MAC_POWERMAC_6100 && m_model <= MODEL_MAC_POWERMAC_8100) { - m_awacs->set_dma_base(m_maincpu->memory().space(AS_PROGRAM), 0x10000, 0x12000); + m_awacs->set_dma_base(m_maincpu->space(AS_PROGRAM), 0x10000, 0x12000); } // start 60.15 Hz timer for most systems diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c index 461fe628d14..8a68e03b217 100644 --- a/src/mess/machine/mbee.c +++ b/src/mess/machine/mbee.c @@ -222,19 +222,19 @@ READ8_MEMBER( mbee_state::mbee256_speed_high_r ) WRITE8_MEMBER( mbee_state::mbee_04_w ) // address { - address_space *mem = m_maincpu->memory().space(AS_IO); + address_space *mem = m_maincpu->space(AS_IO); machine().device("rtc")->write(*mem, 0, data); } WRITE8_MEMBER( mbee_state::mbee_06_w ) // write { - address_space *mem = m_maincpu->memory().space(AS_IO); + address_space *mem = m_maincpu->space(AS_IO); machine().device("rtc")->write(*mem, 1, data); } READ8_MEMBER( mbee_state::mbee_07_r ) // read { - address_space *mem = m_maincpu->memory().space(AS_IO); + address_space *mem = m_maincpu->space(AS_IO); return machine().device("rtc")->read(*mem, 1); } @@ -263,7 +263,7 @@ static TIMER_CALLBACK( mbee_rtc_irq ) WRITE8_MEMBER( mbee_state::mbee256_50_w ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); // primary low banks membank("boot")->set_entry((data & 3) | ((data & 0x20) >> 3)); @@ -345,7 +345,7 @@ WRITE8_MEMBER( mbee_state::mbee256_50_w ) WRITE8_MEMBER( mbee_state::mbee128_50_w ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); // primary low banks membank("boot")->set_entry((data & 3)); diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c index a26f9cfb3e3..66645020ddb 100644 --- a/src/mess/machine/pc.c +++ b/src/mess/machine/pc.c @@ -1409,7 +1409,7 @@ static READ8_HANDLER( input_port_0_r ) { return space->machine().root_device().i DRIVER_INIT_MEMBER(pc_state,pc1640) { - address_space *io_space = machine().firstcpu->memory().space( AS_IO ); + address_space *io_space = machine().firstcpu->space( AS_IO ); io_space->install_legacy_read_handler(0x278, 0x27b, FUNC(pc1640_port278_r), 0xffff); io_space->install_legacy_read_handler(0x4278, 0x427b, FUNC(pc1640_port4278_r), 0xffff); diff --git a/src/mess/machine/sorcerer.c b/src/mess/machine/sorcerer.c index b1f89e5365c..be679d5192f 100644 --- a/src/mess/machine/sorcerer.c +++ b/src/mess/machine/sorcerer.c @@ -361,7 +361,7 @@ MACHINE_START( sorcerer ) UINT16 endmem = 0xbfff; - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); /* configure RAM */ switch (state->m_ram->size()) { @@ -389,7 +389,7 @@ MACHINE_START( sorcererd ) UINT16 endmem = 0xbbff; - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); /* configure RAM */ switch (state->m_ram->size()) { diff --git a/src/mess/machine/special.c b/src/mess/machine/special.c index 2270a07c306..f76236d856e 100644 --- a/src/mess/machine/special.c +++ b/src/mess/machine/special.c @@ -137,7 +137,7 @@ READ8_MEMBER( special_state::specimx_video_color_r ) void special_state::specimx_set_bank(offs_t i, UINT8 data) { - address_space *space = m_maincpu->memory().space(AS_PROGRAM); + address_space *space = m_maincpu->space(AS_PROGRAM); UINT8 *ram = m_ram->pointer(); space->install_write_bank(0xc000, 0xffbf, "bank3"); @@ -276,7 +276,7 @@ void special_state::erik_set_bank() UINT8 bank4 = (m_RR_register >> 6) & 3; UINT8 *mem = memregion("maincpu")->base(); UINT8 *ram = m_ram->pointer(); - address_space *space = m_maincpu->memory().space(AS_PROGRAM); + address_space *space = m_maincpu->space(AS_PROGRAM); space->install_write_bank(0x0000, 0x3fff, "bank1"); space->install_write_bank(0x4000, 0x8fff, "bank2"); diff --git a/src/mess/machine/ti85.c b/src/mess/machine/ti85.c index aa2b5734a0f..e20dd77cef5 100644 --- a/src/mess/machine/ti85.c +++ b/src/mess/machine/ti85.c @@ -60,7 +60,7 @@ static void update_ti85_memory (running_machine &machine) static void update_ti83p_memory (running_machine &machine) { ti85_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); if (state->m_ti8x_memory_page_1 & 0x40) { @@ -84,7 +84,7 @@ static void update_ti83p_memory (running_machine &machine) static void update_ti86_memory (running_machine &machine) { ti85_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); if (state->m_ti8x_memory_page_1 & 0x40) { @@ -113,7 +113,7 @@ static void update_ti86_memory (running_machine &machine) MACHINE_START( ti81 ) { ti85_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); state->m_bios = state->memregion("bios")->base(); state->m_timer_interrupt_mask = 0; @@ -152,7 +152,7 @@ MACHINE_RESET( ti85 ) MACHINE_START( ti83p ) { ti85_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); state->m_bios = state->memregion("bios")->base(); state->m_timer_interrupt_mask = 0; @@ -191,7 +191,7 @@ MACHINE_START( ti83p ) MACHINE_START( ti86 ) { ti85_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); state->m_bios = state->memregion("bios")->base(); state->m_timer_interrupt_mask = 0; @@ -612,7 +612,7 @@ static void ti8x_snapshot_setup_registers (running_machine &machine, UINT8 * dat static void ti85_setup_snapshot (running_machine &machine, UINT8 * data) { ti85_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); int i; unsigned char lo,hi; unsigned char * hdw = data + 0x8000 + 0x94; diff --git a/src/mess/machine/trs80.c b/src/mess/machine/trs80.c index 9eedfe17f81..7daa1ff887e 100644 --- a/src/mess/machine/trs80.c +++ b/src/mess/machine/trs80.c @@ -216,7 +216,7 @@ WRITE8_MEMBER( trs80_state::trs80m4_84_w ) d0 Select bit 0 */ /* get address space instead of io space */ - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); UINT8 *base = memregion("maincpu")->base(); m_mode = (m_mode & 0x73) | (data & 0x8c); @@ -561,7 +561,7 @@ WRITE8_MEMBER( trs80_state::lnw80_fe_w ) d0 inverse video (entire screen) */ /* get address space instead of io space */ - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); m_mode = (m_mode & 0x87) | ((data & 0x0f) << 3); @@ -867,7 +867,7 @@ MACHINE_RESET( trs80 ) MACHINE_RESET( trs80m4 ) { trs80_state *state = machine.driver_data(); - address_space *mem = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = state->m_maincpu->space(AS_PROGRAM); state->m_cassette_data = 0; mem->install_read_bank (0x0000, 0x0fff, "bank1"); @@ -896,7 +896,7 @@ MACHINE_RESET( trs80m4 ) MACHINE_RESET( lnw80 ) { trs80_state *state = machine.driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); state->m_cassette_data = 0; state->m_reg_load = 1; state->lnw80_fe_w(*space, 0, 0); diff --git a/src/mess/machine/wswan.c b/src/mess/machine/wswan.c index f8b83615038..e17a396b549 100644 --- a/src/mess/machine/wswan.c +++ b/src/mess/machine/wswan.c @@ -357,7 +357,7 @@ READ8_MEMBER( wswan_state::wswan_port_r ) WRITE8_MEMBER( wswan_state::wswan_port_w ) { - address_space *mem = m_maincpu->memory().space(AS_PROGRAM); + address_space *mem = m_maincpu->space(AS_PROGRAM); wswan_state *state = machine().driver_data(); UINT8 input; logerror( "PC=%X: port write %02X <- %02X\n", mem->device().safe_pc(), offset, data ); diff --git a/src/mess/video/atarist.c b/src/mess/video/atarist.c index d062d35d04f..5e6212ee924 100644 --- a/src/mess/video/atarist.c +++ b/src/mess/video/atarist.c @@ -180,7 +180,7 @@ static TIMER_CALLBACK( atarist_shifter_tick ) inline void st_state::shifter_load() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT16 data = program->read_word(m_shifter_ofs); m_shifter_ir[m_shifter_bitplane] = data; @@ -619,7 +619,7 @@ WRITE8_MEMBER( ste_state::shifter_pixelofs_w ) void st_state::blitter_source() { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT16 data = program->read_word(m_blitter_src); if (m_blitter_src_inc_x < 0) @@ -669,7 +669,7 @@ UINT16 st_state::blitter_hop() void st_state::blitter_op(UINT16 s, UINT32 dstaddr, UINT16 mask) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); UINT16 d = program->read_word(dstaddr); UINT16 result = 0; diff --git a/src/mess/video/isa_cga.c b/src/mess/video/isa_cga.c index 997d7c59366..7ead903cb62 100644 --- a/src/mess/video/isa_cga.c +++ b/src/mess/video/isa_cga.c @@ -1595,7 +1595,7 @@ WRITE8_MEMBER( isa8_cga_device::io_write ) // TODO: This should be moved to card implementations that actually had this feature m_p3df = data; if (data & 1) { - address_space *space_prg = machine().firstcpu->memory().space(AS_PROGRAM); + address_space *space_prg = machine().firstcpu->space(AS_PROGRAM); space_prg->install_readwrite_handler(0xb8000, 0xb87ff, read8_delegate( FUNC(isa8_cga_device::char_ram_read), this), write8_delegate(FUNC(isa8_cga_device::char_ram_write), this) ); } else { @@ -2013,7 +2013,7 @@ void isa8_cga_pc1512_device::device_start() m_isa->install_device(0x3d0, 0x3df, 0, 0, read8_delegate( FUNC(isa8_cga_pc1512_device::io_read), this ), write8_delegate( FUNC(isa8_cga_pc1512_device::io_write), this ) ); m_isa->install_bank(0xb8000, 0xbbfff, 0, 0, "bank1", m_vram); - address_space *space = machine().firstcpu->memory().space( AS_PROGRAM ); + address_space *space = machine().firstcpu->space( AS_PROGRAM ); space->install_write_handler( 0xb8000, 0xbbfff, 0, 0x0C000, write8_delegate( FUNC(isa8_cga_pc1512_device::vram_w), this ) ); } diff --git a/src/mess/video/newbrain.c b/src/mess/video/newbrain.c index bbe25093598..221ea918c27 100644 --- a/src/mess/video/newbrain.c +++ b/src/mess/video/newbrain.c @@ -15,7 +15,7 @@ void newbrain_state::video_start() void newbrain_state::screen_update(bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space *program = m_maincpu->memory().space(AS_PROGRAM); + address_space *program = m_maincpu->space(AS_PROGRAM); int y, sx; int columns = (m_tvctl & NEWBRAIN_VIDEO_80L) ? 80 : 40; diff --git a/src/mess/video/pc_aga.c b/src/mess/video/pc_aga.c index b5432f00b5b..7d6dbef092a 100644 --- a/src/mess/video/pc_aga.c +++ b/src/mess/video/pc_aga.c @@ -689,9 +689,9 @@ void pc_aga_set_mode(running_machine &machine, AGA_MODE mode) VIDEO_START( pc_aga ) { - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); - address_space *spaceio = machine.firstcpu->memory().space(AS_IO); - int buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + address_space *space = machine.firstcpu->space(AS_PROGRAM); + address_space *spaceio = machine.firstcpu->space(AS_IO); + int buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; switch(buswidth) { case 8: @@ -720,9 +720,9 @@ VIDEO_START( pc_aga ) VIDEO_START( pc200 ) { - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); - address_space *spaceio = machine.firstcpu->memory().space(AS_IO); - int buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + address_space *space = machine.firstcpu->space(AS_PROGRAM); + address_space *spaceio = machine.firstcpu->space(AS_IO); + int buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; switch(buswidth) { case 8: diff --git a/src/mess/video/pc_t1t.c b/src/mess/video/pc_t1t.c index 69c56a5252f..79a16814dc2 100644 --- a/src/mess/video/pc_t1t.c +++ b/src/mess/video/pc_t1t.c @@ -922,15 +922,15 @@ static WRITE_LINE_DEVICE_HANDLER( pcjr_vsync_changed ) static VIDEO_START( pc_t1t ) { int buswidth; - address_space *space = machine.firstcpu->memory().space(AS_PROGRAM); - address_space *spaceio = machine.firstcpu->memory().space(AS_IO); + address_space *space = machine.firstcpu->space(AS_PROGRAM); + address_space *spaceio = machine.firstcpu->space(AS_IO); pcjr.chr_gen = machine.root_device().memregion("gfx1")->base(); pcjr.update_row = NULL; pcjr.bank = 0; pcjr.chr_size = 16; - buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; switch(buswidth) { case 8: @@ -953,7 +953,7 @@ static VIDEO_START( pc_t1t ) static VIDEO_START( pc_pcjr ) { int buswidth; - address_space *spaceio = machine.firstcpu->memory().space(AS_IO); + address_space *spaceio = machine.firstcpu->space(AS_IO); pcjr.chr_gen = machine.root_device().memregion("gfx1")->base(); pcjr.update_row = NULL; @@ -961,7 +961,7 @@ static VIDEO_START( pc_pcjr ) pcjr.mode_control = 0x08; pcjr.chr_size = 8; - buswidth = machine.firstcpu->memory().space_config(AS_PROGRAM)->m_databus_width; + buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width; switch(buswidth) { case 8: diff --git a/src/mess/video/ti85.c b/src/mess/video/ti85.c index 135283053c0..480c637660b 100644 --- a/src/mess/video/ti85.c +++ b/src/mess/video/ti85.c @@ -151,7 +151,7 @@ VIDEO_START( ti85 ) SCREEN_UPDATE_IND16( ti85 ) { ti85_state *state = screen.machine().driver_data(); - address_space *space = state->m_maincpu->memory().space(AS_PROGRAM); + address_space *space = state->m_maincpu->space(AS_PROGRAM); int x,y,b; int brightnes; int lcdmem;