Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

implement dcbz/dcbz_l. fixes FMVs!

Layle554f17116a2d
diff --git a/crates/gecko/spec/gekko.bindings.chipi b/crates/gecko/spec/gekko.bindings.chipi
index 0eb430b..7671d09 100644
--- a/crates/gecko/spec/gekko.bindings.chipi
+++ b/crates/gecko/spec/gekko.bindings.chipi
@@ -160,8 +160,6 @@ target rust {
dcbt
dcbtst
dcba
- dcbz
- dcbz_l
icbi
tlbie
tlbia
@@ -170,6 +168,11 @@ target rust {
tlbli
}
+ handler dcbz {
+ dcbz
+ dcbz_l
+ }
+
handler logical {
andx
orx
diff --git a/crates/gecko/spec/gekko_jit.bindings.chipi b/crates/gecko/spec/gekko_jit.bindings.chipi
index 0500ef8..099d190 100644
--- a/crates/gecko/spec/gekko_jit.bindings.chipi
+++ b/crates/gecko/spec/gekko_jit.bindings.chipi
@@ -160,8 +160,6 @@ target rust {
dcbt
dcbtst
dcba
- dcbz
- dcbz_l
tlbie
tlbia
tlbsync
@@ -169,6 +167,11 @@ target rust {
tlbli
}
+ handler dcbz {
+ dcbz
+ dcbz_l
+ }
+
handler icbi {
icbi
}
diff --git a/crates/gecko/spec/wii_gekko.bindings.chipi b/crates/gecko/spec/wii_gekko.bindings.chipi
index a358dd9..7785dd3 100644
--- a/crates/gecko/spec/wii_gekko.bindings.chipi
+++ b/crates/gecko/spec/wii_gekko.bindings.chipi
@@ -160,8 +160,6 @@ target rust {
dcbt
dcbtst
dcba
- dcbz
- dcbz_l
icbi
tlbie
tlbia
@@ -170,6 +168,11 @@ target rust {
tlbli
}
+ handler dcbz {
+ dcbz
+ dcbz_l
+ }
+
handler logical {
andx
orx
diff --git a/crates/gecko/spec/wii_gekko_jit.bindings.chipi b/crates/gecko/spec/wii_gekko_jit.bindings.chipi
index 9bb86e8..3bbdaa8 100644
--- a/crates/gecko/spec/wii_gekko_jit.bindings.chipi
+++ b/crates/gecko/spec/wii_gekko_jit.bindings.chipi
@@ -160,8 +160,6 @@ target rust {
dcbt
dcbtst
dcba
- dcbz
- dcbz_l
tlbie
tlbia
tlbsync
@@ -169,6 +167,11 @@ target rust {
tlbli
}
+ handler dcbz {
+ dcbz
+ dcbz_l
+ }
+
handler icbi {
icbi
}
diff --git a/crates/gecko/src/gekko/interpreter.rs b/crates/gecko/src/gekko/interpreter.rs
index 466b32e..0039213 100644
--- a/crates/gecko/src/gekko/interpreter.rs
+++ b/crates/gecko/src/gekko/interpreter.rs
@@ -18,7 +18,7 @@ pub use ps_ops::ps_ops;
pub use psq::store_load_psq;
pub use rotate::rotate;
pub use store_load::{eciwx, ecowx, lswi, lswx, lwarx, store_load, store_load_fp, stswi, stswx, stwcx_dot};
-pub use system::{mfsrin, mftb, msr, mtsrin, nop, sc, segment, spr, tw, twi};
+pub use system::{dcbz, mfsrin, mftb, msr, mtsrin, nop, sc, segment, spr, tw, twi};
#[cold]
#[inline(never)]
diff --git a/crates/gecko/src/gekko/interpreter/system.rs b/crates/gecko/src/gekko/interpreter/system.rs
index 7ce5f0a..64963c4 100644
--- a/crates/gecko/src/gekko/interpreter/system.rs
+++ b/crates/gecko/src/gekko/interpreter/system.rs
@@ -55,6 +55,7 @@ pub fn spr<const OP: u32, const SYSTEM: SystemId>(ctx: &mut System<SYSTEM>, inst
}
#[cfg(not(feature = "jit"))]
let _ = written;
+ ctx.gekko.spr.dmal.set_trigger(false);
}
}
_ => ctx.gekko.spr.write(spr_num, val),
@@ -158,6 +159,16 @@ pub fn nop<const OP: u32, const SYSTEM: SystemId>(ctx: &mut System<SYSTEM>, _ins
ctx.scheduler.cycles += crate::gekko::cycles::cycles_for_op(OP) as u64;
}
+/// dcbz / dcbz_l zero the targeted 32-byte cache line via `System::dcbz_line`.
+/// TODO: What happens if games zero out 0x80000000..0x80008000?
+#[inline(always)]
+pub fn dcbz<const OP: u32, const SYSTEM: SystemId>(ctx: &mut System<SYSTEM>, instr: Instruction) {
+ ctx.scheduler.cycles += crate::gekko::cycles::cycles_for_op(OP) as u64;
+ let base = ctx.gekko.read_gpr_or_zero(instr.ra());
+ let ea = base.wrapping_add(ctx.gekko.read_gpr(instr.rb()));
+ ctx.dcbz_line(ea);
+}
+
#[inline(always)]
pub fn sc<const SYSTEM: SystemId>(ctx: &mut System<SYSTEM>, _instr: Instruction) {
ctx.scheduler.cycles += crate::gekko::cycles::cycles_for_op(OP_SC) as u64;
diff --git a/crates/gecko/src/gekko/jit.rs b/crates/gecko/src/gekko/jit.rs
index 1736ccc..d0cd631 100644
--- a/crates/gecko/src/gekko/jit.rs
+++ b/crates/gecko/src/gekko/jit.rs
@@ -76,6 +76,7 @@ pub struct ExternFuncs {
pub read_timebase: FuncId,
pub cause_icbi: FuncId,
pub cause_smc_write: FuncId,
+ pub dcbz: FuncId,
}
pub struct JitEngine<const SYSTEM: SystemId> {
@@ -156,6 +157,7 @@ impl<const SYSTEM: SystemId> JitEngine<SYSTEM> {
read_timebase: (&'static str, *const u8),
cause_icbi: (&'static str, *const u8),
cause_smc_write: (&'static str, *const u8),
+ dcbz: (&'static str, *const u8),
}
let syms: SymTable = match SYSTEM {
GC => SymTable {
@@ -209,6 +211,7 @@ impl<const SYSTEM: SystemId> JitEngine<SYSTEM> {
read_timebase: ("gecko_jit_read_timebase_gc", runtime::read_timebase_gc as *const u8),
cause_icbi: ("gecko_jit_cause_icbi_gc", runtime::cause_icbi_gc as *const u8),
cause_smc_write: ("gecko_jit_cause_smc_write_gc", runtime::cause_smc_write_gc as *const u8),
+ dcbz: ("gecko_jit_dcbz_gc", runtime::dcbz_gc as *const u8),
},
WII => SymTable {
cause_invalid_opcode: (
@@ -267,6 +270,7 @@ impl<const SYSTEM: SystemId> JitEngine<SYSTEM> {
"gecko_jit_cause_smc_write_wii",
runtime::cause_smc_write_wii as *const u8,
),
+ dcbz: ("gecko_jit_dcbz_wii", runtime::dcbz_wii as *const u8),
},
_ => unreachable!(),
};
@@ -304,6 +308,7 @@ impl<const SYSTEM: SystemId> JitEngine<SYSTEM> {
syms.read_timebase,
syms.cause_icbi,
syms.cause_smc_write,
+ syms.dcbz,
] {
jit_builder.symbol(name, addr);
}
@@ -474,6 +479,9 @@ impl<const SYSTEM: SystemId> JitEngine<SYSTEM> {
cause_icbi: module
.declare_function(syms.cause_icbi.0, Linkage::Import, &ctx_u32_sig)
.expect("declare cause_icbi"),
+ dcbz: module
+ .declare_function(syms.dcbz.0, Linkage::Import, &ctx_u32_sig)
+ .expect("declare dcbz"),
cause_smc_write: module
.declare_function(syms.cause_smc_write.0, Linkage::Import, &mem_write_sig)
.expect("declare cause_smc_write"),
diff --git a/crates/gecko/src/gekko/jit/handlers.rs b/crates/gecko/src/gekko/jit/handlers.rs
index 189f5fe..9e605e5 100644
--- a/crates/gecko/src/gekko/jit/handlers.rs
+++ b/crates/gecko/src/gekko/jit/handlers.rs
@@ -755,8 +755,6 @@ pub fn nop<const OP: u32, const SYSTEM: SystemId>(t: &mut JitTranslator, instr:
| lut::OP_DCBT
| lut::OP_DCBTST
| lut::OP_DCBA
- | lut::OP_DCBZ
- | lut::OP_DCBZ_L
| lut::OP_TLBIE
| lut::OP_TLBIA
| lut::OP_TLBSYNC
@@ -769,6 +767,20 @@ pub fn nop<const OP: u32, const SYSTEM: SystemId>(t: &mut JitTranslator, instr:
let _ = builder;
}
+/// dcbz / dcbz_l zero the targeted 32-byte cache line. We have no dcache, so
+/// the zeros go straight to backing memory via the slow store path.
+/// TODO: What happens if games zero out 0x80000000..0x80008000?
+#[inline(always)]
+pub fn dcbz<const OP: u32, const SYSTEM: SystemId>(t: &mut JitTranslator, instr: Instruction) {
+ t.op_cycles = crate::gekko::cycles::cycles_for_op(OP);
+ let (builder, local) = unsafe { parts(t.builder_ptr, t.local_ptr) };
+
+ let ea = translator::emit_x_form_ea::<SYSTEM>(builder, t.ctx_ptr, instr);
+ builder.ins().call(local.dcbz, &[t.ctx_ptr, ea]);
+
+ t.handled_natively = true;
+}
+
#[inline(always)]
pub fn icbi<const OP: u32, const SYSTEM: SystemId>(t: &mut JitTranslator, instr: Instruction) {
t.op_cycles = crate::gekko::cycles::cycles_for_op(OP);
diff --git a/crates/gecko/src/gekko/jit/idle.rs b/crates/gecko/src/gekko/jit/idle.rs
index e3b5b74..e85ef20 100644
--- a/crates/gecko/src/gekko/jit/idle.rs
+++ b/crates/gecko/src/gekko/jit/idle.rs
@@ -85,7 +85,8 @@ fn is_cache_op_no_side_effect(instr: crate::gekko::instruction::Instruction) ->
if instr.primary_opcode() != 31 {
return false;
}
- matches!(instr.xo10(), 86 | 470 | 54 | 278 | 246 | 1014 | 982 | 758)
+
+ matches!(instr.xo10(), 86 | 470 | 54 | 278 | 246 | 982 | 758)
}
fn classify_branch_to_self(spec: &BlockSpec) -> Option<IdleClass> {
diff --git a/crates/gecko/src/gekko/jit/runtime.rs b/crates/gecko/src/gekko/jit/runtime.rs
index f2172ce..e5fdd80 100644
--- a/crates/gecko/src/gekko/jit/runtime.rs
+++ b/crates/gecko/src/gekko/jit/runtime.rs
@@ -212,6 +212,7 @@ fn write_spr<const SYSTEM: SystemId>(sys: *mut System<SYSTEM>, num: u32, val: u3
if let Some((phys, len)) = sys.mmio.process_locked_cache_dma(&dmau, &dmal) {
sys.mmio.queue_icbi_for_range(phys, len);
}
+ sys.gekko.spr.dmal.set_trigger(false);
}
}
_ => sys.gekko.spr.write(num, val),
@@ -574,6 +575,18 @@ pub extern "C" fn cause_icbi_wii(sys: *mut core::ffi::c_void, ea: u32) {
cause_icbi::<WII>(sys.cast(), ea);
}
+#[inline(always)]
+fn do_dcbz<const SYSTEM: SystemId>(sys: *mut System<SYSTEM>, ea: u32) {
+ unsafe { (*sys).dcbz_line(ea) }
+}
+
+pub extern "C" fn dcbz_gc(sys: *mut core::ffi::c_void, ea: u32) {
+ do_dcbz::<GC>(sys.cast(), ea);
+}
+pub extern "C" fn dcbz_wii(sys: *mut core::ffi::c_void, ea: u32) {
+ do_dcbz::<WII>(sys.cast(), ea);
+}
+
#[inline(always)]
fn cause_smc_write<const SYSTEM: SystemId>(sys: *mut System<SYSTEM>, ea: u32, size: u32) {
let sys = unsafe { &mut *sys };
diff --git a/crates/gecko/src/gekko/jit/translator.rs b/crates/gecko/src/gekko/jit/translator.rs
index fccec60..e248274 100644
--- a/crates/gecko/src/gekko/jit/translator.rs
+++ b/crates/gecko/src/gekko/jit/translator.rs
@@ -83,6 +83,7 @@ pub(crate) struct LocalFuncs {
pub(crate) read_timebase: FuncRef,
pub(crate) cause_icbi: FuncRef,
pub(crate) cause_smc_write: FuncRef,
+ pub(crate) dcbz: FuncRef,
pub(crate) fp_guard_emitted: std::cell::Cell<bool>,
}
@@ -146,6 +147,7 @@ pub fn translate<const SYSTEM: SystemId>(
read_timebase: module.declare_func_in_func(extern_funcs.read_timebase, &mut ctx.func),
cause_icbi: module.declare_func_in_func(extern_funcs.cause_icbi, &mut ctx.func),
cause_smc_write: module.declare_func_in_func(extern_funcs.cause_smc_write, &mut ctx.func),
+ dcbz: module.declare_func_in_func(extern_funcs.dcbz, &mut ctx.func),
fp_guard_emitted: std::cell::Cell::new(false),
};
@@ -1689,7 +1691,7 @@ pub(crate) enum LogicalOp {
fn pointer_iter_loop_cycles_per_iter(instrs: &[u32]) -> i64 {
use crate::gekko::cycles::{DEFAULT_CYCLES, cycles_for_op};
- use crate::gekko::lut::{OP_DCBA, OP_DCBF, OP_DCBI, OP_DCBST, OP_DCBT, OP_DCBTST, OP_DCBZ, OP_ICBI};
+ use crate::gekko::lut::{OP_DCBA, OP_DCBF, OP_DCBI, OP_DCBST, OP_DCBT, OP_DCBTST, OP_ICBI};
let cache = instrs.first().copied().map(Instruction).map(|i| i.xo10()).unwrap_or(0);
let cache_op = match cache {
@@ -1698,7 +1700,6 @@ fn pointer_iter_loop_cycles_per_iter(instrs: &[u32]) -> i64 {
54 => OP_DCBST,
278 => OP_DCBT,
246 => OP_DCBTST,
- 1014 => OP_DCBZ,
982 => OP_ICBI,
758 => OP_DCBA,
_ => return 3 * DEFAULT_CYCLES,
diff --git a/crates/gecko/src/mmio.rs b/crates/gecko/src/mmio.rs
index c032704..6d721b0 100644
--- a/crates/gecko/src/mmio.rs
+++ b/crates/gecko/src/mmio.rs
@@ -462,9 +462,10 @@ impl<const SYSTEM: SystemId> Mmio<SYSTEM> {
) -> Option<(u32, u32)> {
let ram_addr = dmau.ram_addr() << 5;
let lcache_vaddr = dmal.lcache_addr() << 5;
- let lcache_paddr = (lcache_vaddr - LCACHE_BASE) as usize;
+ let lcache_paddr = lcache_vaddr as usize & (LCACHE_SIZE - 1);
let block_count = ((dmau.length_hi() as usize) << 2) | dmal.length_lo() as usize;
- let length = if block_count == 0 { 128 } else { block_count } * 32;
+ let blocks = if block_count == 0 { 128 } else { block_count };
+ let length = (blocks * 32).min(LCACHE_SIZE - lcache_paddr);
tracing::debug!(
ram_addr = format!("{ram_addr:08X}"),
diff --git a/crates/gecko/src/mmio/bus.rs b/crates/gecko/src/mmio/bus.rs
index 7637180..1a11071 100644
--- a/crates/gecko/src/mmio/bus.rs
+++ b/crates/gecko/src/mmio/bus.rs
@@ -230,6 +230,15 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
});
}
+ pub fn dcbz_line(&mut self, ea: u32) {
+ let phys = self.translate_addr(ea) & !31;
+ if self.mmio.is_code_chunk(phys) {
+ return;
+ }
+
+ self.mmio.phys_slice_mut(phys, 32).fill(0);
+ }
+
// Slow path for MMIO
#[inline(never)]