Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

only god knows

Layle169d8b820c2c
diff --git a/crates/debugger/src/debugger.rs b/crates/debugger/src/debugger.rs
index 1feb7dc..9122d13 100644
--- a/crates/debugger/src/debugger.rs
+++ b/crates/debugger/src/debugger.rs
@@ -6,7 +6,7 @@ use image::symbols::SymbolTable;
const CPU_TRACE_FILENAME: &str = "cpu_trace.log";
const DSP_TRACE_FILENAME: &str = "dsp_trace.log";
-const DEFAULT_LUA_SCRIPT: &str = include_str!("../../../scripts/bs2_dvd_state_logger.lua");
+const DEFAULT_LUA_SCRIPT: &str = include_str!("../../../scripts/ipl_state_dump.lua");
pub struct DebuggerUi {
pub debugger: Debugger,
diff --git a/crates/gecko/src/dvd.rs b/crates/gecko/src/dvd.rs
index f1dbac5..c057061 100644
--- a/crates/gecko/src/dvd.rs
+++ b/crates/gecko/src/dvd.rs
@@ -224,6 +224,13 @@ impl MmioRw for DvdInterface {
access_size,
));
}
+ if <regs::DiConfigurationRegister as MmioRegister>::fits(addr, access_size) {
+ return Some(<regs::DiConfigurationRegister as MmioAccess<Self>>::read_at(
+ self,
+ addr,
+ access_size,
+ ));
+ }
match addr {
DICMDBUF0 if access_size == 4 => Some(self.cmdbuf0),
@@ -255,6 +262,10 @@ impl MmioRw for DvdInterface {
<regs::DiControlRegister as MmioAccess<Self>>::write_at(self, addr, access_size, val);
return true;
}
+ if <regs::DiConfigurationRegister as MmioRegister>::fits(addr, access_size) {
+ <regs::DiConfigurationRegister as MmioAccess<Self>>::write_at(self, addr, access_size, val);
+ return true;
+ }
match addr {
DICMDBUF0 if access_size == 4 => {
diff --git a/crates/gecko/src/dvd/regs.rs b/crates/gecko/src/dvd/regs.rs
index 66a1f30..3d535ac 100644
--- a/crates/gecko/src/dvd/regs.rs
+++ b/crates/gecko/src/dvd/regs.rs
@@ -185,3 +185,13 @@ impl Default for DiConfigurationRegister {
DiConfigurationRegister::from_raw(0b1)
}
}
+
+impl MmioAccess<DvdInterface> for DiConfigurationRegister {
+ fn read(di: &DvdInterface) -> Self {
+ di.config
+ }
+
+ 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.rs
index 765401e..753d36d 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.rs
index 572ee0a..f5f5fcd 100644
--- a/crates/gecko/src/flipper/dsp.rs
+++ b/crates/gecko/src/flipper/dsp.rs
@@ -112,27 +112,27 @@ impl Dsp {
}
fn process_aram_dma(&mut self, mmio: &mut Mmio) {
- let mmio_addr = (self.aram_dma_mmio_addr.raw() & 0x3FFFFFFF) as usize;
+ let ram_addr = (self.aram_dma_mmio_addr.raw() & 0x3FFFFFFF) as usize;
let aram_addr = self.aram_dma_aram_addr.raw() as usize;
let count = self.aram_dma_control.count() as usize * 4;
+ tracing::debug!(
+ ram_addr = format!("{ram_addr:08X}"),
+ aram_addr = format!("{aram_addr:08X}"),
+ count,
+ direction = ?self.aram_dma_control.direction(),
+ "ARAM DMA"
+ );
+
if self.aram_dma_control.direction() == regs::DmaDirection::AramToRam {
let src = &self.aram[aram_addr..aram_addr + count];
- let dst = mmio.virt_slice_mut(mmio_addr as u32, count);
+ let dst = mmio.virt_slice_mut(ram_addr as u32, count);
dst.copy_from_slice(src);
} else {
- let src = mmio.virt_slice(mmio_addr as u32, count);
+ let src = mmio.virt_slice(ram_addr as u32, count);
self.aram[aram_addr..aram_addr + count].copy_from_slice(&src);
}
- tracing::debug!(
- mmio_addr = format!("{mmio_addr:08X}"),
- aram_addr = format!("{aram_addr:08X}"),
- count,
- direction = ?self.aram_dma_control.direction(),
- "ARAM DMA complete"
- );
-
self.csr = self.csr.with_ar_interrupt(true);
}
diff --git a/crates/gecko/src/flipper/dsp/regs.rs b/crates/gecko/src/flipper/dsp/regs.rs
index ff2088c..959882c 100644
--- a/crates/gecko/src/flipper/dsp/regs.rs
+++ b/crates/gecko/src/flipper/dsp/regs.rs
@@ -217,7 +217,20 @@ crate::mmio_register! {
// 0xCC005016 2 [R/W] AR_MODE - ARAM Mode
crate::mmio_register! {
- AramMode: u16 @ 0xCC005016 => Dsp.aram_mode {}
+ AramMode: u16 @ 0xCC005016 {
+ #[bits(0)]
+ pub status: bool,
+ }
+}
+
+impl MmioAccess<super::Dsp> for AramMode {
+ fn read(dsp: &super::Dsp) -> Self {
+ dsp.aram_mode.with_status(true)
+ }
+
+ fn write(self, dsp: &mut super::Dsp) {
+ dsp.aram_mode = self;
+ }
}
// 0xCC00501A 2 [R/W] AR_REFRESH - ARAM Refresh
diff --git a/scripts/bs2_dvd_state_logger.lua b/scripts/ipl_state_dump.lua
similarity index 77%
rename from scripts/bs2_dvd_state_logger.lua
rename to scripts/ipl_state_dump.lua
index ca12294..5a57cfe 100644
--- a/scripts/bs2_dvd_state_logger.lua
+++ b/scripts/ipl_state_dump.lua
@@ -28,21 +28,12 @@ STATE_MACHINE_VALUES = {
[26] = "BS2_MAX_STATE"
}
--- local function log_state_machine(emu)
--- local r3 = emu:gpr(0)
--- local state = STATE_MACHINE_VALUES[r3] or "Unknown"
--- log(string.format("[dvd] state machine=%d (%s)", r3, state))
--- end
-
local function log_state_machine_write(emu, virt_addr, phys_addr, size, value)
local state = STATE_MACHINE_VALUES[value] or "Unknown"
- log(string.format("[dvd] state machine write: value=%d (%s) from pc=%08X", value, state, emu:pc()))
+ log(string.format("[bs2] state machine write: value=%d (%s) from pc=%08X", value, state, emu:pc()))
end
traps = {
- -- cpu_post = {
- -- [0x81300A9C] = log_state_machine,
- -- },
bus_write_pre = {
virt = {
[0x8145d548] = log_state_machine_write,