A GameCube/Wii emulator and debugger written in Rust.
dsp works with IPL ntsc (bootup)
Layle4fc4f4199ff3
diff --git a/crates/dspemu/src/main.rs b/crates/dspemu/src/main.rsindex caad170..73e0523 100644--- a/crates/dspemu/src/main.rs+++ b/crates/dspemu/src/main.rs@@ -101,12 +101,13 @@ fn main() {let pc = emu.dsp.registers.pc;if args.trace {- let bytes = &emu.dsp.iram[pc as usize * 2..];- if let Some((insn, _)) = GcDspInstruction::decode(bytes) {+ let w0 = emu.dsp.read_imem(pc);+ let w1 = emu.dsp.read_imem(pc.wrapping_add(1));+ let bytes = [(w0 >> 8) as u8, w0 as u8, (w1 >> 8) as u8, w1 as u8];+ if let Some((insn, _)) = GcDspInstruction::decode(&bytes) {println!("{pc:04X} {insn}");} else {- let w = u16::from_be_bytes([bytes[0], bytes[1]]);- println!("{pc:04X} .word {w:#06x}");+ println!("{pc:04X} .word {w0:#06x}");}}diff --git a/crates/gecko/src/flipper/dsp.rs b/crates/gecko/src/flipper/dsp.rsindex b6e3b03..bdc50dd 100644--- a/crates/gecko/src/flipper/dsp.rs+++ b/crates/gecko/src/flipper/dsp.rs@@ -143,6 +143,7 @@ impl Dsp {}impl GameCube {+ #[inline(always)]pub fn tick_dsp(&mut self) {if self.dsp.csr.reset() || self.dsp.csr.halt() {return;diff --git a/crates/gecko/src/flipper/dsp/core.rs b/crates/gecko/src/flipper/dsp/core.rsindex c504f46..088249e 100644--- a/crates/gecko/src/flipper/dsp/core.rs+++ b/crates/gecko/src/flipper/dsp/core.rs@@ -1,5 +1,41 @@use chapa::BitEnum;+/// DSP register indices for `Registers::read` / `Registers::write`.+pub mod reg {+ pub const AR0: u8 = 0;+ pub const AR1: u8 = 1;+ pub const AR2: u8 = 2;+ pub const AR3: u8 = 3;+ pub const IX0: u8 = 4;+ pub const IX1: u8 = 5;+ pub const IX2: u8 = 6;+ pub const IX3: u8 = 7;+ pub const WR0: u8 = 8;+ pub const WR1: u8 = 9;+ pub const WR2: u8 = 10;+ pub const WR3: u8 = 11;+ pub const ST0: u8 = 12;+ pub const ST1: u8 = 13;+ pub const ST2: u8 = 14;+ pub const ST3: u8 = 15;+ pub const AC0H: u8 = 16;+ pub const AC1H: u8 = 17;+ pub const CONFIG: u8 = 18;+ pub const SR: u8 = 19;+ pub const PRODL: u8 = 20;+ pub const PRODM1: u8 = 21;+ pub const PRODH: u8 = 22;+ pub const PRODM2: u8 = 23;+ pub const AX0L: u8 = 24;+ pub const AX1L: u8 = 25;+ pub const AX0H: u8 = 26;+ pub const AX1H: u8 = 27;+ pub const AC0L: u8 = 28;+ pub const AC1L: u8 = 29;+ pub const AC0M: u8 = 30;+ pub const AC1M: u8 = 31;+}+pub struct DspStack<const N: usize> {data: [u16; N],ptr: u8,@@ -82,6 +118,44 @@ impl Registers {((raw as i64) << 24) >> 24}+ /// Write a 40-bit value (masked to 40 bits) into accumulator `idx` (0 or 1).+ #[inline(always)]+ pub fn set_ac(&mut self, idx: u8, val: i64) {+ let v = val as u64 & 0xFF_FFFF_FFFF;+ let high = (v >> 32) as u16;+ let mid = (v >> 16) as u16;+ let low = v as u16;+ match idx {+ 0 => {+ self.ac0_high = high;+ self.ac0_mid = mid;+ self.ac0_low = low;+ }+ 1 => {+ self.ac1_high = high;+ self.ac1_mid = mid;+ self.ac1_low = low;+ }+ _ => unreachable!(),+ }+ }++ /// Update flags based on a 40-bit accumulator result: TB, S32, S, AZ.+ #[inline(always)]+ pub fn update_flags_ac(&mut self, result: i64) {+ let r40 = result as u64 & 0xFF_FFFF_FFFF;+ let sign = (r40 >> 39) & 1 != 0;+ let zero = r40 == 0;+ let upper9 = (r40 >> 31) & 0x1FF;+ let above_s32 = upper9 != 0 && upper9 != 0x1FF;+ let tb = ((r40 >> 39) & 1) == ((r40 >> 38) & 1);++ self.status.set_s(sign);+ self.status.set_z(zero);+ self.status.set_as32(above_s32);+ self.status.set_tb(tb);+ }+/// Update flags based on a 40-bit result of subtraction./// Sets: OS, TB, S32, S, AZ, O, C.#[inline(always)]diff --git a/crates/gecko/src/flipper/dsp/interpreter.rs b/crates/gecko/src/flipper/dsp/interpreter.rsindex ec078f8..f03b619 100644--- a/crates/gecko/src/flipper/dsp/interpreter.rs+++ b/crates/gecko/src/flipper/dsp/interpreter.rs@@ -1,6 +1,6 @@use crate::flipper::dsp::{condition::BranchControl,- core::{SignExtensionMode, StatusRegister},+ core::{SignExtensionMode, StatusRegister, reg},lut::*,};@@ -63,9 +63,39 @@ pub fn cmp_test<const OP: u32>(OP_TSTAXH => todo!("tstaxh"),OP_NX_0 => todo!("nx_0"),OP_NX_1 => todo!("nx_1"),- OP_CLR => todo!("clr"),- OP_CLRP => todo!("clrp"),- OP_CLRL => todo!("clrl"),+ OP_CLR => {+ let r = instr.r_4_4();+ // Clear all three parts of the accumulator+ ctx.dsp.registers.write::<false>(reg::AC0H + r, 0);+ ctx.dsp.registers.write::<false>(reg::AC0L + r, 0);+ ctx.dsp.registers.write::<false>(reg::AC0M + r, 0);++ ctx.dsp.registers.status.set_tb(true);+ ctx.dsp.registers.status.set_as32(false);+ ctx.dsp.registers.status.set_s(false);+ ctx.dsp.registers.status.set_z(true);+ ctx.dsp.registers.status.set_o(false);+ ctx.dsp.registers.status.set_c(false);+ }+ OP_CLRP => {+ ctx.dsp.registers.product_low = 0x0000;+ ctx.dsp.registers.product_mid1 = 0xFFF0;+ ctx.dsp.registers.product_high = 0x00FF;+ ctx.dsp.registers.product_mid2 = 0x0010;+ }+ OP_CLRL => {+ let r = instr.r_4_4();+ let ac = ctx.dsp.registers.ac(r);+ let rounded = if (ac & 0x10000) != 0 {+ (ac.wrapping_add(0x8000)) & !0xFFFF+ } else {+ (ac.wrapping_add(0x7FFF)) & !0xFFFF+ };+ ctx.dsp.registers.set_ac(r, rounded);+ ctx.dsp.registers.update_flags_ac(rounded);+ ctx.dsp.registers.status.set_o(false);+ ctx.dsp.registers.status.set_c(false);+ }_ => unreachable!(),}}@@ -86,9 +116,26 @@ pub fn control<const OP: u32>(OP_HALT => {ctx.dsp.csr.set_halt(true);}- OP_IFCC => todo!("ifcc"),- OP_CALLCC => todo!("callcc"),- OP_RETCC => todo!("retcc"),+ OP_IFCC => {+ let branch_control = BranchControl::from(instr.cond());+ if !branch_control.evaluate(&ctx.dsp) {+ // Skip the next instruction+ ctx.dsp.registers.nia = ctx.dsp.registers.nia.wrapping_add(1);+ }+ }+ OP_CALLCC => {+ let branch_control = BranchControl::from(instr.cond());+ if branch_control.evaluate(&ctx.dsp) {+ ctx.dsp.registers.call_stack.push(ctx.dsp.registers.nia);+ ctx.dsp.registers.nia = instr.addr();+ }+ }+ OP_RETCC => {+ let branch_control = BranchControl::from(instr.cond());+ if branch_control.evaluate(&ctx.dsp) {+ ctx.dsp.registers.nia = ctx.dsp.registers.call_stack.pop();+ }+ }OP_RTICC => {let branch_control = BranchControl::from(instr.cond());if branch_control.evaluate(&ctx.dsp) {@@ -96,8 +143,19 @@ pub fn control<const OP: u32>(ctx.dsp.registers.nia = ctx.dsp.registers.call_stack.pop();}}- OP_JRCC => todo!("jrcc"),- OP_CALLRCC => todo!("callrcc"),+ OP_JRCC => {+ let branch_control = BranchControl::from(instr.cond());+ if branch_control.evaluate(&ctx.dsp) {+ ctx.dsp.registers.nia = ctx.dsp.registers.read::<true>(instr.reg_5_7());+ }+ }+ OP_CALLRCC => {+ let branch_control = BranchControl::from(instr.cond());+ if branch_control.evaluate(&ctx.dsp) {+ ctx.dsp.registers.call_stack.push(ctx.dsp.registers.nia);+ ctx.dsp.registers.nia = ctx.dsp.registers.read::<true>(instr.reg_5_7());+ }+ }_ => unreachable!(),}}@@ -172,9 +230,18 @@ pub fn load_store<const OP: u32>(OP_LRI => {ctx.dsp.registers.write::<true>(instr.d_11_15(), instr.imm_16_31());}- OP_LR => todo!("lr"),- OP_SR => todo!("sr"),- OP_MRR => todo!("mrr"),+ OP_LR => {+ let value = ctx.dsp.read_dmem(instr.imm_16_31());+ ctx.dsp.registers.write::<true>(instr.d_11_15(), value);+ }+ OP_SR => {+ let value = ctx.dsp.registers.read::<true>(instr.d_11_15());+ ctx.dsp.write_dmem(instr.imm_16_31(), value);+ }+ OP_MRR => {+ let value = ctx.dsp.registers.read::<true>(instr.src());+ ctx.dsp.registers.write::<true>(instr.dst(), value);+ }OP_SI => {let addr = 0xFF00 | (instr.mem_8_15_u16());ctx.dsp.write_dmem(addr, instr.imm_16_31());@@ -191,12 +258,19 @@ pub fn load_store<const OP: u32>(_ => {}}}- OP_SRR => todo!("srr"),- OP_SRRD => todo!("srrd"),- OP_SRRI => todo!("srri"),- OP_SRRN => todo!("srrn"),+ OP_SRR | OP_SRRD | OP_SRRI | OP_SRRN => {+ let d = instr.s_9_10() as usize;+ let value = ctx.dsp.registers.read::<true>(instr.d_11_15());+ ctx.dsp.write_dmem(ctx.dsp.registers.ar[d], value);+ match OP {+ OP_SRRD => ctx.dsp.registers.ar[d] = ctx.dsp.registers.ar[d].wrapping_sub(1),+ OP_SRRI => ctx.dsp.registers.ar[d] = ctx.dsp.registers.ar[d].wrapping_add(1),+ OP_SRRN => ctx.dsp.registers.ar[d] = ctx.dsp.registers.ar[d].wrapping_add(ctx.dsp.registers.ix[d]),+ _ => {}+ }+ }OP_LRS => {- let dst = 0x18 + instr.reg_5_7();+ let dst = reg::AX0L + instr.reg_5_7();let addr = ((ctx.dsp.registers.config as u16) << 8) | instr.mem_8_15_u16();let value = ctx.dsp.read_dmem(addr);ctx.dsp.registers.write::<true>(dst, value);@@ -206,12 +280,12 @@ pub fn load_store<const OP: u32>(let src = match OP {OP_SRSH => {if instr.s_7_7() != 0 {- 16+ reg::AC0H} else {- 17+ reg::AC1H}- } // ac0.h (16) or ac1.h (17)- OP_SRS => 0x1C + instr.reg_6_7(),+ }+ OP_SRS => reg::AC0L + instr.reg_6_7(),_ => unreachable!(),};let value = ctx.dsp.registers.read::<true>(src);@@ -219,7 +293,7 @@ pub fn load_store<const OP: u32>(}OP_ILRR | OP_ILRRD | OP_ILRRI | OP_ILRRN => {let src = instr.s_14_15() as usize;- let dst = if instr.d_7_7() != 0 { 31u8 } else { 30u8 }; // ac1.m or ac0.m+ let dst = if instr.d_7_7() != 0 { reg::AC1M } else { reg::AC0M };let value = ctx.dsp.read_imem(ctx.dsp.registers.ar[src]);ctx.dsp.registers.write::<true>(dst, value);match OP {@@ -410,15 +484,15 @@ pub fn ext_addr<const OP: u32>(ctx: &mut crate::gamecube::GameCube, instr: GcDsppub fn ext_mv(ctx: &mut crate::gamecube::GameCube, instr: GcDspExt) {let d = instr.d_4_5();let s = instr.s_6_7();- let value = ctx.dsp.registers.read::<true>(0x1C + s);- ctx.dsp.registers.write::<false>(0x18 + d, value);+ let value = ctx.dsp.registers.read::<true>(reg::AC0L + s);+ ctx.dsp.registers.write::<false>(reg::AX0L + d, value);}#[inline(always)]pub fn ext_store<const OP: u32>(ctx: &mut crate::gamecube::GameCube, instr: GcDspExt) {let s = instr.s_3_4();let d = instr.d_6_7() as usize;- let value = ctx.dsp.registers.read::<true>(0x1C + s);+ let value = ctx.dsp.registers.read::<true>(reg::AC0L + s);ctx.dsp.write_dmem(ctx.dsp.registers.ar[d], value);match OP {OP_EXT_S => ctx.dsp.registers.ar[d] = ctx.dsp.registers.ar[d].wrapping_add(1),@@ -432,7 +506,7 @@ pub fn ext_load<const OP: u32>(ctx: &mut crate::gamecube::GameCube, instr: GcDsplet d = instr.d_2_4();let s = instr.s_6_7() as usize;let value = ctx.dsp.read_dmem(ctx.dsp.registers.ar[s]);- ctx.dsp.registers.write::<false>(0x18 + d, value);+ ctx.dsp.registers.write::<false>(reg::AX0L + d, value);match OP {OP_EXT_L => ctx.dsp.registers.ar[s] = ctx.dsp.registers.ar[s].wrapping_add(1),OP_EXT_LN => ctx.dsp.registers.ar[s] = ctx.dsp.registers.ar[s].wrapping_add(ctx.dsp.registers.ix[s]),@@ -442,13 +516,13 @@ pub fn ext_load<const OP: u32>(ctx: &mut crate::gamecube::GameCube, instr: GcDsp#[inline(always)]pub fn ext_load_store<const OP: u32>(ctx: &mut crate::gamecube::GameCube, instr: GcDspExt) {- // 'LS: load from $ar0 into $(0x18+D), store $acS.m to $ar3- // 'SL: load from $ar3 into $(0x18+D), store $acS.m to $ar0- let store_val = ctx.dsp.registers.read::<true>(30 + instr.s_7_7()); // $acS.m+ // 'LS: load from $ar0 into $(AX0L+D), store $acS.m to $ar3+ // 'SL: load from $ar3 into $(AX0L+D), store $acS.m to $ar0+ let store_val = ctx.dsp.registers.read::<true>(reg::AC0M + instr.s_7_7()); // $acS.mlet is_sl = matches!(OP, OP_EXT_SL | OP_EXT_SLN | OP_EXT_SLM | OP_EXT_SLNM);let (load_ar, store_ar) = if is_sl { (3, 0) } else { (0, 3) };let load_val = ctx.dsp.read_dmem(ctx.dsp.registers.ar[load_ar]);- ctx.dsp.registers.write::<false>(0x18 + instr.d_2_3(), load_val);+ ctx.dsp.registers.write::<false>(reg::AX0L + instr.d_2_3(), load_val);ctx.dsp.write_dmem(ctx.dsp.registers.ar[store_ar], store_val);// Post-modify: N = ar0 += ix0, M = ar3 += ix3match OP {@@ -478,9 +552,9 @@ pub fn ext_ld<const OP: u32>(ctx: &mut crate::gamecube::GameCube, instr: GcDspExlet r = instr.r_3_3();let s = instr.s_6_7() as usize;let val_d = ctx.dsp.read_dmem(ctx.dsp.registers.ar[s]);- ctx.dsp.registers.write::<false>(0x18 + d * 2, val_d);+ ctx.dsp.registers.write::<false>(reg::AX0L + d * 2, val_d);let val_r = ctx.dsp.read_dmem(ctx.dsp.registers.ar[3]);- ctx.dsp.registers.write::<false>(0x19 + r * 2, val_r);+ ctx.dsp.registers.write::<false>(reg::AX0L + 1 + r * 2, val_r);match OP {OP_EXT_LD_00 => {ctx.dsp.registers.ar[s] = ctx.dsp.registers.ar[s].wrapping_add(1);diff --git a/crates/gecko/src/gamecube.rs b/crates/gecko/src/gamecube.rsindex a6e8ed5..7ea91c5 100644--- a/crates/gecko/src/gamecube.rs+++ b/crates/gecko/src/gamecube.rs@@ -206,9 +206,6 @@ impl GameCube {cpu::lut::dispatch(self, instr);self.scheduler.cycles += 1;- // Tick the DSP- self.tick_dsp();-// CPU post-hook#[cfg(feature = "scripting")]if self.script_hook_flags.contains(HookFlags::CPU_POST) {@@ -256,6 +253,12 @@ impl GameCube {while !self.vsync_pending {self.step();}++ // Run DSP in batches at 1:6 ratio+ let dsp_ticks = CYCLES_PER_VSYNC / 6;+ for _ in 0..dsp_ticks {+ self.tick_dsp();+ }}/// Read the instructions in `[start, end]` and check whether the loop is a