A GameCube/Wii emulator and debugger written in Rust.
fix gx fifo redirection
Laylef65b4457d562
diff --git a/README.md b/README.mdindex 6f4185c..7a4f1d7 100644--- a/README.md+++ b/README.md@@ -5,5 +5,6 @@ short term todolist- [ ] Fix idle detection for CPU- [ ] Implement mailbox polling detection for DSP?- [ ] HLE? IDK if ever a goal+- [ ] FIFO TokensJIT via Cranelift\ No newline at end of filediff --git a/crates/gecko/src/dvd.rs b/crates/gecko/src/dvd.rsindex c057061..c01a91f 100644--- a/crates/gecko/src/dvd.rs+++ b/crates/gecko/src/dvd.rs@@ -311,7 +311,7 @@ impl crate::gamecube::GameCube {pub fn close_cover(&mut self) {tracing::debug!("DVD drive cover closed");- self.di.cover = self.di.cover.with_cover_status(false);+ self.di.cover = self.di.cover.with_cover_status(false).with_cover_interrupt(false);self.check_di_interrupts();}}diff --git a/crates/gecko/src/dvd/regs.rs b/crates/gecko/src/dvd/regs.rsindex 3d535ac..4a0ed1a 100644--- a/crates/gecko/src/dvd/regs.rs+++ b/crates/gecko/src/dvd/regs.rs@@ -194,4 +194,4 @@ impl MmioAccess<DvdInterface> for DiConfigurationRegister {fn write(self, _di: &mut DvdInterface) {// Read-only}-}\ No newline at end of file+}diff --git a/crates/gecko/src/flipper/ai/regs.rs b/crates/gecko/src/flipper/ai/regs.rsindex 753d36d..765401e 100644--- a/crates/gecko/src/flipper/ai/regs.rs+++ b/crates/gecko/src/flipper/ai/regs.rs@@ -108,4 +108,4 @@ crate::mmio_register! {#[bits(0..=30)]pub sample_count: u32,}-}\ No newline at end of file+}diff --git a/crates/gecko/src/flipper/dsp.rs b/crates/gecko/src/flipper/dsp.rsindex 2241c22..f093820 100644--- a/crates/gecko/src/flipper/dsp.rs+++ b/crates/gecko/src/flipper/dsp.rs@@ -45,6 +45,8 @@ pub struct Dsp {pub aram_dma_mmio_addr: regs::AramDmaMmioAddr,pub aram_dma_aram_addr: regs::AramDmaAramAddr,pub aram_dma_control: regs::AramDmaControl,+ pub audio_dma_start_addr: regs::AudioDmaStartAddr,+ pub audio_dma_control: regs::AudioDmaControl,// IFX Registerspub dma_control: core::regs::DspDmaControl,@@ -56,6 +58,7 @@ pub struct Dsp {// Flags set by register write handlers, consumed by process_pending_dmapub pending_aram_dma: bool,pub pending_dsp_dma: bool,+ pub pending_audio_dma: bool,pub pending_ucode_upload: bool,}@@ -87,11 +90,14 @@ impl Dsp {aram_dma_mmio_addr: regs::AramDmaMmioAddr::from_raw(0),aram_dma_aram_addr: regs::AramDmaAramAddr::from_raw(0),aram_dma_control: regs::AramDmaControl::from_raw(0),+ audio_dma_start_addr: regs::AudioDmaStartAddr::from_raw(0),+ audio_dma_control: regs::AudioDmaControl::from_raw(0),dma_control: core::regs::DspDmaControl::new(),dma_length: 0,dma_dsp_addr: 0,dma_ram_addr_hi: 0,dma_ram_addr_lo: 0,+ pending_audio_dma: false,pending_aram_dma: false,pending_dsp_dma: false,pending_ucode_upload: false,@@ -105,6 +111,11 @@ impl Dsp {self.process_aram_dma(mmio);}+ if self.pending_audio_dma {+ self.pending_audio_dma = false;+ self.process_audio_dma(mmio);+ }+if self.pending_ucode_upload {self.pending_ucode_upload = false;self.process_ucode_upload(mmio);@@ -124,24 +135,39 @@ impl Dsp {"ARAM DMA");- if aram_addr + count > self.aram.len() {- // TODO: should we raise interrupt anyways?- // This happens during apploader and the console supports- // expanded memory shit, so maybe it detects a DEV unit?- tracing::error!("ARAM DMA out of bounds, ignored");- return;+ let within_bounds = aram_addr + count <= self.aram.len();+ match self.aram_dma_control.direction() {+ regs::DmaDirection::AramToRam if within_bounds => {+ let src = &self.aram[aram_addr..aram_addr + count];+ let dst = mmio.virt_slice_mut(ram_addr as u32, count);+ dst.copy_from_slice(src);+ }+ regs::DmaDirection::RamToAram if within_bounds => {+ let src = mmio.virt_slice(ram_addr as u32, count);+ self.aram[aram_addr..aram_addr + count].copy_from_slice(&src);+ }+ _ => tracing::warn!("Ignoring out-of-bounds ARAM DMA transfer"),}- if self.aram_dma_control.direction() == regs::DmaDirection::AramToRam {- let src = &self.aram[aram_addr..aram_addr + count];- let dst = mmio.virt_slice_mut(ram_addr as u32, count);- dst.copy_from_slice(src);- } else {- let src = mmio.virt_slice(ram_addr as u32, count);- self.aram[aram_addr..aram_addr + count].copy_from_slice(&src);+ self.aram_dma_control.set_count(0);+ self.csr.set_dma_status(false);+ self.csr = self.csr.with_ar_interrupt(true);+ }++ fn process_audio_dma(&mut self, _mmio: &mut Mmio) {+ if !self.audio_dma_control.play() {+ return;}- self.csr = self.csr.with_ar_interrupt(true);+ let addr = self.audio_dma_start_addr.raw();+ let len = self.audio_dma_control.length() as u32 * 32;++ tracing::debug!(addr = format!("{addr:08X}"), len, "Audio DMA");++ // TODO: actually stream samples to audio output+ self.audio_dma_control.set_length(0);+ self.csr.set_dma_status(false);+ self.csr.set_ai_interrupt(true);}fn process_ucode_upload(&mut self, mmio: &mut Mmio) {@@ -155,6 +181,9 @@ impl Dsp {count = UCODE_SIZE,"DSP stub uploaded from RAM to IRAM, executing IRAM");++ self.csr.set_dma_status(false);+ self.csr.set_dsp_interrupt(true);}fn process_dsp_dma(&mut self, mmio: &mut Mmio) {@@ -206,18 +235,66 @@ impl GameCube {let buf = [(w0 >> 8) as u8, w0 as u8, (w1 >> 8) as u8, w1 as u8];let instr = Instruction::from_be_bytes(&buf);self.dsp.registers.cia = self.dsp.registers.pc;- self.dsp.registers.nia = self.dsp.registers.cia.wrapping_add(lut::instr_size(instr) as u16);+ let natural_nia = self.dsp.registers.cia.wrapping_add(lut::instr_size(instr) as u16);+ self.dsp.registers.nia = natural_nia;++ // Save state before main instruction so extensions read pre-instruction values.+ // Extensions see the old accumulators and status (for saturation/sign-extension).+ let has_ext = instr.ext_opcode().is_some();+ let saved = if has_ext {+ Some((+ self.dsp.registers.ac0_high,+ self.dsp.registers.ac0_mid,+ self.dsp.registers.ac0_low,+ self.dsp.registers.ac1_high,+ self.dsp.registers.ac1_mid,+ self.dsp.registers.ac1_low,+ self.dsp.registers.status,+ ))+ } else {+ None+ };lut::dispatch(self, instr);- // Dispatch extension opcode if present+ // Dispatch extension opcode if present.+ // Extensions read accumulator/status values from BEFORE the main instruction.if let Some(ext) = instr.ext_opcode() {let ext = instruction::GcDspExt(ext);- lut::dispatch_gc_dsp_ext(self, ext);+ if let Some((h0, m0, l0, h1, m1, l1, old_sr)) = saved {+ let new_ac = (+ self.dsp.registers.ac0_high,+ self.dsp.registers.ac0_mid,+ self.dsp.registers.ac0_low,+ self.dsp.registers.ac1_high,+ self.dsp.registers.ac1_mid,+ self.dsp.registers.ac1_low,+ );+ let new_sr = self.dsp.registers.status;+ self.dsp.registers.ac0_high = h0;+ self.dsp.registers.ac0_mid = m0;+ self.dsp.registers.ac0_low = l0;+ self.dsp.registers.ac1_high = h1;+ self.dsp.registers.ac1_mid = m1;+ self.dsp.registers.ac1_low = l1;+ self.dsp.registers.status = old_sr;++ lut::dispatch_gc_dsp_ext(self, ext);++ self.dsp.registers.ac0_high = new_ac.0;+ self.dsp.registers.ac0_mid = new_ac.1;+ self.dsp.registers.ac0_low = new_ac.2;+ self.dsp.registers.ac1_high = new_ac.3;+ self.dsp.registers.ac1_mid = new_ac.4;+ self.dsp.registers.ac1_low = new_ac.5;+ self.dsp.registers.status = new_sr;+ }}- // Check if we've reached the end of a loop- if !self.dsp.registers.loop_addr.is_empty() && self.dsp.registers.nia == self.dsp.registers.loop_addr.top() {+ // Check if we've reached the end of a loop.+ let at_loop_end =+ !self.dsp.registers.loop_addr.is_empty() && self.dsp.registers.nia == self.dsp.registers.loop_addr.top();+ if at_loop_end {let counter = self.dsp.registers.loop_counter.top().wrapping_sub(1);if counter != 0 {self.dsp.registers.loop_counter.set_top(counter);@@ -266,6 +343,8 @@ impl MmioRw for Dsp {regs::AramDmaMmioAddr,regs::AramDmaAramAddr,regs::AramDmaControl,+ regs::AudioDmaStartAddr,+ regs::AudioDmaControl,);}diff --git a/crates/gecko/src/flipper/dsp/core.rs b/crates/gecko/src/flipper/dsp/core.rsindex cb9b9a6..1db424e 100644--- a/crates/gecko/src/flipper/dsp/core.rs+++ b/crates/gecko/src/flipper/dsp/core.rs@@ -315,7 +315,10 @@ impl Registers {}self.ac1_mid}- _ => unreachable!(),+ _ => {+ tracing::error!(index, "DSP read: invalid register index");+ 0+ }}}@@ -399,7 +402,9 @@ impl Registers {self.ac1_low = 0;}}- _ => unreachable!(),+ _ => {+ tracing::error!(index, "DSP write: invalid register index");+ }}}}diff --git a/crates/gecko/src/flipper/dsp/regs.rs b/crates/gecko/src/flipper/dsp/regs.rsindex 959882c..e8f2c8c 100644--- a/crates/gecko/src/flipper/dsp/regs.rs+++ b/crates/gecko/src/flipper/dsp/regs.rs@@ -251,6 +251,35 @@ crate::mmio_register! {AramDmaAramAddr: u32 @ 0xCC005024 => Dsp.aram_dma_aram_addr {}}+// 0xCC005030 4 [W] Audio DMA Start Address (High + Low)++crate::mmio_register! {+ AudioDmaStartAddr: u32 @ 0xCC005030 => Dsp.audio_dma_start_addr {}+}++// 0xCC005036 2 [W] Audio DMA Control/Length++crate::mmio_register! {+ AudioDmaControl: u16 @ 0xCC005036 {+ #[bits(0..=14)]+ pub length: u16,++ #[bits(15)]+ pub play: bool,+ }+}++impl MmioAccess<super::Dsp> for AudioDmaControl {+ fn read(dsp: &super::Dsp) -> Self {+ dsp.audio_dma_control+ }++ fn write(self, dsp: &mut super::Dsp) {+ dsp.audio_dma_control = self;+ dsp.pending_audio_dma = true;+ }+}+// 0xCC005028 4 [R/W] ARAM DMA Count/Control#[derive(BitEnum, Debug, PartialEq, Eq)]diff --git a/crates/gecko/src/flipper/pi.rs b/crates/gecko/src/flipper/pi.rsindex 6e61566..936c083 100644--- a/crates/gecko/src/flipper/pi.rs+++ b/crates/gecko/src/flipper/pi.rs@@ -18,8 +18,6 @@ pub struct ProcessorInterface {pub fifo_end: u32,/// CPU FIFO write pointer (32-byte aligned)pub fifo_wptr: u32,- /// The initial FIFO base set by GX_Init (0 = not yet set)- initial_fifo_base: u32,}/// Bitmask constants for each PI interrupt source@@ -50,13 +48,14 @@ impl ProcessorInterface {fifo_base: 0,fifo_end: 0,fifo_wptr: 0,- initial_fifo_base: 0,}}- /// Returns true when the CPU FIFO is redirected to a display list buffer- pub fn is_fifo_redirected(&self) -> bool {- self.initial_fifo_base != 0 && self.fifo_base != self.initial_fifo_base+ pub fn advance_fifo_wptr(&mut self, nbytes: u32) {+ self.fifo_wptr = self.fifo_wptr.wrapping_add(nbytes);+ if self.fifo_end != 0 && self.fifo_wptr >= self.fifo_end {+ self.fifo_wptr = self.fifo_base;+ }}pub fn assert_interrupt(&mut self, flag: InterruptFlag) {@@ -89,10 +88,6 @@ impl MmioRw for ProcessorInterface {match offset {PI_FIFO_BASE_OFFSET => {self.fifo_base = val;- // Record the first FIFO base as the "normal" GX FIFO- if self.initial_fifo_base == 0 {- self.initial_fifo_base = val;- }}PI_FIFO_END_OFFSET => {self.fifo_end = val;diff --git a/crates/gecko/src/mmio/bus.rs b/crates/gecko/src/mmio/bus.rsindex bda3134..ea819b0 100644--- a/crates/gecko/src/mmio/bus.rs+++ b/crates/gecko/src/mmio/bus.rs@@ -347,11 +347,10 @@ impl GameCube {self.check_ai_interrupts();}BusTarget::Gx => {- if self.pi.is_fifo_redirected() {- let wptr = self.pi.fifo_wptr as usize;- self.mmio.ram[wptr] = val;- self.pi.fifo_wptr = self.pi.fifo_wptr.wrapping_add(1);- } else {+ let wptr = self.pi.fifo_wptr as usize;+ self.mmio.ram[wptr] = val;+ self.pi.advance_fifo_wptr(1);+ if self.cp.control.gp_link_enable() {self.gx.mmio_write_u8(&mut self.mmio, val);self.check_gx_pe_finish();}@@ -409,12 +408,11 @@ impl GameCube {self.check_ai_interrupts();}BusTarget::Gx => {- if self.pi.is_fifo_redirected() {- let wptr = self.pi.fifo_wptr as usize;- let bytes = val.to_be_bytes();- self.mmio.ram[wptr..wptr + 2].copy_from_slice(&bytes);- self.pi.fifo_wptr = self.pi.fifo_wptr.wrapping_add(2);- } else {+ let wptr = self.pi.fifo_wptr as usize;+ let bytes = val.to_be_bytes();+ self.mmio.ram[wptr..wptr + 2].copy_from_slice(&bytes);+ self.pi.advance_fifo_wptr(2);+ if self.cp.control.gp_link_enable() {self.gx.mmio_write_u16(&mut self.mmio, val);self.check_gx_pe_finish();}@@ -472,12 +470,11 @@ impl GameCube {self.check_ai_interrupts();}BusTarget::Gx => {- if self.pi.is_fifo_redirected() {- let wptr = self.pi.fifo_wptr as usize;- let bytes = val.to_be_bytes();- self.mmio.ram[wptr..wptr + 4].copy_from_slice(&bytes);- self.pi.fifo_wptr = self.pi.fifo_wptr.wrapping_add(4);- } else {+ let wptr = self.pi.fifo_wptr as usize;+ let bytes = val.to_be_bytes();+ self.mmio.ram[wptr..wptr + 4].copy_from_slice(&bytes);+ self.pi.advance_fifo_wptr(4);+ if self.cp.control.gp_link_enable() {self.gx.mmio_write_u32(&mut self.mmio, val);self.check_gx_pe_finish();}diff --git a/crates/gecko/src/scheduler.rs b/crates/gecko/src/scheduler.rsindex 1a6c41c..3cb0c64 100644--- a/crates/gecko/src/scheduler.rs+++ b/crates/gecko/src/scheduler.rs@@ -39,10 +39,7 @@ impl Scheduler {/// This may later be updated if an event is scheduled sooner than the current target.#[inline(always)]pub fn update_deadline(&mut self) {- self.next_deadline = self- .events- .peek()- .map_or(self.cycles, |Reverse((d, _))| *d);+ self.next_deadline = self.events.peek().map_or(self.cycles, |Reverse((d, _))| *d);}pub fn timebase(&self) -> u64 {