Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-28 11:11:48 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

mac: Fix regression in IIvx & IIvi. [R. Belmont]

Browse Source
This commit is contained in:
arbee 2016-11-28 21:21:16 -05:00
parent 211227ded1
commit 9ecdb791f6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mame/machine/mac.cpp
View File

@ -440,8 +440,8 @@ void mac_state::set_memory_overlay(int overlay)
mac_install_memory(0x00000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); mac_install_memory(0x00000000, memory_size-1, memory_size, memory_data, is_rom, "bank1");
} }
} }
else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100) || (m_model == MODEL_MAC_IIVX) || (m_model == MODEL_MAC_IIFX)) else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100) || (m_model == MODEL_MAC_IIFX))
{ {
address_space& space = m_maincpu->space(AS_PROGRAM); address_space& space = m_maincpu->space(AS_PROGRAM);
space.unmap_write(0x000000, 0x9fffff); space.unmap_write(0x000000, 0x9fffff);
mac_install_memory(0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); mac_install_memory(0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1");
@ -452,11 +452,11 @@ void mac_state::set_memory_overlay(int overlay)
space.unmap_write(0x000000, 0xffffff); space.unmap_write(0x000000, 0xffffff);
mac_install_memory(0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); mac_install_memory(0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1");
} }
else if ((m_model >= MODEL_MAC_II) && (m_model <= MODEL_MAC_SE30)) else if ((m_model >= MODEL_MAC_II) && (m_model <= MODEL_MAC_SE30) && (m_model != MODEL_MAC_IIVX) && (m_model != MODEL_MAC_IIVI))
{ {
mac_install_memory(0x00000000, 0x3fffffff, memory_size, memory_data, is_rom, "bank1"); mac_install_memory(0x00000000, 0x3fffffff, memory_size, memory_data, is_rom, "bank1");
} }
else if ((m_model == MODEL_MAC_LC_III) || (m_model == MODEL_MAC_LC_III_PLUS) || (m_model >= MODEL_MAC_LC_475 && m_model <= MODEL_MAC_LC_580)) // up to 36 MB else if ((m_model == MODEL_MAC_IIVX) || (m_model == MODEL_MAC_IIVI) || (m_model == MODEL_MAC_LC_III) || (m_model == MODEL_MAC_LC_III_PLUS) || (m_model >= MODEL_MAC_LC_475 && m_model <= MODEL_MAC_LC_580)) // up to 36 MB
{ {
mac_install_memory(0x00000000, memory_size-1, memory_size, memory_data, is_rom, "bank1"); mac_install_memory(0x00000000, memory_size-1, memory_size, memory_data, is_rom, "bank1");
@ -497,8 +497,8 @@ READ32_MEMBER(mac_state::rom_switch_r)
{ {
set_memory_overlay(0); set_memory_overlay(0);
} }
// printf("rom_switch_r: offset %08x ROM_size -1 = %08x, masked = %08x\n", offset, ROM_size-1, offset & ((ROM_size - 1)>>2)); //printf("rom_switch_r: offset %08x ROM_size -1 = %08x, masked = %08x\n", offset, ROM_size-1, offset & ((ROM_size - 1)>>2));
return ROM_data[offset & ((ROM_size - 1)>>2)]; return ROM_data[offset & ((ROM_size - 1)>>2)];
} }
@ -1966,6 +1966,10 @@ void mac_state::machine_reset()
{ {
m_overlay_timeout->adjust(attotime::never); m_overlay_timeout->adjust(attotime::never);
} }
else if ((m_model >= MODEL_MAC_IIVX) && (m_model <= MODEL_MAC_IIVI))
{
m_overlay_timeout->adjust(attotime::never);
}
else else
{ {
m_overlay_timeout->adjust(m_maincpu->cycles_to_attotime(8)); m_overlay_timeout->adjust(m_maincpu->cycles_to_attotime(8));