A GameCube/Wii emulator and debugger written in Rust.
fifo desync finally fixed: wpar reset :') writing to wpar must discrd the partial write gather buffer, remaining bytes were spilling into new displaylists lol
Layle9b6d7dc333b5
diff --git a/crates/gecko/src/flipper/cp.rs b/crates/gecko/src/flipper/cp.rsindex e62c717..f239786 100644--- a/crates/gecko/src/flipper/cp.rs+++ b/crates/gecko/src/flipper/cp.rs@@ -217,28 +217,28 @@ pub fn gather_pipe_bursted<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {let linked = sys.cp.control.gp_link_enable();while sys.cp.gather_pos >= GP_BURST {+ let wptr = sys.pi.fifo_wptr;++ let mut burst = [0u8; GP_BURST as usize];+ burst.copy_from_slice(&sys.cp.gather_pipe[..GP_BURST as usize]);++ match sys.mmio.ram_view_mut().slice_mut(wptr as usize, GP_BURST as usize) {+ Some(dst) => dst.copy_from_slice(&burst),+ None => tracing::warn!(+ wptr = format!("{wptr:#010X}"),+ "gather_pipe_bursted: PI fifo_wptr unmapped"+ ),+ }++ let advanced = wptr.wrapping_add(GP_BURST);+ let next_wptr = if sys.pi.fifo_end != 0 && advanced >= sys.pi.fifo_end {+ sys.pi.fifo_base+ } else {+ advanced+ };++ sys.pi.fifo_wptr = next_wptr;if linked {- let wptr = sys.pi.fifo_wptr;-- let mut burst = [0u8; GP_BURST as usize];- burst.copy_from_slice(&sys.cp.gather_pipe[..GP_BURST as usize]);-- match sys.mmio.ram_view_mut().slice_mut(wptr as usize, GP_BURST as usize) {- Some(dst) => dst.copy_from_slice(&burst),- None => tracing::warn!(- wptr = format!("{wptr:#010X}"),- "gather_pipe_bursted: PI fifo_wptr unmapped"- ),- }-- let advanced = wptr.wrapping_add(GP_BURST);- let next_wptr = if sys.pi.fifo_end != 0 && advanced >= sys.pi.fifo_end {- sys.pi.fifo_base- } else {- advanced- };-- sys.pi.fifo_wptr = next_wptr;sys.cp.set_fifo_write_ptr(next_wptr);sys.cp.set_fifo_rw_distance(sys.cp.fifo_rw_distance().saturating_add(GP_BURST));diff --git a/crates/gecko/src/gekko/interpreter/system.rs b/crates/gecko/src/gekko/interpreter/system.rsindex 7016a6f..12a876b 100644--- a/crates/gecko/src/gekko/interpreter/system.rs+++ b/crates/gecko/src/gekko/interpreter/system.rs@@ -43,6 +43,10 @@ pub fn spr<const OP: u32, const SYSTEM: SystemId>(ctx: &mut System<SYSTEM>, inst}284 => ctx.scheduler.set_timebase_lower(val),285 => ctx.scheduler.set_timebase_upper(val),+ 921 => {+ ctx.gekko.spr.wpar = val & !1;+ ctx.cp.gather_pos = 0;+ }923 => {ctx.gekko.spr.dmal = crate::gekko::spr::DmaLower::from_raw(val);if ctx.gekko.spr.dmal.trigger() {diff --git a/crates/gecko/src/gekko/jit/abi.rs b/crates/gecko/src/gekko/jit/abi.rsindex 343417b..e879e5e 100644--- a/crates/gecko/src/gekko/jit/abi.rs+++ b/crates/gecko/src/gekko/jit/abi.rs@@ -237,7 +237,6 @@ pub fn spr_field_offset<const SYSTEM: SystemId>(spr_num: u16) -> Option<usize> {918 => offset_of!(Spr, gqr6),919 => offset_of!(Spr, gqr7),920 => offset_of!(Spr, hid2),- 921 => offset_of!(Spr, wpar),936 => offset_of!(Spr, ummcr0),937 => offset_of!(Spr, upmc1),938 => offset_of!(Spr, upmc2),diff --git a/crates/gecko/src/gekko/jit/runtime.rs b/crates/gecko/src/gekko/jit/runtime.rsindex 4b6041b..b4e0776 100644--- a/crates/gecko/src/gekko/jit/runtime.rs+++ b/crates/gecko/src/gekko/jit/runtime.rs@@ -204,6 +204,10 @@ fn write_spr<const SYSTEM: SystemId>(sys: *mut System<SYSTEM>, num: u32, val: u3}284 => sys.scheduler.set_timebase_lower(val),285 => sys.scheduler.set_timebase_upper(val),+ 921 => {+ sys.gekko.spr.wpar = val & !1;+ sys.cp.gather_pos = 0;+ }923 => {sys.gekko.spr.dmal = crate::gekko::spr::DmaLower::from_raw(val);if sys.gekko.spr.dmal.trigger() {