Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

cp clear silence

Layleb9a8aac40342
diff --git a/crates/gecko/src/flipper/cp.rs b/crates/gecko/src/flipper/cp.rs
index c39f3f1..55de587 100644
--- a/crates/gecko/src/flipper/cp.rs
+++ b/crates/gecko/src/flipper/cp.rs
@@ -27,6 +27,7 @@ pub struct CommandProcessor {
pub fifo_read_ptr_hi: regs::FifoReadPtrHi,
pub fifo_bp_lo: regs::FifoBpLo,
pub fifo_bp_hi: regs::FifoBpHi,
+ pub clear: regs::CpClear,
pub gather_pipe: [u8; GP_PIPE_CAPACITY],
pub gather_pos: u32,
@@ -53,6 +54,7 @@ impl CommandProcessor {
fifo_read_ptr_hi: regs::FifoReadPtrHi::from_raw(0),
fifo_bp_lo: regs::FifoBpLo::from_raw(0),
fifo_bp_hi: regs::FifoBpHi::from_raw(0),
+ clear: regs::CpClear::from_raw(0),
gather_pipe: [0; GP_PIPE_CAPACITY],
gather_pos: 0,
}
diff --git a/crates/gecko/src/flipper/cp/regs.rs b/crates/gecko/src/flipper/cp/regs.rs
index 43e893b..1292477 100644
--- a/crates/gecko/src/flipper/cp/regs.rs
+++ b/crates/gecko/src/flipper/cp/regs.rs
@@ -83,12 +83,13 @@ pub struct CpClear {
crate::mmio_reg!(CpClear: u16 @ 0xCC000004);
impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for CpClear {
- fn read(_gc: &mut System<SYSTEM>) -> Self {
- tracing::warn!("attempted to read from write only CpClear register");
- Self::from_raw(0)
+ fn read(sys: &mut System<SYSTEM>) -> Self {
+ tracing::debug!("attempted to read from write only CpClear register");
+ sys.cp.clear
}
fn write(self, sys: &mut System<SYSTEM>, _: WriteMask) {
+ sys.cp.clear = self;
if self.clear_overflow() {
sys.cp.status = sys.cp.status.with_fifo_overflow(false);
}