A GameCube/Wii emulator and debugger written in Rust.
cmd type needs to go to paddr+8
Layle059d10285f22
diff --git a/crates/gecko/src/hollywood/ipc.rs b/crates/gecko/src/hollywood/ipc.rsindex a0a53b3..d8e3ce0 100644--- a/crates/gecko/src/hollywood/ipc.rs+++ b/crates/gecko/src/hollywood/ipc.rs@@ -104,7 +104,9 @@ crate::mmio_device_dispatch! {}pub fn deliver_response<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>, cmd_paddr: u32, result: i32) {+ let cmd_type = sys.mmio.phys_read_u32(cmd_paddr);sys.mmio.phys_write_u32(cmd_paddr + 0x04, result as u32);+ sys.mmio.phys_write_u32(cmd_paddr + 0x08, cmd_type);sys.hollywood.ipc.armmsg = ArmMsg::from_raw(cmd_paddr);sys.hollywood.ipc.ppcctrl = sys.hollywood@@ -112,5 +114,12 @@ pub fn deliver_response<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>, cmd_pa.ppcctrl.with_arm_response(true).with_arm_post_ack(true);+ tracing::debug!(+ cmd_paddr = format!("{cmd_paddr:#010X}"),+ cmd_type,+ result,+ irq_mask = sys.hollywood.irq.mask.raw(),+ "deliver_response: posting reply"+ );crate::hollywood::irq::assert_ipc(sys);}diff --git a/crates/gecko/src/hollywood/regs.rs b/crates/gecko/src/hollywood/regs.rsindex ecbae1a..864276e 100644--- a/crates/gecko/src/hollywood/regs.rs+++ b/crates/gecko/src/hollywood/regs.rs@@ -55,6 +55,13 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for PpcCtrl {.with_arm_post_ack(current.arm_post_ack() && !incoming.arm_post_ack()).with_arm_response(current.arm_response() && !incoming.arm_response());+ tracing::debug!(+ incoming = format!("{:#010X}", incoming.raw()),+ current = format!("{:#010X}", current.raw()),+ after = format!("{:#010X}", sys.hollywood.ipc.ppcctrl.raw()),+ "PPCCTRL write"+ );+// dispatch via starletif sys.hollywood.ipc.ppcctrl.execute() {let cmd_paddr = sys.hollywood.ipc.ppcmsg.raw();@@ -68,6 +75,11 @@ impl<const SYSTEM: SystemId> MmioAccess<System<SYSTEM>> for PpcCtrl {let ack_happened =(current.arm_post_ack() && incoming.arm_post_ack()) || (current.arm_response() && incoming.arm_response());if ack_happened {+ tracing::debug!(+ cleared_y2 = current.arm_post_ack() && incoming.arm_post_ack(),+ cleared_y1 = current.arm_response() && incoming.arm_response(),+ "PPC acked"+ );crate::hollywood::irq::ack_ipc(sys);crate::starlet::schedule_drain(sys);}diff --git a/crates/gecko/src/starlet.rs b/crates/gecko/src/starlet.rsindex fafb532..6b36fc3 100644--- a/crates/gecko/src/starlet.rs+++ b/crates/gecko/src/starlet.rs@@ -233,7 +233,15 @@ fn process_command<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>, cmd_paddr:let out_ptr = ctx.mmio.phys_read_u32(cmd_paddr + 0x18);let out_len = ctx.mmio.phys_read_u32(cmd_paddr + 0x1C);- tracing::info!(fd, ioctl_cmd = format!("{ioctl_cmd:#010X}"), "IOS_Ioctl");+ tracing::info!(+ fd,+ ioctl_cmd = format!("{ioctl_cmd:#010X}"),+ in_ptr = format!("{in_ptr:#010X}"),+ in_len,+ out_ptr = format!("{out_ptr:#010X}"),+ out_len,+ "IOS_Ioctl"+ );match starlet.device_for_fd(fd) {Some(dev) => dev.ioctl(&mut ctx, ioctl_cmd, in_ptr, in_len, out_ptr, out_len),@@ -277,12 +285,22 @@ fn read_c_string(ctx: &mut DeviceContext<'_>, paddr: u32) -> String {fn deliver_pending<const SYSTEM: SystemId>(sys: &mut System<SYSTEM>) {if sys.hollywood.ipc.ppcctrl.arm_response() {- // PPC slot still occupied. Wait for the ack.+ tracing::debug!(+ queue_len = sys.starlet.pending.len(),+ "deliver_pending: arm_response still set, skipping"+ );return;}let Some(p) = sys.starlet.pending.pop_front() else {+ tracing::debug!("deliver_pending: queue empty");return;};+ tracing::debug!(+ cmd_paddr = format!("{:#010X}", p.cmd_paddr),+ result = p.result,+ remaining = sys.starlet.pending.len(),+ "deliver_pending: delivering"+ );crate::hollywood::ipc::deliver_response(sys, p.cmd_paddr, p.result);}