fix rsp branching (#1341)

This commit is contained in:
Logan McNaughton authored and GitHub committed 2026-11-03 21:24:48 +00:00
1 parent 3a038ca508
commit 0f911ae491
2 files changed
+47 -71

No files matched your search

+42 -66
View File
@@ -140,6 +140,30 @@ fn get_vpr128(vpr: __m128i) -> u128 {
unsafe { std::mem::transmute::<__m128i, u128>(vpr) }
}
// A branch or jump in the delay slot of a taken branch is ignored.
// Execution continues at the first branch's target.
fn branch(device: &mut device::Device, opcode: u32, taken: bool) {
if device::rsp_cpu::in_delay_slot_taken(device) {
return;
}
if taken {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
}
fn link(device: &mut device::Device, reg: usize) {
device.rsp.cpu.gpr[reg] = if device::rsp_cpu::in_delay_slot_taken(device) {
(device.rsp.cpu.branch_state.pc + 4) & 0xFFF
} else {
(device.rsp.regs2[device::rsp_interface::SP_PC_REG] + 8) & 0xFFF
}
}
pub fn j(device: &mut device::Device, opcode: u32) {
if device::rsp_cpu::in_delay_slot_taken(device) {
return;
@@ -167,47 +191,23 @@ pub fn jal(device: &mut device::Device, opcode: u32) {
}
pub fn beq(device: &mut device::Device, opcode: u32) {
if device.rsp.cpu.gpr[rs(opcode) as usize] == device.rsp.cpu.gpr[rt(opcode) as usize] {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
let taken = device.rsp.cpu.gpr[rs(opcode) as usize] == device.rsp.cpu.gpr[rt(opcode) as usize];
branch(device, opcode, taken)
}
pub fn bne(device: &mut device::Device, opcode: u32) {
if device.rsp.cpu.gpr[rs(opcode) as usize] != device.rsp.cpu.gpr[rt(opcode) as usize] {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
let taken = device.rsp.cpu.gpr[rs(opcode) as usize] != device.rsp.cpu.gpr[rt(opcode) as usize];
branch(device, opcode, taken)
}
pub fn blez(device: &mut device::Device, opcode: u32) {
if device.rsp.cpu.gpr[rs(opcode) as usize] as i32 <= 0 {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
let taken = device.rsp.cpu.gpr[rs(opcode) as usize] as i32 <= 0;
branch(device, opcode, taken)
}
pub fn bgtz(device: &mut device::Device, opcode: u32) {
if device.rsp.cpu.gpr[rs(opcode) as usize] as i32 > 0 {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
let taken = device.rsp.cpu.gpr[rs(opcode) as usize] as i32 > 0;
branch(device, opcode, taken)
}
pub fn addi(device: &mut device::Device, opcode: u32) {
@@ -502,49 +502,25 @@ pub fn sltu(device: &mut device::Device, opcode: u32) {
}
pub fn bltz(device: &mut device::Device, opcode: u32) {
if (device.rsp.cpu.gpr[rs(opcode) as usize] as i32) < 0 {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
let taken = (device.rsp.cpu.gpr[rs(opcode) as usize] as i32) < 0;
branch(device, opcode, taken)
}
pub fn bgez(device: &mut device::Device, opcode: u32) {
if device.rsp.cpu.gpr[rs(opcode) as usize] as i32 >= 0 {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
let taken = device.rsp.cpu.gpr[rs(opcode) as usize] as i32 >= 0;
branch(device, opcode, taken)
}
pub fn bltzal(device: &mut device::Device, opcode: u32) {
if (device.rsp.cpu.gpr[rs(opcode) as usize] as i32) < 0 {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
device.rsp.cpu.gpr[31] = (device.rsp.regs2[device::rsp_interface::SP_PC_REG] + 8) & 0xFFF
let taken = (device.rsp.cpu.gpr[rs(opcode) as usize] as i32) < 0;
link(device, 31);
branch(device, opcode, taken)
}
pub fn bgezal(device: &mut device::Device, opcode: u32) {
if (device.rsp.cpu.gpr[rs(opcode) as usize] as i32) >= 0 {
device.rsp.cpu.branch_state.state = device::cpu::State::Take;
device.rsp.cpu.branch_state.pc = device.rsp.regs2[device::rsp_interface::SP_PC_REG]
.wrapping_add(se16(imm(opcode) as i16) << 2)
+ 4;
} else {
device.rsp.cpu.branch_state.state = device::cpu::State::NotTaken;
}
device.rsp.cpu.gpr[31] = (device.rsp.regs2[device::rsp_interface::SP_PC_REG] + 8) & 0xFFF
let taken = (device.rsp.cpu.gpr[rs(opcode) as usize] as i32) >= 0;
link(device, 31);
branch(device, opcode, taken)
}
pub fn mfc0(device: &mut device::Device, opcode: u32) {
+5 -5
View File
@@ -51,17 +51,17 @@ fn set_vertical_interrupt(device: &mut device::Device) {
fn set_current_line(device: &mut device::Device) {
if let Some(next_vi) = device::events::get_event(device, device::events::EVENT_TYPE_VI) {
device.vi.regs[VI_CURRENT_REG] = ((device.vi.delay.saturating_sub(
let lines = ((device.vi.delay.saturating_sub(
next_vi
.count
.saturating_sub(device.cpu.cop0.regs[device::cop0::COP0_COUNT_REG]),
)) / device.vi.count_per_scanline) as u32;
)) / device.vi.count_per_scanline)
.min(device.vi.regs[VI_V_SYNC_REG] as u64) as u32;
// the VI interrupt fires when VI_CURRENT reaches V_INTR, so count from there.
// wrap around VI_CURRENT_REG if needed, a field is V_SYNC + 1 lines
device.vi.regs[VI_CURRENT_REG] = (device.vi.regs[VI_CURRENT_REG]
+ (device.vi.regs[VI_V_INTR_REG] & 0x3FF))
% (device.vi.regs[VI_V_SYNC_REG] + 1);
device.vi.regs[VI_CURRENT_REG] =
(lines + (device.vi.regs[VI_V_INTR_REG] & 0x3FF)) % (device.vi.regs[VI_V_SYNC_REG] + 1);
}
/* update current field */
device.vi.regs[VI_CURRENT_REG] = (device.vi.regs[VI_CURRENT_REG] & !1) | device.vi.field;