A GameCube/Wii emulator and debugger written in Rust.
dsp pc access fix & DI do not raise device error when there is no dvd
Laylef8a4e70d29c9
diff --git a/crates/gecko/src/dvd.rs b/crates/gecko/src/dvd.rsindex 2cc6ca6..e90df2c 100644--- a/crates/gecko/src/dvd.rs+++ b/crates/gecko/src/dvd.rs@@ -130,7 +130,8 @@ impl GameCube {}let Some(dvd) = self.di.dvd.take() else {- self.di.status.set_device_error(true);+ // TODO: Setting this causes unrecoverable error when there is no DVD+ //self.di.status.set_device_error(true);self.di.control.set_tstart(false);self.di.transfer_started = false;return;diff --git a/crates/gecko/src/flipper/dsp.rs b/crates/gecko/src/flipper/dsp.rsindex 2a07aa8..5c2c396 100644--- a/crates/gecko/src/flipper/dsp.rs+++ b/crates/gecko/src/flipper/dsp.rs@@ -16,6 +16,8 @@ use crate::mmio::traits::{MmioAccess, MmioRegister, MmioRw};pub struct Dsp {// Registerspub pc: u16,+ pub nia: u16,+ pub cia: u16,// IMEM = IRAM + IROMpub iram: Box<[u8; 0x1000]>, // 0x0000 - 0x0FFF@@ -57,6 +59,8 @@ impl Dsp {Dsp {pc: 0,+ nia: 0,+ cia: 0,iram,irom,dram,@@ -145,8 +149,15 @@ impl GameCube {}let instr = Instruction::from_be_bytes(&self.dsp.iram[self.dsp.pc as usize..]);+ self.dsp.cia = self.dsp.pc;+ self.dsp.nia = self+ .dsp+ .cia+ .wrapping_add(crate::flipper::dsp::lut::instr_size(instr) as u16);+crate::flipper::dsp::lut::dispatch(self, instr);- self.dsp.pc += crate::flipper::dsp::lut::instr_size(instr) as u16;++ self.dsp.pc = self.dsp.nia;}}