diff --git a/src/device/exceptions.rs b/src/device/exceptions.rs index 5ae2b6f2..e5103457 100644 --- a/src/device/exceptions.rs +++ b/src/device/exceptions.rs @@ -166,7 +166,6 @@ pub fn reset_event(device: &mut device::Device) { device.cpu.cop0.regs[device::cop0::COP0_ERROREPC_REG] = device.cpu.pc; device.cpu.pc = 0xBFC00000; device.cpu.branch_state.state = device::cpu::State::Step; - device.rsp.regs2[device::rsp_interface::SP_PC_REG] = 0; device::pif::reset_pif(device, true); diff --git a/src/device/rsp_cpu.rs b/src/device/rsp_cpu.rs index 04decb23..0fb51863 100644 --- a/src/device/rsp_cpu.rs +++ b/src/device/rsp_cpu.rs @@ -126,7 +126,7 @@ pub fn run(device: &mut device::Device) -> u64 { device.rsp.cpu.broken = false; device.rsp.cpu.cycle_counter = 0; device.rsp.cpu.running = true; - while !device.rsp.cpu.sync_point { + loop { device.rsp.cpu.instruction_type = InstructionType::Su; device.rsp.cpu.gpr[0] = 0; // gpr 0 is read only @@ -188,6 +188,10 @@ pub fn run(device: &mut device::Device) -> u64 { device.rsp.cpu.pipeline_full = true; } } + + if device.rsp.cpu.sync_point { + break; + } } device.rsp.cpu.running = false; elapsed_cpu_cycles(device) diff --git a/src/device/rsp_interface.rs b/src/device/rsp_interface.rs index 2469ed84..7076819f 100644 --- a/src/device/rsp_interface.rs +++ b/src/device/rsp_interface.rs @@ -363,6 +363,8 @@ pub fn write_regs2(device: &mut device::Device, address: u64, value: u32, mask: value & 0xFFC, mask, ); + // writing SP_PC resets the pipeline, discarding any pending branch + device.rsp.cpu.branch_state.state = device::cpu::State::Step; } _ => device::memory::masked_write_32(&mut device.rsp.regs2[reg as usize], value, mask), } @@ -481,7 +483,8 @@ fn update_sp_status(device: &mut device::Device, w: u32) { } fn do_task(device: &mut device::Device) { - device.rsp.cpu.sync_point = false; + // single-step mode: the burst ends after one instruction + device.rsp.cpu.sync_point = device.rsp.regs[SP_STATUS_REG] & SP_STATUS_SSTEP != 0; device.rsp.last_status_value = 0; device.rdp.last_status_value = 0; if device.rsp.regs[SP_DMA_BUSY_REG] == 1 { @@ -513,6 +516,11 @@ pub fn rsp_event(device: &mut device::Device) { if device.rsp.regs[SP_STATUS_REG] & SP_STATUS_HALT != 0 { return; } + // single-step mode: the RSP halts itself after each instruction + if device.rsp.regs[SP_STATUS_REG] & SP_STATUS_SSTEP != 0 { + device.rsp.regs[SP_STATUS_REG] |= SP_STATUS_HALT; + return; + } do_task(device) }