From a26b8561caf4dd4889217d67ff5a33c59655fbaa Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:32:29 +0000 Subject: [PATCH] improve MI repeat mode (#1368) * improve MI repeat mode * more --- src/device/mi.rs | 18 ++---------- src/device/rdram.rs | 68 +++++++++++++++++++++++++-------------------- src/savestates.rs | 3 ++ 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/src/device/mi.rs b/src/device/mi.rs index 6ddb8795..fa44d420 100644 --- a/src/device/mi.rs +++ b/src/device/mi.rs @@ -77,25 +77,11 @@ fn update_init_mode(device: &mut device::Device, w: u32) { device.mi.regs[MI_INIT_MODE_REG] |= w & MI_INIT_LENGTH_MASK; if w & MI_CLR_INIT != 0 { - for item in device - .memory - .memory_map_write - .iter_mut() - .take(0x3F00000 >> 16) - { - *item = device::rdram::write_mem; - } + device::rdram::set_write_handler(device, device::rdram::write_mem); device.mi.regs[MI_INIT_MODE_REG] &= !MI_INIT_MODE } if w & MI_SET_INIT != 0 { - for item in device - .memory - .memory_map_write - .iter_mut() - .take(0x3F00000 >> 16) - { - *item = device::rdram::write_mem_repeat; - } + device::rdram::set_write_handler(device, device::rdram::write_mem_repeat); device.mi.regs[MI_INIT_MODE_REG] |= MI_INIT_MODE } if w & MI_CLR_EBUS != 0 { diff --git a/src/device/rdram.rs b/src/device/rdram.rs index b799e350..6b9ebf7d 100644 --- a/src/device/rdram.rs +++ b/src/device/rdram.rs @@ -94,45 +94,53 @@ pub fn write_mem(device: &mut device::Device, address: u64, value: u32, mask: u3 .copy_from_slice(&data.to_ne_bytes()); } -pub fn write_mem_repeat(device: &mut device::Device, address: u64, value: u32, mask: u32) { - if mask != 0xFFFFFFFF { - panic!("RDRAM write_mem_repeat called with mask {:#x}", mask); - } - - let repeat_length = - (device.mi.regs[device::mi::MI_INIT_MODE_REG] & device::mi::MI_INIT_LENGTH_MASK) + 1; - - if !repeat_length.is_multiple_of(4) { - panic!( - "RDRAM write_mem_repeat called with non-word-aligned length {}", - repeat_length - ); - } - - let masked_address = address as usize & RDRAM_MASK; - - ui::video::check_rdram_write(masked_address as u32, repeat_length); - - for i in (0..repeat_length as usize).step_by(4) { - device - .rdram - .mem - .get_mut(masked_address + i..masked_address + i + 4) - .unwrap_or(&mut [0; 4]) - .copy_from_slice(&value.to_ne_bytes()); - } - - device.mi.regs[device::mi::MI_INIT_MODE_REG] &= !device::mi::MI_INIT_MODE; +pub fn set_write_handler( + device: &mut device::Device, + handler: fn(&mut device::Device, u64, u32, u32), +) { for item in device .memory .memory_map_write .iter_mut() .take(0x3F00000 >> 16) { - *item = device::rdram::write_mem; + *item = handler; } } +pub fn write_mem_repeat(device: &mut device::Device, address: u64, value: u32, mask: u32) { + if mask != 0xFFFFFFFF { + panic!("RDRAM write_mem_repeat called with mask {:#x}", mask); + } + + let length = ((device.mi.regs[device::mi::MI_INIT_MODE_REG] & device::mi::MI_INIT_LENGTH_MASK) + + 1) as usize; + let masked_address = address as usize & RDRAM_MASK; + + ui::video::check_rdram_write(masked_address as u32, length.next_multiple_of(4) as u32); + + for offset in (0..length).step_by(4) { + let remaining = length - offset; + let word_mask = if remaining >= 4 { + 0xFFFFFFFF + } else { + 0xFFFFFFFF << (8 * (4 - remaining)) + }; + if let Some(word) = device + .rdram + .mem + .get_mut(masked_address + offset..masked_address + offset + 4) + { + let mut data = u32::from_ne_bytes(word.try_into().unwrap()); + device::memory::masked_write_32(&mut data, value, word_mask); + word.copy_from_slice(&data.to_ne_bytes()); + } + } + + device.mi.regs[device::mi::MI_INIT_MODE_REG] &= !device::mi::MI_INIT_MODE; + set_write_handler(device, write_mem); +} + pub fn read_regs( device: &mut device::Device, address: u64, diff --git a/src/savestates.rs b/src/savestates.rs index 2f40a5b0..3dd49d0e 100644 --- a/src/savestates.rs +++ b/src/savestates.rs @@ -319,6 +319,9 @@ pub fn load_savestate(device: &mut device::Device, rewind: bool, rewind_frame: O } device::memory::init(device); + if device.mi.regs[device::mi::MI_INIT_MODE_REG] & device::mi::MI_INIT_MODE != 0 { + device::rdram::set_write_handler(device, device::rdram::write_mem_repeat); + } device::vi::set_expected_refresh_rate(device); device::cpu::map_instructions(device); device::cop0::map_instructions(device);