diff options
| author | 2026-04-29 20:24:47 +0200 | |
|---|---|---|
| committer | 2026-04-29 20:25:00 +0200 | |
| commit | db1e21d2dcfae39f93624fc57006260800ba443f (patch) | |
| tree | e2545c2c67fa1cdd6155b05df63467aa379555ae | |
| parent | 43faf9265bb1838682067d36ccbb11206c281c38 (diff) | |
(emu.h) dimemory: add remove_addrmap
| -rw-r--r-- | src/emu/dimemory.h | 1 | ||||
| -rw-r--r-- | src/mame/dynax/hnayayoi.cpp | 5 | ||||
| -rw-r--r-- | src/mame/kaneko/snowbros.cpp | 2 | ||||
| -rw-r--r-- | src/mame/pacman/pacman.cpp | 2 | ||||
| -rw-r--r-- | src/mame/pacman/pengo.cpp | 7 | ||||
| -rw-r--r-- | src/mame/sega/system16.cpp | 4 | ||||
| -rw-r--r-- | src/mame/seibu/stfight.cpp | 2 | ||||
| -rw-r--r-- | src/mame/seibu/wiz.cpp | 2 | ||||
| -rw-r--r-- | src/mame/sunelectronics/route16.cpp | 2 |
9 files changed, 14 insertions, 13 deletions
diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h index de04aaf9c29..3e35c014204 100644 --- a/src/emu/dimemory.h +++ b/src/emu/dimemory.h @@ -58,6 +58,7 @@ public: template <typename T, typename Ret, typename... Params> void set_addrmap(int spacenum, Ret (T::*func)(Params...)); void set_addrmap(int spacenum, address_map_constructor map); + void remove_addrmap(int spacenum) { set_addrmap(spacenum, address_map_constructor()); } // basic information getters bool has_space(int index = 0) const { return index >= 0 && index < int(m_addrspace.size()) && m_addrspace[index]; } diff --git a/src/mame/dynax/hnayayoi.cpp b/src/mame/dynax/hnayayoi.cpp index e057c555d5a..5ea69df12b6 100644 --- a/src/mame/dynax/hnayayoi.cpp +++ b/src/mame/dynax/hnayayoi.cpp @@ -1012,10 +1012,9 @@ void hnayayoi_state::hnfubuki(machine_config &config) { hnayayoi(config); m_maincpu->set_addrmap(AS_PROGRAM, &hnayayoi_state::hnfubuki_map); - m_maincpu->set_addrmap(AS_IO, address_map_constructor()); + m_maincpu->remove_addrmap(AS_IO); - // D5 - m_mainlatch->q_out_cb<4>().set(FUNC(hnayayoi_state::nmi_enable_w)); + m_mainlatch->q_out_cb<4>().set(FUNC(hnayayoi_state::nmi_enable_w)); // D5 } void untoucha_state::untoucha(machine_config &config) diff --git a/src/mame/kaneko/snowbros.cpp b/src/mame/kaneko/snowbros.cpp index d98a0ad0be3..4cf7df8b8a7 100644 --- a/src/mame/kaneko/snowbros.cpp +++ b/src/mame/kaneko/snowbros.cpp @@ -2000,7 +2000,7 @@ void semicom_state::semicom(machine_config &config) m_soundcpu->set_clock(XTAL(16'000'000)/4); /* 4MHz - Confirmed */ m_soundcpu->set_addrmap(AS_PROGRAM, &semicom_state::hyperpac_sound_map); - m_soundcpu->set_addrmap(AS_IO, address_map_constructor()); + m_soundcpu->remove_addrmap(AS_IO); m_pandora->set_gfxinfo(gfx_hyperpac_spr); diff --git a/src/mame/pacman/pacman.cpp b/src/mame/pacman/pacman.cpp index 9eb51bf2a3c..d9e521802b6 100644 --- a/src/mame/pacman/pacman.cpp +++ b/src/mame/pacman/pacman.cpp @@ -3776,7 +3776,7 @@ void pacman_state::birdiy(machine_config &config) // Basic machine hardware m_maincpu->set_addrmap(AS_PROGRAM, &pacman_state::birdiy_map); - m_maincpu->set_addrmap(AS_IO, address_map_constructor()); + m_maincpu->remove_addrmap(AS_IO); m_maincpu->remove_irq_acknowledge_callback(); m_mainlatch->q_out_cb<0>().set_nop(); diff --git a/src/mame/pacman/pengo.cpp b/src/mame/pacman/pengo.cpp index e4ad9cdb5fb..c7b4e2898df 100644 --- a/src/mame/pacman/pengo.cpp +++ b/src/mame/pacman/pengo.cpp @@ -354,6 +354,7 @@ void pengo_state::pengo(machine_config &config) // basic machine hardware m_maincpu->set_addrmap(AS_PROGRAM, &pengo_state::pengo_map); m_maincpu->set_addrmap(AS_OPCODES, &pengo_state::decrypted_opcodes_map); + m_maincpu->remove_addrmap(AS_IO); m_maincpu->remove_irq_acknowledge_callback(); m_mainlatch->q_out_cb<2>().set(FUNC(pengo_state::pengo_palettebank_w)); @@ -371,7 +372,8 @@ void pengo_state::pengo(machine_config &config) void pengo_state::pengou(machine_config &config) { pengo(config); - m_maincpu->set_addrmap(AS_OPCODES, address_map_constructor()); + + m_maincpu->remove_addrmap(AS_OPCODES); } void pengo_state::pengoe(machine_config &config) @@ -387,11 +389,10 @@ void pengo_state::pengoe(machine_config &config) void pengo_state::jrpacmbl(machine_config &config) { - pengo(config); + pengou(config); // basic machine hardware m_maincpu->set_addrmap(AS_PROGRAM, &pengo_state::jrpacmbl_map); - m_maincpu->set_addrmap(AS_OPCODES, address_map_constructor()); m_mainlatch->q_out_cb<4>().set(FUNC(pengo_state::jrpacman_bgpriority_w)); m_mainlatch->q_out_cb<5>().set(FUNC(pengo_state::jrpacman_spritebank_w)); diff --git a/src/mame/sega/system16.cpp b/src/mame/sega/system16.cpp index 610d5fb1773..666fda7090b 100644 --- a/src/mame/sega/system16.cpp +++ b/src/mame/sega/system16.cpp @@ -2306,7 +2306,7 @@ void segas1x_bootleg_state::goldnaxeb2(machine_config &config) /* basic machine hardware */ m_maincpu->set_addrmap(AS_PROGRAM, &segas1x_bootleg_state::goldnaxeb2_map); - m_maincpu->set_addrmap(AS_OPCODES, address_map_constructor()); + m_maincpu->remove_addrmap(AS_OPCODES); m_palette->set_entries(0x2000*SHADOW_COLORS_MULTIPLIER); @@ -2328,7 +2328,7 @@ void segas1x_bootleg_state::bayrouteb2(machine_config &config) /* basic machine hardware */ m_maincpu->set_addrmap(AS_PROGRAM, &segas1x_bootleg_state::bayrouteb2_map); - m_maincpu->set_addrmap(AS_OPCODES, address_map_constructor()); + m_maincpu->remove_addrmap(AS_OPCODES); datsu_ym2151_msm5205(config); diff --git a/src/mame/seibu/stfight.cpp b/src/mame/seibu/stfight.cpp index 1f9f85279ca..90fc2a880e2 100644 --- a/src/mame/seibu/stfight.cpp +++ b/src/mame/seibu/stfight.cpp @@ -794,7 +794,7 @@ void stfight_state::empcityubl(machine_config &config) { stfight(config); - m_maincpu->set_addrmap(AS_OPCODES, address_map_constructor()); + m_maincpu->remove_addrmap(AS_OPCODES); } void stfight_state::cshooter(machine_config &config) diff --git a/src/mame/seibu/wiz.cpp b/src/mame/seibu/wiz.cpp index d619cee41aa..f86fcfaa68a 100644 --- a/src/mame/seibu/wiz.cpp +++ b/src/mame/seibu/wiz.cpp @@ -1224,7 +1224,7 @@ void stinger_state::scion(machine_config &config) { stinger(config); - m_maincpu->set_addrmap(AS_OPCODES, address_map_constructor()); + m_maincpu->remove_addrmap(AS_OPCODES); // video hardware subdevice<screen_device>("screen")->set_visarea(2*8, 32*8-1, 2*8, 30*8-1); diff --git a/src/mame/sunelectronics/route16.cpp b/src/mame/sunelectronics/route16.cpp index a19150aeb15..c310d932790 100644 --- a/src/mame/sunelectronics/route16.cpp +++ b/src/mame/sunelectronics/route16.cpp @@ -1193,7 +1193,7 @@ void jongpute_state::jongpute(machine_config &config) { route16(config); m_cpu1->set_addrmap(AS_PROGRAM, &jongpute_state::jongpute_cpu1_map); - m_cpu1->set_addrmap(AS_IO, address_map_constructor()); + m_cpu1->remove_addrmap(AS_IO); // video hardware m_screen->set_screen_update(FUNC(jongpute_state::screen_update_stratvox)); |
