diff --git a/src/device/cpu_instructions.rs b/src/device/cpu_instructions.rs index 2be942e3..6496c9b7 100644 --- a/src/device/cpu_instructions.rs +++ b/src/device/cpu_instructions.rs @@ -147,7 +147,7 @@ pub fn addi(device: &mut device::Device, opcode: u32) { pub fn addiu(device: &mut device::Device, opcode: u32) { device.cpu.gpr[rt(opcode) as usize] = - se32(device.cpu.gpr[rs(opcode) as usize] as i32).wrapping_add(se16(imm(opcode) as i16)) + se32((device.cpu.gpr[rs(opcode) as usize] as i32).wrapping_add(imm(opcode) as i16 as i32)) } pub fn slti(device: &mut device::Device, opcode: u32) { diff --git a/src/device/events.rs b/src/device/events.rs index 82d3a2f1..98a68300 100644 --- a/src/device/events.rs +++ b/src/device/events.rs @@ -49,6 +49,7 @@ pub fn get_event(device: &device::Device, name: usize) -> Option<&Event> { pub fn remove_event(device: &mut device::Device, name: usize) { device.cpu.events[name].enabled = false; + set_next_event(device); } fn get_event_handler(name: usize) -> fn(&mut device::Device) { diff --git a/src/device/pi.rs b/src/device/pi.rs index 724a134e..dea4bf39 100644 --- a/src/device/pi.rs +++ b/src/device/pi.rs @@ -91,7 +91,7 @@ fn dma_write(device: &mut device::Device) { length += 1; } if length <= 0x80 { - length -= dram_addr & 0x7; + length = length.saturating_sub(dram_addr & 0x7); } // check RDP before PI writes to RDRAM