A GameCube/Wii emulator and debugger written in Rust.
audio dma buffer latching, cpu rendered intro video fix, mask aram dma addr and lengths to 32byte boundaries. fixes quack attack
Layle8c59b14298de
diff --git a/crates/gecko/src/flipper/ai.rs b/crates/gecko/src/flipper/ai.rsindex f306e34..09bb8fa 100644--- a/crates/gecko/src/flipper/ai.rs+++ b/crates/gecko/src/flipper/ai.rs@@ -74,8 +74,7 @@ pub fn start_audio_dma<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {}sys.scheduler.cancel(crate::scheduler::Handler::AiAudioDmaBlock);- sys.ai.audio_dma_remaining_blocks = blocks;- sys.ai.audio_dma_current_addr = sys.dsp.audio_dma_start_addr.raw();+ self::latch_audio_dma(sys);let addr = sys.dsp.audio_dma_start_addr.raw();let len = blocks as u32 * AUDIO_DMA_BLOCK_BYTES;@@ -88,6 +87,12 @@ pub fn start_audio_dma<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {);}+#[inline(always)]+fn latch_audio_dma<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {+ sys.ai.audio_dma_remaining_blocks = sys.dsp.audio_dma_control.length();+ sys.ai.audio_dma_current_addr = sys.dsp.audio_dma_start_addr.raw();+}+#[inline(always)]pub fn stop_audio_dma<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {sys.scheduler.cancel(crate::scheduler::Handler::AiAudioDmaBlock);@@ -103,8 +108,7 @@ pub fn audio_dma_block_handler<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>)}if sys.ai.audio_dma_remaining_blocks == 0 {- sys.ai.audio_dma_remaining_blocks = sys.dsp.audio_dma_control.length();- sys.ai.audio_dma_current_addr = sys.dsp.audio_dma_start_addr.raw();+ self::latch_audio_dma(sys);}if sys.ai.audio_dma_remaining_blocks == 0 {@@ -128,6 +132,7 @@ pub fn audio_dma_block_handler<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>)sys.ai.audio_dma_remaining_blocks -= 1;if sys.ai.audio_dma_remaining_blocks == 0 {+ self::latch_audio_dma(sys);sys.dsp.csr.set_ai_interrupt(true);dsp::refresh_interrupts(sys);diff --git a/crates/gecko/src/flipper/dsp.rs b/crates/gecko/src/flipper/dsp.rsindex bab7f59..04df5b1 100644--- a/crates/gecko/src/flipper/dsp.rs+++ b/crates/gecko/src/flipper/dsp.rs@@ -309,7 +309,7 @@ impl Dsp {}pub fn process_aram_dma<const SYSTEM: SystemId>(&mut self, mmio: &mut Mmio<SYSTEM>) {- let ram_addr = (self.aram_dma_mmio_addr.raw() & 0x3FFFFFFF) as usize;+ let ram_addr = self.aram_dma_mmio_addr.raw() as usize;let aram_addr = self.aram_dma_aram_addr.raw() as usize;let count = self.aram_dma_control.count() as usize;@@ -1086,9 +1086,12 @@ impl Dsp {self.aram_info = r.pod()?;self.aram_mode = r.pod()?;self.aram_refresh = r.pod()?;- self.aram_dma_mmio_addr = r.pod()?;- self.aram_dma_aram_addr = r.pod()?;- self.aram_dma_control = r.pod()?;+ let aram_dma_mmio_addr: regs::AramDmaMmioAddr = r.pod()?;+ let aram_dma_aram_addr: regs::AramDmaAramAddr = r.pod()?;+ let aram_dma_control: regs::AramDmaControl = r.pod()?;+ self.aram_dma_mmio_addr = regs::AramDmaMmioAddr::from_raw(aram_dma_mmio_addr.raw() & regs::ARAM_DMA_MASK);+ self.aram_dma_aram_addr = regs::AramDmaAramAddr::from_raw(aram_dma_aram_addr.raw() & regs::ARAM_DMA_MASK);+ self.aram_dma_control = regs::AramDmaControl::from_raw(aram_dma_control.raw() & regs::ARAM_DMA_CONTROL_MASK);self.audio_dma_start_addr = r.pod()?;self.audio_dma_control = r.pod()?;diff --git a/crates/gecko/src/flipper/dsp/regs.rs b/crates/gecko/src/flipper/dsp/regs.rsindex 5a42962..b6c9276 100644--- a/crates/gecko/src/flipper/dsp/regs.rs+++ b/crates/gecko/src/flipper/dsp/regs.rs@@ -276,7 +276,19 @@ crate::mmio_default_access!(AramRefresh => System.dsp.aram_refresh);#[derive(Copy, Clone, Debug)]pub struct AramDmaMmioAddr {}crate::mmio_reg!(AramDmaMmioAddr: u32 @ 0xCC005020);-crate::mmio_default_access!(AramDmaMmioAddr => System.dsp.aram_dma_mmio_addr);++pub(super) const ARAM_DMA_MASK: u32 = 0x03ff_ffe0;+pub(super) const ARAM_DMA_CONTROL_MASK: u32 = 0x8000_0000 | ARAM_DMA_MASK;++impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for AramDmaMmioAddr {+ fn read(sys: &mut System<SYSTEM>) -> Self {+ sys.dsp.aram_dma_mmio_addr+ }++ fn write(self, sys: &mut System<SYSTEM>, _: WriteMask) {+ sys.dsp.aram_dma_mmio_addr = Self::from_raw(self.raw() & ARAM_DMA_MASK);+ }+}// 0xCC005024 4 [R/W] ARAM DMA ARAM Address@@ -284,7 +296,16 @@ crate::mmio_default_access!(AramDmaMmioAddr => System.dsp.aram_dma_mmio_addr);#[derive(Copy, Clone, Debug)]pub struct AramDmaAramAddr {}crate::mmio_reg!(AramDmaAramAddr: u32 @ 0xCC005024);-crate::mmio_default_access!(AramDmaAramAddr => System.dsp.aram_dma_aram_addr);++impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for AramDmaAramAddr {+ fn read(sys: &mut System<SYSTEM>) -> Self {+ sys.dsp.aram_dma_aram_addr+ }++ fn write(self, sys: &mut System<SYSTEM>, _: WriteMask) {+ sys.dsp.aram_dma_aram_addr = Self::from_raw(self.raw() & ARAM_DMA_MASK);+ }+}// 0xCC005030 4 [W] Audio DMA Start Address (High + Low)@@ -373,7 +394,7 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for AramDmaControl {}fn write(self, sys: &mut System<SYSTEM>, mask: WriteMask) {- sys.dsp.aram_dma_control = self;+ sys.dsp.aram_dma_control = Self::from_raw(self.raw() & ARAM_DMA_CONTROL_MASK);if !mask.any(2, 4) {return;}diff --git a/crates/gecko/src/flipper/gx.rs b/crates/gecko/src/flipper/gx.rsindex 91f2990..8decaa4 100644--- a/crates/gecko/src/flipper/gx.rs+++ b/crates/gecko/src/flipper/gx.rs@@ -135,11 +135,22 @@ pub struct GraphicsProcessor {/// like Dolphin. `seen_present_seq` ages out dead regions. As seen in/// Another Code: R or whatever it's called, it builds each frame from a/// 230+228 line copy pair and showed a black seam plus a lagging bottom half.+#[derive(Clone, Copy, Default)]pub struct XfbRegion {pub stride: u32,pub first_seq: u64,pub copy_seq: u64,pub seen_present_seq: u64,+ pub ram_hash: Option<u64>,+ pub ram_generation: Option<u64>,+ pub width: u32,+ pub height: u32,+}++impl XfbRegion {+ pub fn ram_len(stride: u32, width: u32, height: u32) -> usize {+ stride as usize * height.saturating_sub(1) as usize + width as usize * 2+ }}// Drop regions that haven't been re-copied for a few frames so dead layouts@@ -272,7 +283,7 @@ pub fn present_xfb<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {if sys.gx.xfb_copy_seq == 0 {let base = sys.vi.latched_xfb_base;- self::present_raw_xfb(sys, base, frame_w, frame_h);+ self::present_raw_xfb(sys, base, frame_w, frame_h, frame_w * 2, frame_w, frame_h);return;}@@ -300,6 +311,29 @@ pub fn present_xfb<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {vi_base};+ if let Some(region) = sys.gx.xfb_regions.get(&frame_base).copied() {+ let ram = sys.mmio.ram_view();+ let ram_len = XfbRegion::ram_len(region.stride, region.width, region.height);+ let cpu_written = region.ram_generation != ram.range_generation(frame_base as usize, ram_len)+ || region.ram_hash.is_some_and(|hash| {+ ram.slice(frame_base as usize, ram_len)+ .is_some_and(|bytes| twox_hash::xxhash3_64::Hasher::oneshot(bytes) != hash)+ });++ if cpu_written {+ self::present_raw_xfb(+ sys,+ frame_base,+ frame_w,+ frame_h,+ region.stride,+ region.width,+ region.height,+ );+ return;+ }+ }+// Measure the page-flip cadence. Emission is paced to it further down.if frame_base != sys.gx.xfb_last_seen_base {sys.gx.xfb_prev_base = sys.gx.xfb_last_seen_base;@@ -492,29 +526,36 @@ pub fn present_xfb<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {sys.gx.xfb_last_present_base = frame_base;}-fn present_raw_xfb<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>, base: u32, width: u32, height: u32) {+fn present_raw_xfb<const SYSTEM: SystemId>(+ sys: &mut System<SYSTEM>,+ base: u32,+ width: u32,+ height: u32,+ stride: u32,+ source_width: u32,+ source_height: u32,+) {if base == 0 || width == 0 || height == 0 {return;}- let pixel_count = (width as usize) * (height as usize);- let mut pixels = vec![0u32; pixel_count];+ let mut pixels = vec![0xff00_0000u32; width as usize * height as usize];- let to_bgra = |y: f32, cb: f32, cr: f32| -> u32 {- let r = (1.164 * y + 1.596 * cr).clamp(0.0, 255.0) as u32;- let g = (1.164 * y - 0.813 * cr - 0.391 * cb).clamp(0.0, 255.0) as u32;- let b = (1.164 * y + 2.018 * cb).clamp(0.0, 255.0) as u32;- 0xFF00_0000 | (r << 16) | (g << 8) | b- };+ let copy_w = width.min(source_width) & !1;+ let copy_h = height.min(source_height);+ let ram = sys.mmio.ram_view();++ for y in 0..copy_h {+ let Some(row) = ram.slice((base + y * stride) as usize, copy_w as usize * 2) else {+ continue;+ };- for i in 0..pixel_count / 2 {- let word = sys.mmio.phys_read_u32(base + (i as u32) * 4);- let y0 = ((word >> 24) & 0xFF) as f32 - 16.0;- let cb = ((word >> 16) & 0xFF) as f32 - 128.0;- let y1 = ((word >> 8) & 0xFF) as f32 - 16.0;- let cr = (word & 0xFF) as f32 - 128.0;- pixels[i * 2] = to_bgra(y0, cb, cr);- pixels[i * 2 + 1] = to_bgra(y1, cb, cr);+ let out = &mut pixels[(y * width) as usize..][..copy_w as usize];+ for (word, out) in row.chunks_exact(4).zip(out.chunks_exact_mut(2)) {+ let [p0, p1] = crate::flipper::vi::yuyv_to_rgb(u32::from_be_bytes(word.try_into().unwrap()));+ out[0] = 0xFF00_0000 | p0;+ out[1] = 0xFF00_0000 | p1;+ }}sys.render_sink.exec(GxAction::PresentRawXfb { width, height, pixels });@@ -664,6 +705,7 @@ impl GraphicsProcessor {first_seq: r.u64()?,copy_seq: r.u64()?,seen_present_seq: r.u64()?,+ ..Default::default()};self.xfb_regions.insert(base, region);}diff --git a/crates/gecko/src/flipper/gx/bp.rs b/crates/gecko/src/flipper/gx/bp.rsindex 366dcac..5fae571 100644--- a/crates/gecko/src/flipper/gx/bp.rs+++ b/crates/gecko/src/flipper/gx/bp.rs@@ -271,7 +271,7 @@ impl GraphicsProcessor {// EFB copy trigger (BP 0x52)if idx == BP_PE_COPY_CMD {- self.efb_copy(renderer, val);+ self.efb_copy(renderer, &ram.as_view(), val);}}@@ -580,7 +580,7 @@ impl GraphicsProcessor {}#[cfg_attr(feature = "hotpath", hotpath::measure)]- fn efb_copy(&mut self, renderer: &mut dyn RenderSink, trigger: u32) {+ fn efb_copy(&mut self, renderer: &mut dyn RenderSink, ram: &RamView<'_>, trigger: u32) {let src = EfbCopySrc::from_raw(self.bp_regs[BP_PE_COPY_SRC]);let dims = EfbCopyDims::from_raw(self.bp_regs[BP_PE_COPY_DIMS]);let src_x = src.left() as u32;@@ -645,20 +645,24 @@ impl GraphicsProcessor {self.xfb_copy_seq += 1;let copy_seq = self.xfb_copy_seq;let present_seq = self.xfb_present_seq;+ let ram_len = super::XfbRegion::ram_len(dest_stride, src_w, dst_h);+ let first_seq = self.xfb_regions.get(&dest_addr).map_or(copy_seq, |r| r.first_seq);- self.xfb_regions- .entry(dest_addr)- .and_modify(|r| {- r.stride = dest_stride;- r.copy_seq = copy_seq;- r.seen_present_seq = present_seq;- })- .or_insert(super::XfbRegion {+ self.xfb_regions.insert(+ dest_addr,+ super::XfbRegion {stride: dest_stride,- first_seq: copy_seq,+ first_seq,copy_seq,seen_present_seq: present_seq,- });+ ram_hash: ram+ .slice(dest_addr as usize, ram_len)+ .map(twox_hash::xxhash3_64::Hasher::oneshot),+ ram_generation: ram.range_generation(dest_addr as usize, ram_len),+ width: src_w,+ height: dst_h,+ },+ );self.xfb_dirty = true;diff --git a/crates/gecko/src/flipper/vi.rs b/crates/gecko/src/flipper/vi.rsindex 4a247ff..faf8ce6 100644--- a/crates/gecko/src/flipper/vi.rs+++ b/crates/gecko/src/flipper/vi.rs@@ -334,6 +334,24 @@ pub fn refresh_interrupts<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {}}+/// XFB is YUY2 (YCbCr 4:2:2): each 32 bit word = [Y0][Cb][Y1][Cr] (big endian).+/// One word covers two adjacent pixels sharing Cb and Cr.+pub(crate) fn yuyv_to_rgb(word: u32) -> [u32; 2] {+ let y0 = ((word >> 24) & 0xFF) as f32 - 16.0;+ let cb = ((word >> 16) & 0xFF) as f32 - 128.0;+ let y1 = ((word >> 8) & 0xFF) as f32 - 16.0;+ let cr = (word & 0xFF) as f32 - 128.0;++ let to_rgb = |y: f32| -> u32 {+ let r = (1.164 * y + 1.596 * cr).clamp(0.0, 255.0) as u32;+ let g = (1.164 * y - 0.813 * cr - 0.391 * cb).clamp(0.0, 255.0) as u32;+ let b = (1.164 * y + 2.018 * cb).clamp(0.0, 255.0) as u32;+ (r << 16) | (g << 8) | b+ };++ [to_rgb(y0), to_rgb(y1)]+}+impl<const SYSTEM: SystemId> System<SYSTEM> {#[rustfmt::skip]pub fn render_xfb(&self) -> Vec<u32> {@@ -344,23 +362,10 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {let mut pixels = vec![0u32; width * height];let xfb_addr = self.vi.xfb_addr();- // XFB is YUY2 (YCbCr 4:2:2): each 32 bit word = [Y0][Cb][Y1][Cr] (big endian).- // One word covers two adjacent pixels sharing Cb and Cr.- let ycbcr_to_rgb = |y: f32, cb: f32, cr: f32| -> u32 {- let r = (1.164 * y + 1.596 * cr).clamp(0.0, 255.0) as u8;- let g = (1.164 * y - 0.813 * cr - 0.391 * cb).clamp(0.0, 255.0) as u8;- let b = (1.164 * y + 2.018 * cb).clamp(0.0, 255.0) as u8;- ((r as u32) << 16) | ((g as u32) << 8) | (b as u32)- };-for i in 0..(width * height / 2) {- let word = self.mmio.phys_read_u32(xfb_addr + (i as u32) * 4);- let y0 = ((word >> 24) & 0xFF) as f32 - 16.0;- let cb = ((word >> 16) & 0xFF) as f32 - 128.0;- let y1 = ((word >> 8) & 0xFF) as f32 - 16.0;- let cr = ( word & 0xFF) as f32 - 128.0;- pixels[i * 2] = ycbcr_to_rgb(y0, cb, cr);- pixels[i * 2 + 1] = ycbcr_to_rgb(y1, cb, cr);+ let [p0, p1] = self::yuyv_to_rgb(self.mmio.phys_read_u32(xfb_addr + (i as u32) * 4));+ pixels[i * 2] = p0;+ pixels[i * 2 + 1] = p1;}pixels}diff --git a/crates/gecko/src/host.rs b/crates/gecko/src/host.rsindex 30185ba..be72729 100644--- a/crates/gecko/src/host.rs+++ b/crates/gecko/src/host.rs@@ -132,7 +132,7 @@ pub enum GxAction {},/// Present a CPU-drawn external framebuffer read straight from guest RAM- /// (no GX EFB copy happened, e.g. consoletest).+ /// (e.g. consoletest, or a movie decoder overwriting a GX copy).PresentRawXfb {width: u32,height: u32,diff --git a/crates/gecko/src/savestate.rs b/crates/gecko/src/savestate.rsindex 8548c80..d342f53 100644--- a/crates/gecko/src/savestate.rs+++ b/crates/gecko/src/savestate.rs@@ -331,6 +331,7 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {self.render_sink.exec(crate::host::GxAction::InvalidateCaches);self.render_sink.reset_efb();+ self.audio_sink.set_sample_rate(self.ai.control.aid_sample_rate_hz());Ok(())}