A GameCube/Wii emulator and debugger written in Rust.
triangle.dol actually loops now! work on gx comamnds next?
Layle832085b99ef9
diff --git a/crates/gekko/src/flipper.rs b/crates/gekko/src/flipper.rsindex 7a41a35..12bf87c 100644--- a/crates/gekko/src/flipper.rs+++ b/crates/gekko/src/flipper.rs@@ -1,3 +1,4 @@pub mod dsp;+pub mod gx;pub mod pi;pub mod vi;diff --git a/crates/gekko/src/flipper/gx.rs b/crates/gekko/src/flipper/gx.rsnew file mode 100644index 0000000..93ac688--- /dev/null+++ b/crates/gekko/src/flipper/gx.rs@@ -0,0 +1,41 @@+use super::pi::InterruptFlag;+use crate::gekko::Gekko;++pub struct Gx {+ pub raise_interrupt: bool,+}++impl Gx {+ pub fn new() -> Self {+ Gx {+ raise_interrupt: false,+ }+ }++ pub fn mmio_write_u8(&mut self, val: u8) {+ tracing::debug!(value = format!("{val:02X}"), "FIFO");+ }++ pub fn mmio_write_u16(&mut self, _val: u16) {+ tracing::debug!(value = format!("{_val:04X}"), "FIFO");+ }++ pub fn mmio_write_u32(&mut self, val: u32) {+ tracing::debug!(value = format!("{val:08X}"), "FIFO");++ if val == 0x45000002 {+ self.raise_interrupt = true;+ tracing::debug!("detected finish command?");+ }+ }+}++impl Gekko {+ /// Check if the GX stub detected a finish command and assert the PI interrupt+ pub fn check_gx_pe_finish(&mut self) {+ if self.gx.raise_interrupt {+ self.gx.raise_interrupt = false;+ self.pi.assert_interrupt(InterruptFlag::PeFinish);+ }+ }+}diff --git a/crates/gekko/src/gekko.rs b/crates/gekko/src/gekko.rsindex 6e8362f..a4cda05 100644--- a/crates/gekko/src/gekko.rs+++ b/crates/gekko/src/gekko.rs@@ -3,6 +3,7 @@ use crate::{exi::Exi,flipper::{dsp::Dsp,+ gx::Gx,pi::{InterruptFlag, Pi},vi::Vi,},@@ -20,6 +21,7 @@ pub struct Gekko {pub pi: Pi,pub dsp: Dsp,pub exi: Exi,+ pub gx: Gx,}impl Gekko {@@ -61,6 +63,7 @@ impl Gekko {pi: Pi::new(),dsp: Dsp::new(),exi: Exi::dummy(),+ gx: Gx::new(),}}diff --git a/crates/gekko/src/mmio/bus.rs b/crates/gekko/src/mmio/bus.rsindex 6832a47..f8c8d20 100644--- a/crates/gekko/src/mmio/bus.rs+++ b/crates/gekko/src/mmio/bus.rs@@ -2,7 +2,9 @@ use crate::{gekko::Gekko,mmio::{Mmio,- constants::{DSP_BASE, DSP_END, EXI_BASE, EXI_END, PI_BASE, PI_END, VI_BASE, VI_END},+ constants::{+ DSP_BASE, DSP_END, EXI_BASE, EXI_END, GX_FIFO_END, GX_FIFO_BASE, PI_BASE, PI_END, VI_BASE, VI_END,+ },},};@@ -11,17 +13,19 @@ enum BusTarget {Pi,Dsp,Exi,+ Gx,Fallback,}#[rustfmt::skip]fn route(phys: u32) -> (BusTarget, u32) {match phys {- VI_BASE..=VI_END => (BusTarget::Vi, phys - VI_BASE),- PI_BASE..=PI_END => (BusTarget::Pi, phys - PI_BASE),- DSP_BASE..=DSP_END => (BusTarget::Dsp, phys - DSP_BASE),- EXI_BASE..=EXI_END => (BusTarget::Exi, phys - EXI_BASE),- _ => (BusTarget::Fallback, phys),+ VI_BASE..=VI_END => (BusTarget::Vi, phys - VI_BASE),+ PI_BASE..=PI_END => (BusTarget::Pi, phys - PI_BASE),+ DSP_BASE..=DSP_END => (BusTarget::Dsp, phys - DSP_BASE),+ EXI_BASE..=EXI_END => (BusTarget::Exi, phys - EXI_BASE),+ GX_FIFO_BASE..=GX_FIFO_END => (BusTarget::Gx, phys - GX_FIFO_BASE),+ _ => (BusTarget::Fallback, phys),}}@@ -34,6 +38,10 @@ impl Gekko {BusTarget::Pi => self.pi.mmio_read_u8(offset),BusTarget::Dsp => self.dsp.mmio_read_u8(offset),BusTarget::Exi => self.exi.mmio_read_u8(offset),+ BusTarget::Gx => {+ tracing::error!(addr = format!("{:08X}", addr), "Invalid GX FIFO read");+ 0+ }BusTarget::Fallback => self.mmio.phys_read_u8(offset),}}@@ -46,6 +54,10 @@ impl Gekko {BusTarget::Pi => self.pi.mmio_read_u16(offset),BusTarget::Dsp => self.dsp.mmio_read_u16(offset),BusTarget::Exi => self.exi.mmio_read_u16(offset),+ BusTarget::Gx => {+ tracing::error!(addr = format!("{:08X}", addr), "Invalid GX FIFO read");+ 0+ }BusTarget::Fallback => self.mmio.phys_read_u16(offset),}}@@ -58,6 +70,10 @@ impl Gekko {BusTarget::Pi => self.pi.mmio_read_u32(offset),BusTarget::Dsp => self.dsp.mmio_read_u32(offset),BusTarget::Exi => self.exi.mmio_read_u32(offset),+ BusTarget::Gx => {+ tracing::error!(addr = format!("{:08X}", addr), "Invalid GX FIFO read");+ 0+ }BusTarget::Fallback => self.mmio.phys_read_u32(offset),}}@@ -76,6 +92,10 @@ impl Gekko {self.exi.mmio_write_u8(offset, val);self.exi.process_dma_transfers(&mut self.mmio);}+ BusTarget::Gx => {+ self.gx.mmio_write_u8(val);+ self.check_gx_pe_finish();+ }BusTarget::Fallback => self.mmio.phys_write_u8(offset, val),}}@@ -94,6 +114,10 @@ impl Gekko {self.exi.mmio_write_u16(offset, val);self.exi.process_dma_transfers(&mut self.mmio);}+ BusTarget::Gx => {+ self.gx.mmio_write_u16(val);+ self.check_gx_pe_finish();+ }BusTarget::Fallback => self.mmio.phys_write_u16(offset, val),}}@@ -112,6 +136,10 @@ impl Gekko {self.exi.mmio_write_u32(offset, val);self.exi.process_dma_transfers(&mut self.mmio);}+ BusTarget::Gx => {+ self.gx.mmio_write_u32(val);+ self.check_gx_pe_finish();+ }BusTarget::Fallback => self.mmio.phys_write_u32(offset, val),}}diff --git a/crates/gekko/src/mmio/constants.rs b/crates/gekko/src/mmio/constants.rsindex 72f2458..08b1c8a 100644--- a/crates/gekko/src/mmio/constants.rs+++ b/crates/gekko/src/mmio/constants.rs@@ -28,3 +28,7 @@ pub const EXI_END: u32 = 0x0C00_6BFF;pub const AI_BASE: u32 = 0x0C00_6C00;pub const AI_END: u32 = 0x0C00_6FFF;++// GX Write Gather Pipe+pub const GX_FIFO_BASE: u32 = 0x0C00_8000;+pub const GX_FIFO_END: u32 = 0x0C00_8003;