From 1dbaaae99921c080ab5f7859fb314545d8c80803 Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Thu, 1 Apr 2021 18:06:31 +0700 Subject: r4000: physical address space is 36 bits --- src/devices/cpu/mips/r4000.h | 6 +++--- src/mame/drivers/jazz.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/devices/cpu/mips/r4000.h b/src/devices/cpu/mips/r4000.h index a2dad69ba6a..18012d2a546 100644 --- a/src/devices/cpu/mips/r4000.h +++ b/src/devices/cpu/mips/r4000.h @@ -17,7 +17,7 @@ public: enum config_mask : u32 { CONFIG_K0 = 0x00000007, // kseg0 cache coherency - CONFIG_CU = 0x00000080, // store conditional cache coherent + CONFIG_CU = 0x00000008, // store conditional cache coherent CONFIG_DB = 0x00000010, // primary d-cache line 32 bytes CONFIG_IB = 0x00000020, // primary i-cache line 32 bytes CONFIG_DC = 0x000001c0, // primary d-cache size @@ -388,8 +388,8 @@ protected: address_space_config m_program_config_be; // memory access helpers - memory_access<64, 3, 0, ENDIANNESS_LITTLE>::cache m_le; - memory_access<64, 3, 0, ENDIANNESS_BIG>::cache m_be; + memory_access<36, 3, 0, ENDIANNESS_LITTLE>::cache m_le; + memory_access<36, 3, 0, ENDIANNESS_BIG>::cache m_be; std::function read_byte; std::function read_word; diff --git a/src/mame/drivers/jazz.cpp b/src/mame/drivers/jazz.cpp index 9bb393016ad..3f37a2dc605 100644 --- a/src/mame/drivers/jazz.cpp +++ b/src/mame/drivers/jazz.cpp @@ -282,8 +282,7 @@ static void jazz_scsi_devices(device_slot_interface &device) void jazz_state::jazz(machine_config &config) { - // FIXME: slow the cpu clock to get past session manager bugcheck - R4000(config, m_cpu, 50_MHz_XTAL / 5); + R4000(config, m_cpu, 50_MHz_XTAL); m_cpu->set_addrmap(0, &jazz_state::cpu_map); RAM(config, m_ram); -- cgit v1.2.3