A GameCube/Wii emulator and debugger written in Rust.
do not run dsp batches while disabled (thanks hazel)
Layle7bcc5019d362
diff --git a/crates/gecko/src/flipper/dsp/regs.rs b/crates/gecko/src/flipper/dsp/regs.rsindex a2e8471..c3549b5 100644--- a/crates/gecko/src/flipper/dsp/regs.rs+++ b/crates/gecko/src/flipper/dsp/regs.rs@@ -1,5 +1,6 @@use crate::flipper::{ai, dsp};use crate::mmio::traits::{MmioAccess, WriteMask};+use crate::scheduler;use crate::system::{System, SystemId};use chapa::BitEnum;@@ -72,6 +73,7 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for ControlStatus {fn write(self, sys: &mut System<SYSTEM>, _: WriteMask) {tracing::trace!("CSR write: {:016b} (prev: {:016b})", self.raw(), sys.dsp.csr.raw());+ let was_active = !sys.dsp.csr.halt() && !sys.dsp.csr.reset();let mut csr = sys.dsp.csr;if self.ai_interrupt() {@@ -106,6 +108,16 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for ControlStatus {sys.dsp.csr = csr;+ let now_active = !sys.dsp.csr.halt() && !sys.dsp.csr.reset();+ match (was_active, now_active) {+ (false, true) => sys.scheduler.schedule_in(+ scheduler::dsp_batch_interval(SYSTEM),+ scheduler::dsp_batch_handler::<SYSTEM>,+ ),+ (true, false) => sys.scheduler.cancel(scheduler::dsp_batch_handler::<SYSTEM>),+ _ => {}+ }+dsp::refresh_interrupts(sys);}}diff --git a/crates/gecko/src/gekko/jit/translator.rs b/crates/gecko/src/gekko/jit/translator.rsindex 4f70572..f5fea97 100644--- a/crates/gecko/src/gekko/jit/translator.rs+++ b/crates/gecko/src/gekko/jit/translator.rs@@ -4193,7 +4193,7 @@ pub(crate) fn emit_logical_xform<const SYSTEM: SystemId>() -> Value {let s = gpr_load::<SYSTEM>(builder, ctx_ptr, instr.rs());let b = gpr_load::<SYSTEM>(builder, ctx_ptr, instr.rb());-+let val = match op {LogicalOp::And => builder.ins().band(s, b),LogicalOp::Or => builder.ins().bor(s, b),diff --git a/crates/gecko/src/scheduler.rs b/crates/gecko/src/scheduler.rsindex bf3a770..3c54e5e 100644--- a/crates/gecko/src/scheduler.rs+++ b/crates/gecko/src/scheduler.rs@@ -140,10 +140,6 @@ impl<const SYSTEM: SystemId> Scheduler<SYSTEM> {initial_refresh_rate.cycles_per_frame(SYSTEM),self::vsync_handler::<SYSTEM>,);- s.schedule_at(- self::cpu_cycles_per_dsp_tick(SYSTEM) * self::DSP_BATCH_SIZE,- self::dsp_batch_handler::<SYSTEM>,- );s.schedule_at(crate::gekko::dec::cycles_until_underflow(u32::MAX),crate::gekko::dec::underflow_handler::<SYSTEM>,@@ -160,11 +156,15 @@ pub fn vsync_handler<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {.schedule_in(rate.cycles_per_frame(SYSTEM), self::vsync_handler::<SYSTEM>);}-/// Reschedules itself every DSP batch.+#[inline(always)]+pub const fn dsp_batch_interval(system: SystemId) -> u64 {+ self::cpu_cycles_per_dsp_tick(system) * self::DSP_BATCH_SIZE+}+pub fn dsp_batch_handler<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {sys.execute_dsp_batch();- sys.scheduler.schedule_in(- self::cpu_cycles_per_dsp_tick(SYSTEM) * self::DSP_BATCH_SIZE,- self::dsp_batch_handler::<SYSTEM>,- );+ if !sys.dsp.csr.halt() && !sys.dsp.csr.reset() {+ sys.scheduler+ .schedule_in(self::dsp_batch_interval(SYSTEM), self::dsp_batch_handler::<SYSTEM>);+ }}