From 9d65a9af1ae8e38fa07964692527f003f353f570 Mon Sep 17 00:00:00 2001 From: hap Date: Thu, 24 Mar 2022 18:41:30 +0100 Subject: rw18r: fix page 2 rom load --- src/devices/cpu/b5000/b5000.cpp | 4 ++-- src/devices/cpu/b5000/b5000base.cpp | 10 +++++----- src/devices/cpu/b5000/b5000op.cpp | 2 +- src/mame/drivers/hh_b5000.cpp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/devices/cpu/b5000/b5000.cpp b/src/devices/cpu/b5000/b5000.cpp index f599b4dbd61..7b12495fadd 100644 --- a/src/devices/cpu/b5000/b5000.cpp +++ b/src/devices/cpu/b5000/b5000.cpp @@ -34,8 +34,8 @@ b5000_cpu_device::b5000_cpu_device(const machine_config &mconfig, const char *ta // internal memory maps void b5000_cpu_device::program_448x8(address_map &map) { - map(0x000, 0x07f).rom(); - map(0x0c0, 0x1ff).rom(); + map(0x000, 0x0bf).rom(); + map(0x100, 0x1ff).rom(); } void b5000_cpu_device::data_45x4(address_map &map) diff --git a/src/devices/cpu/b5000/b5000base.cpp b/src/devices/cpu/b5000/b5000base.cpp index 828f5de6b71..cb7b376d6a5 100644 --- a/src/devices/cpu/b5000/b5000base.cpp +++ b/src/devices/cpu/b5000/b5000base.cpp @@ -210,15 +210,15 @@ void b5000_base_device::execute_run() // some opcodes delay RAM address adjustment for 1 cycle m_ram_addr = (m_bu << 4 & 0x30) | (m_bl & 0xf); - if (m_bu_delay) - { - m_ram_addr = (m_ram_addr & 0xf) | (m_prev_bu << 4 & 0x30); - m_bu_delay = false; - } if (m_bl_delay) { m_ram_addr = (m_ram_addr & ~0xf) | (m_prev_bl & 0xf); m_bl_delay = false; } + if (m_bu_delay) + { + m_ram_addr = (m_ram_addr & 0xf) | (m_prev_bu << 4 & 0x30); + m_bu_delay = false; + } } } diff --git a/src/devices/cpu/b5000/b5000op.cpp b/src/devices/cpu/b5000/b5000op.cpp index 4c489a25383..9806dc2866d 100644 --- a/src/devices/cpu/b5000/b5000op.cpp +++ b/src/devices/cpu/b5000/b5000op.cpp @@ -29,7 +29,7 @@ void b5000_cpu_device::set_bu(u8 bu) m_bu = bu & 3; // changing to or from 0 delays RAM address modification - if ((m_bu && !m_prev_bu) || (!m_bu && m_prev_bu)) + if (bool(m_bu) != bool(m_prev_bu)) m_bu_delay = true; } diff --git a/src/mame/drivers/hh_b5000.cpp b/src/mame/drivers/hh_b5000.cpp index 0ace5bca68d..71c06cb9aee 100644 --- a/src/mame/drivers/hh_b5000.cpp +++ b/src/mame/drivers/hh_b5000.cpp @@ -703,8 +703,8 @@ void rw18r_state::rw18r(machine_config &config) ROM_START( rw18r ) ROM_REGION( 0x200, "maincpu", ROMREGION_ERASE00 ) - ROM_LOAD( "b5000cc", 0x000, 0x080, CRC(ace32614) SHA1(23cf11acf2e73ce2dfc165cb87f86fab15f69ff7) ) - ROM_CONTINUE( 0x0c0, 0x140 ) + ROM_LOAD( "b5000cc", 0x000, 0x0c0, CRC(ace32614) SHA1(23cf11acf2e73ce2dfc165cb87f86fab15f69ff7) ) + ROM_CONTINUE( 0x100, 0x100 ) ROM_END -- cgit v1.2.3