Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

refactored hooks system and added DSP test harness

Laylebd50831888c5
diff --git a/Cargo.lock b/Cargo.lock
index d98ea68..2749626 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -863,6 +863,14 @@ dependencies = [
"tracing-subscriber",
]
+[[package]]
+name = "dsptestrunner"
+version = "0.1.0"
+dependencies = [
+ "gecko",
+ "image 0.1.0",
+]
+
[[package]]
name = "ecolor"
version = "0.33.3"
@@ -1226,28 +1234,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "gecko-web"
-version = "0.1.0"
-dependencies = [
- "backend-wgpu",
- "console_error_panic_hook",
- "dbglib",
- "egui",
- "egui-phosphor",
- "egui-wgpu",
- "egui-winit",
- "gecko",
- "image 0.1.0",
- "js-sys",
- "tracing",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu",
- "winit",
-]
-
[[package]]
name = "generic-array"
version = "0.14.7"
@@ -3709,6 +3695,26 @@ dependencies = [
"pkg-config",
]
+[[package]]
+name = "web"
+version = "0.1.0"
+dependencies = [
+ "backend-wgpu",
+ "console_error_panic_hook",
+ "dbglib",
+ "egui",
+ "egui-phosphor",
+ "egui-wgpu",
+ "egui-winit",
+ "gecko",
+ "image 0.1.0",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu",
+ "winit",
+]
+
[[package]]
name = "web-sys"
version = "0.3.94"
diff --git a/Cargo.toml b/Cargo.toml
index 39bed81..9769823 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,9 @@ members = [
"crates/debugger",
"crates/scripting",
"crates/dspemu",
+
+ # Stuff we rarely use
+ "crates/dsptestrunner",
"crates/web",
]
default-members = [
@@ -54,4 +57,4 @@ debug-assertions = false
inherits = "dev"
debug-assertions = true
opt-level = 3
-lto = false
\ No newline at end of file
+lto = false
diff --git a/crates/debugger/Cargo.toml b/crates/debugger/Cargo.toml
index 2e9fbbc..8a1e6af 100644
--- a/crates/debugger/Cargo.toml
+++ b/crates/debugger/Cargo.toml
@@ -5,10 +5,10 @@ edition = "2024"
[features]
idle-skip = ["gecko/idle-skip"]
-scripting-mut-traps = ["gecko/scripting-mut-traps", "scripting/scripting-mut-traps"]
+hooks-mut-traps = ["gecko/hooks-mut-traps", "scripting/hooks-mut-traps"]
[dependencies]
-gecko = { path = "../gecko", features = ["scripting"] }
+gecko = { path = "../gecko", features = ["hooks"] }
scripting = { path = "../scripting" }
image = { path = "../image" }
dbglib = { path = "../dbglib" }
diff --git a/crates/debugger/src/main.rs b/crates/debugger/src/main.rs
index 3c5d891..dbbe567 100644
--- a/crates/debugger/src/main.rs
+++ b/crates/debugger/src/main.rs
@@ -148,8 +148,8 @@ fn main() {
}
if let Some(ref path) = args.script {
- let host = scripting::LuaScriptHost::from_file(path).expect("failed to load script");
- emulator.set_script_host(Box::new(host));
+ let host = scripting::LuaHost::from_file(path).expect("failed to load script");
+ emulator.set_hook_host(Box::new(host));
}
let symbols = args.elf.as_ref().map(|path| {
diff --git a/crates/debugger/src/render.rs b/crates/debugger/src/render.rs
index f386416..0695bae 100644
--- a/crates/debugger/src/render.rs
+++ b/crates/debugger/src/render.rs
@@ -186,7 +186,7 @@ impl RenderState {
// Drain Lua log messages from the script host
if debugger_ui.show_lua {
- if let Some(ref mut host) = emulator.script_host {
+ if let Some(ref mut host) = emulator.hook_host {
debugger_ui.lua_log.extend(host.drain_logs());
}
}
@@ -194,10 +194,10 @@ impl RenderState {
// Load a new Lua script if requested
if debugger_ui.lua_load_pending {
debugger_ui.lua_load_pending = false;
- match scripting::LuaScriptHost::from_source("editor", &debugger_ui.lua_source) {
+ match scripting::LuaHost::from_source("editor", &debugger_ui.lua_source) {
Ok(host) => {
debugger_ui.lua_log.push("[lua] script loaded".to_string());
- emulator.set_script_host(Box::new(host));
+ emulator.set_hook_host(Box::new(host));
}
Err(err) => {
debugger_ui.lua_log.push(format!("[lua] error: {err}"));
diff --git a/crates/dsptestrunner/Cargo.toml b/crates/dsptestrunner/Cargo.toml
new file mode 100644
index 0000000..353c725
--- /dev/null
+++ b/crates/dsptestrunner/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "dsptestrunner"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+image = { path = "../image" }
+gecko = { path = "../gecko", features = ["hooks"] }
\ No newline at end of file
diff --git a/crates/dsptestrunner/src/main.rs b/crates/dsptestrunner/src/main.rs
new file mode 100644
index 0000000..65da0e4
--- /dev/null
+++ b/crates/dsptestrunner/src/main.rs
@@ -0,0 +1,130 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use gecko::gamecube::GameCube;
+use gecko::hooks::{AddressFilter, BusAddressFilter, HookFilters, HookFlags, HookState, Host};
+use image::Dol;
+
+const DSP_IROM: &[u8] = include_bytes!("../../../private/dsp_rom.bin");
+
+const STDOUT_ADDR: u32 = 0x0C00_7000;
+const FAIL_COUNT_ADDR: u32 = 0x0C00_7004;
+const PASS_COUNT_ADDR: u32 = 0x0C00_7008;
+const CONFIG_ADDR: u32 = 0x0C00_700C;
+
+const TOTAL_TESTS: u32 = 25000;
+
+struct DspTestState {
+ stdout_buf: String,
+ finished: bool,
+ fail_count: u32,
+ pass_count: u32,
+ config_param: u32,
+}
+
+struct DspTestHarness {
+ state: Rc<RefCell<DspTestState>>,
+ hook_state: HookState,
+}
+
+impl DspTestHarness {
+ fn new(state: Rc<RefCell<DspTestState>>) -> Self {
+ let mut flags = HookFlags::empty();
+ flags |= HookFlags::BUS_WRITE_POST;
+ flags |= HookFlags::BUS_READ_PRE;
+
+ let hook_state = HookState {
+ flags,
+ filters: HookFilters {
+ bus_write_post: BusAddressFilter {
+ phys: AddressFilter::from_addresses([STDOUT_ADDR, FAIL_COUNT_ADDR, PASS_COUNT_ADDR]),
+ ..Default::default()
+ },
+ bus_read_pre: BusAddressFilter {
+ phys: AddressFilter::Exact(CONFIG_ADDR),
+ ..Default::default()
+ },
+ ..Default::default()
+ },
+ };
+
+ Self { state, hook_state }
+ }
+}
+
+#[rustfmt::skip]
+impl Host for DspTestHarness {
+ fn hook_state(&self) -> HookState { self.hook_state.clone() }
+
+ fn on_cpu_pre(&mut self, _emu: &mut GameCube) {}
+ fn on_cpu_post(&mut self, _emu: &mut GameCube) {}
+
+ fn on_bus_read_pre(&mut self, _emu: &mut GameCube, _virt_addr: u32, phys_addr: u32, _size: u8) -> Option<u32> {
+ if phys_addr == CONFIG_ADDR {
+ Some(self.state.borrow().config_param)
+ } else {
+ None
+ }
+ }
+
+ fn on_bus_read_post(&mut self, _emu: &mut GameCube, _virt_addr: u32, _phys_addr: u32, _size: u8, value: u32) -> u32 { value }
+ fn on_bus_write_pre(&mut self, _emu: &mut GameCube, _virt_addr: u32, _phys_addr: u32, _size: u8, value: u32) -> u32 { value }
+
+ fn on_bus_write_post(&mut self, _emu: &mut GameCube, _virt_addr: u32, phys_addr: u32, _size: u8, value: u32) {
+ let mut state = self.state.borrow_mut();
+ match phys_addr {
+ STDOUT_ADDR => {
+ let ch = (value & 0xFF) as u8;
+ let done = value & 0x100 != 0;
+ if ch == b'\n' {
+ println!("{}", state.stdout_buf);
+ state.stdout_buf.clear();
+ } else if ch != 0 {
+ state.stdout_buf.push(ch as char);
+ }
+ if done && !state.stdout_buf.is_empty() {
+ println!("{}", state.stdout_buf);
+ state.stdout_buf.clear();
+ }
+ }
+ FAIL_COUNT_ADDR => {
+ state.fail_count = value;
+ if value > 0 || state.fail_count + state.pass_count >= TOTAL_TESTS {
+ state.finished = true;
+ }
+ }
+ PASS_COUNT_ADDR => {
+ state.pass_count = value;
+ if state.pass_count + state.fail_count >= TOTAL_TESTS {
+ state.finished = true;
+ }
+ }
+ _ => {}
+ }
+ }
+}
+
+fn main() {
+ let path = std::env::args().nth(1).expect("Usage: dsptestrunner <path-to-dol>");
+
+ let dol = Dol::parse(std::fs::read(&path).expect("Failed to read DOL file"));
+ let mut gamecube = GameCube::with_image(&dol);
+ gamecube.dsp.load_irom(DSP_IROM);
+
+ let state = Rc::new(RefCell::new(DspTestState {
+ stdout_buf: String::new(),
+ finished: false,
+ fail_count: 0,
+ pass_count: 0,
+ config_param: 0,
+ }));
+ let harness = DspTestHarness::new(state.clone());
+ gamecube.set_hook_host(Box::new(harness));
+
+ while !state.borrow().finished {
+ gamecube.run_until_vsync();
+ }
+
+ let results = state.borrow();
+ println!("Passed: {}, Failed: {}", results.pass_count, results.fail_count);
+}
diff --git a/crates/gecko/Cargo.toml b/crates/gecko/Cargo.toml
index 7727e32..54afd58 100644
--- a/crates/gecko/Cargo.toml
+++ b/crates/gecko/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2024"
[features]
idle-skip = []
-scripting = []
-scripting-mut-traps = ["scripting"]
+hooks = []
+hooks-mut-traps = ["hooks"]
[build-dependencies]
chipi-build = "0.8.2"
diff --git a/crates/gecko/src/gamecube.rs b/crates/gecko/src/gamecube.rs
index b4b650b..bad860f 100644
--- a/crates/gecko/src/gamecube.rs
+++ b/crates/gecko/src/gamecube.rs
@@ -12,12 +12,12 @@ use crate::flipper::pe::PixelEngine;
use crate::flipper::pi::ProcessorInterface;
use crate::flipper::si::{SerialInterface, pad};
use crate::flipper::vi::VideoInterface;
+#[cfg(feature = "hooks")]
+use crate::hooks::{HookFilters, HookFlags, HookState, Host};
#[cfg(feature = "idle-skip")]
use crate::idle::{IDLE_LOOP_MAX_INSTRS, IdleCheck, IdleDetector};
use crate::mmio::Mmio;
use crate::scheduler::{CPU_CYCLES_PER_DSP_TICK, CYCLES_PER_VSYNC, DSP_BATCH_SIZE, EventKind, Scheduler};
-#[cfg(feature = "scripting")]
-use crate::scripting::{HookFlags, ScriptHookFilters, ScriptHookState, ScriptHost};
use image::Executable;
pub struct GameCube {
@@ -39,33 +39,33 @@ pub struct GameCube {
#[cfg(feature = "idle-skip")]
idle: IdleDetector,
- #[cfg(feature = "scripting")]
- pub script_host: Option<Box<dyn ScriptHost>>,
- #[cfg(feature = "scripting")]
- pub script_hook_flags: HookFlags,
- #[cfg(feature = "scripting")]
- pub script_hook_filters: ScriptHookFilters,
+ #[cfg(feature = "hooks")]
+ pub hook_host: Option<Box<dyn Host>>,
+ #[cfg(feature = "hooks")]
+ pub hook_flags: HookFlags,
+ #[cfg(feature = "hooks")]
+ pub hook_filters: HookFilters,
}
impl GameCube {
- #[cfg(feature = "scripting")]
+ #[cfg(feature = "hooks")]
#[inline(always)]
- pub fn apply_script_hook_state(&mut self, state: ScriptHookState) {
- self.script_hook_flags = state.flags;
- self.script_hook_filters = state.filters;
+ pub fn apply_hook_state(&mut self, state: HookState) {
+ self.hook_flags = state.flags;
+ self.hook_filters = state.filters;
}
- #[cfg(feature = "scripting")]
+ #[cfg(feature = "hooks")]
#[inline(always)]
- pub fn sync_pending_script_hook_state(&mut self, host: &mut dyn ScriptHost) {
- #[cfg(feature = "scripting-mut-traps")]
+ pub fn sync_pending_hook_state(&mut self, host: &mut dyn Host) {
+ #[cfg(feature = "hooks-mut-traps")]
match host.take_pending_hook_state() {
- Ok(Some(state)) => self.apply_script_hook_state(state),
+ Ok(Some(state)) => self.apply_hook_state(state),
Ok(None) => {}
Err(err) => tracing::error!(target: "script", error = %err, "failed to refresh script traps"),
}
- #[cfg(not(feature = "scripting-mut-traps"))]
+ #[cfg(not(feature = "hooks-mut-traps"))]
let _ = host;
}
@@ -89,12 +89,12 @@ impl GameCube {
#[cfg(feature = "idle-skip")]
idle: IdleDetector::new(),
- #[cfg(feature = "scripting")]
- script_host: None,
- #[cfg(feature = "scripting")]
- script_hook_flags: HookFlags::empty(),
- #[cfg(feature = "scripting")]
- script_hook_filters: ScriptHookFilters::default(),
+ #[cfg(feature = "hooks")]
+ hook_host: None,
+ #[cfg(feature = "hooks")]
+ hook_flags: HookFlags::empty(),
+ #[cfg(feature = "hooks")]
+ hook_filters: HookFilters::default(),
}
}
@@ -191,14 +191,14 @@ impl GameCube {
}
// CPU pre-hook
- #[cfg(feature = "scripting")]
- if self.script_hook_flags.contains(HookFlags::CPU_PRE) {
+ #[cfg(feature = "hooks")]
+ if self.hook_flags.contains(HookFlags::CPU_PRE) {
let pc = self.cpu.pc;
- if self.script_hook_filters.cpu_pre.matches(pc) {
- if let Some(mut host) = self.script_host.take() {
+ if self.hook_filters.cpu_pre.matches(pc) {
+ if let Some(mut host) = self.hook_host.take() {
host.on_cpu_pre(self);
- self.sync_pending_script_hook_state(host.as_mut());
- self.script_host = Some(host);
+ self.sync_pending_hook_state(host.as_mut());
+ self.hook_host = Some(host);
}
}
}
@@ -211,14 +211,14 @@ impl GameCube {
self.scheduler.cycles += 1;
// CPU post-hook
- #[cfg(feature = "scripting")]
- if self.script_hook_flags.contains(HookFlags::CPU_POST) {
+ #[cfg(feature = "hooks")]
+ if self.hook_flags.contains(HookFlags::CPU_POST) {
let pc = self.cpu.cia;
- if self.script_hook_filters.cpu_post.matches(pc) {
- if let Some(mut host) = self.script_host.take() {
+ if self.hook_filters.cpu_post.matches(pc) {
+ if let Some(mut host) = self.hook_host.take() {
host.on_cpu_post(self);
- self.sync_pending_script_hook_state(host.as_mut());
- self.script_host = Some(host);
+ self.sync_pending_hook_state(host.as_mut());
+ self.hook_host = Some(host);
}
}
}
@@ -281,27 +281,27 @@ impl GameCube {
crate::idle::validate_polling_loop(&buf[..count.min(buf.len())], &self.cpu.gprs)
}
- #[cfg(feature = "scripting")]
- pub fn set_script_host(&mut self, host: Box<dyn ScriptHost>) {
- self.apply_script_hook_state(host.hook_state());
- self.script_host = Some(host);
+ #[cfg(feature = "hooks")]
+ pub fn set_hook_host(&mut self, host: Box<dyn Host>) {
+ self.apply_hook_state(host.hook_state());
+ self.hook_host = Some(host);
}
- #[cfg(all(feature = "scripting", feature = "scripting-mut-traps"))]
- pub fn refresh_script_traps(&mut self) -> Result<(), String> {
- let Some(mut host) = self.script_host.take() else {
+ #[cfg(all(feature = "hooks", feature = "hooks-mut-traps"))]
+ pub fn refresh_hook_traps(&mut self) -> Result<(), String> {
+ let Some(mut host) = self.hook_host.take() else {
return Ok(());
};
let refresh_result = host.force_refresh_traps();
match refresh_result {
Ok(state) => {
- self.apply_script_hook_state(state);
- self.script_host = Some(host);
+ self.apply_hook_state(state);
+ self.hook_host = Some(host);
Ok(())
}
Err(err) => {
- self.script_host = Some(host);
+ self.hook_host = Some(host);
Err(err)
}
}
diff --git a/crates/gecko/src/scripting.rs b/crates/gecko/src/hooks.rs
similarity index 89%
rename from crates/gecko/src/scripting.rs
rename to crates/gecko/src/hooks.rs
index 83546d9..3e38b65 100644
--- a/crates/gecko/src/scripting.rs
+++ b/crates/gecko/src/hooks.rs
@@ -77,7 +77,7 @@ impl BusAddressFilter {
}
#[derive(Clone, Default)]
-pub struct ScriptHookFilters {
+pub struct HookFilters {
pub cpu_pre: AddressFilter,
pub cpu_post: AddressFilter,
pub bus_read_pre: BusAddressFilter,
@@ -87,24 +87,24 @@ pub struct ScriptHookFilters {
}
#[derive(Clone, Default)]
-pub struct ScriptHookState {
+pub struct HookState {
pub flags: HookFlags,
- pub filters: ScriptHookFilters,
+ pub filters: HookFilters,
}
-pub trait ScriptHost {
+pub trait Host {
/// Current cached hook state for the host.
- fn hook_state(&self) -> ScriptHookState;
+ fn hook_state(&self) -> HookState;
/// Forcefully rebuild trap state immediately.
- #[cfg(feature = "scripting-mut-traps")]
- fn force_refresh_traps(&mut self) -> Result<ScriptHookState, String> {
+ #[cfg(feature = "hooks-mut-traps")]
+ fn force_refresh_traps(&mut self) -> Result<HookState, String> {
Ok(self.hook_state())
}
/// Apply any pending trap refresh requested by the script.
- #[cfg(feature = "scripting-mut-traps")]
- fn take_pending_hook_state(&mut self) -> Result<Option<ScriptHookState>, String> {
+ #[cfg(feature = "hooks-mut-traps")]
+ fn take_pending_hook_state(&mut self) -> Result<Option<HookState>, String> {
Ok(None)
}
diff --git a/crates/gecko/src/lib.rs b/crates/gecko/src/lib.rs
index ddb2c1d..bc82b7f 100644
--- a/crates/gecko/src/lib.rs
+++ b/crates/gecko/src/lib.rs
@@ -6,5 +6,5 @@ pub mod idle;
pub mod mmio;
pub mod scheduler;
-#[cfg(feature = "scripting")]
-pub mod scripting;
+#[cfg(feature = "hooks")]
+pub mod hooks;
diff --git a/crates/gecko/src/mmio/bus.rs b/crates/gecko/src/mmio/bus.rs
index 48607bb..bda3134 100644
--- a/crates/gecko/src/mmio/bus.rs
+++ b/crates/gecko/src/mmio/bus.rs
@@ -1,11 +1,11 @@
use crate::gamecube::GameCube;
+#[cfg(feature = "hooks")]
+use crate::hooks::HookFlags;
use crate::mmio::constants::{
AI_BASE, AI_END, CP_BASE, CP_END, DI_BASE, DI_END, DSP_BASE, DSP_END, EXI_BASE, EXI_END, GX_FIFO_BASE, GX_FIFO_END,
IPL_BASE, IPL_END, MI_BASE, MI_END, PE_BASE, PE_END, PI_BASE, PI_END, RAM_END, SI_BASE, SI_END, VI_BASE, VI_END,
};
use crate::mmio::{Mmio, MmioRw};
-#[cfg(feature = "scripting")]
-use crate::scripting::HookFlags;
enum BusTarget {
Cp,
@@ -45,17 +45,17 @@ fn route_mmio(phys: u32) -> (BusTarget, u32) {
macro_rules! bus_read_hooks {
($self:ident, $addr:ident, $phys:ident, $size:literal, $body:expr) => {{
- #[cfg(feature = "scripting")]
- if $self.script_hook_flags.contains(HookFlags::BUS_READ_PRE) {
- if $self.script_hook_filters.bus_read_pre.matches($addr, $phys) {
- if let Some(mut host) = $self.script_host.take() {
+ #[cfg(feature = "hooks")]
+ if $self.hook_flags.contains(HookFlags::BUS_READ_PRE) {
+ if $self.hook_filters.bus_read_pre.matches($addr, $phys) {
+ if let Some(mut host) = $self.hook_host.take() {
if let Some(val) = host.on_bus_read_pre($self, $addr, $phys, $size) {
- $self.sync_pending_script_hook_state(host.as_mut());
- $self.script_host = Some(host);
+ $self.sync_pending_hook_state(host.as_mut());
+ $self.hook_host = Some(host);
return val as _;
}
- $self.sync_pending_script_hook_state(host.as_mut());
- $self.script_host = Some(host);
+ $self.sync_pending_hook_state(host.as_mut());
+ $self.hook_host = Some(host);
}
}
}
@@ -63,13 +63,13 @@ macro_rules! bus_read_hooks {
#[allow(unused_mut)]
let mut result = $body;
- #[cfg(feature = "scripting")]
- if $self.script_hook_flags.contains(HookFlags::BUS_READ_POST) {
- if $self.script_hook_filters.bus_read_post.matches($addr, $phys) {
- if let Some(mut host) = $self.script_host.take() {
+ #[cfg(feature = "hooks")]
+ if $self.hook_flags.contains(HookFlags::BUS_READ_POST) {
+ if $self.hook_filters.bus_read_post.matches($addr, $phys) {
+ if let Some(mut host) = $self.hook_host.take() {
result = host.on_bus_read_post($self, $addr, $phys, $size, result as u32) as _;
- $self.sync_pending_script_hook_state(host.as_mut());
- $self.script_host = Some(host);
+ $self.sync_pending_hook_state(host.as_mut());
+ $self.hook_host = Some(host);
}
}
}
@@ -80,13 +80,13 @@ macro_rules! bus_read_hooks {
macro_rules! bus_write_hooks {
($self:ident, $addr:ident, $phys:ident, $size:literal, $val:ident, $body:expr) => {{
- #[cfg(feature = "scripting")]
- let $val = if $self.script_hook_flags.contains(HookFlags::BUS_WRITE_PRE) {
- if $self.script_hook_filters.bus_write_pre.matches($addr, $phys) {
- if let Some(mut host) = $self.script_host.take() {
+ #[cfg(feature = "hooks")]
+ let $val = if $self.hook_flags.contains(HookFlags::BUS_WRITE_PRE) {
+ if $self.hook_filters.bus_write_pre.matches($addr, $phys) {
+ if let Some(mut host) = $self.hook_host.take() {
let v = host.on_bus_write_pre($self, $addr, $phys, $size, $val as u32) as _;
- $self.sync_pending_script_hook_state(host.as_mut());
- $self.script_host = Some(host);
+ $self.sync_pending_hook_state(host.as_mut());
+ $self.hook_host = Some(host);
v
} else {
$val
@@ -100,13 +100,13 @@ macro_rules! bus_write_hooks {
$body;
- #[cfg(feature = "scripting")]
- if $self.script_hook_flags.contains(HookFlags::BUS_WRITE_POST) {
- if $self.script_hook_filters.bus_write_post.matches($addr, $phys) {
- if let Some(mut host) = $self.script_host.take() {
+ #[cfg(feature = "hooks")]
+ if $self.hook_flags.contains(HookFlags::BUS_WRITE_POST) {
+ if $self.hook_filters.bus_write_post.matches($addr, $phys) {
+ if let Some(mut host) = $self.hook_host.take() {
host.on_bus_write_post($self, $addr, $phys, $size, $val as u32);
- $self.sync_pending_script_hook_state(host.as_mut());
- $self.script_host = Some(host);
+ $self.sync_pending_hook_state(host.as_mut());
+ $self.hook_host = Some(host);
}
}
}
diff --git a/crates/scripting/Cargo.toml b/crates/scripting/Cargo.toml
index b738ace..e78b412 100644
--- a/crates/scripting/Cargo.toml
+++ b/crates/scripting/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2024"
[features]
-scripting-mut-traps = ["gecko/scripting-mut-traps"]
+hooks-mut-traps = ["gecko/hooks-mut-traps"]
[dependencies]
-gecko = { path = "../gecko", features = ["scripting"] }
+gecko = { path = "../gecko", features = ["hooks"] }
mlua = { version = "0.10.5", features = ["lua54", "send"] }
tracing = "0.1.44"
diff --git a/crates/scripting/src/lib.rs b/crates/scripting/src/lib.rs
index 1895e08..6c2ac0e 100644
--- a/crates/scripting/src/lib.rs
+++ b/crates/scripting/src/lib.rs
@@ -1,18 +1,18 @@
use std::collections::HashMap;
-#[cfg(feature = "scripting-mut-traps")]
+#[cfg(feature = "hooks-mut-traps")]
use std::sync::{
Arc,
atomic::{AtomicBool, Ordering},
};
use gecko::gamecube::GameCube;
-use gecko::scripting::{AddressFilter, BusAddressFilter, HookFlags, ScriptHookFilters, ScriptHookState, ScriptHost};
+use gecko::hooks::{AddressFilter, BusAddressFilter, HookFilters, HookFlags, HookState, Host};
use mlua::{Function, Lua, RegistryKey, Result as LuaResult, Table, UserDataMethods, Value};
-pub struct LuaScriptHost {
+pub struct LuaHost {
lua: Lua,
flags: HookFlags,
- #[cfg(feature = "scripting-mut-traps")]
+ #[cfg(feature = "hooks-mut-traps")]
refresh_requested: Arc<AtomicBool>,
cpu_pre: CpuHookDispatch,
cpu_post: CpuHookDispatch,
@@ -25,7 +25,7 @@ pub struct LuaScriptHost {
type CpuHookDispatch = HashMap<u32, LuaCallback>;
struct LoadedDispatches {
- state: ScriptHookState,
+ state: HookState,
cpu_pre: CpuHookDispatch,
cpu_post: CpuHookDispatch,
bus_read_pre: BusHookDispatch,
@@ -100,9 +100,9 @@ impl LoadedDispatches {
}
Ok(Self {
- state: ScriptHookState {
+ state: HookState {
flags,
- filters: ScriptHookFilters {
+ filters: HookFilters {
cpu_pre: AddressFilter::from_addresses(cpu_pre.keys().copied()),
cpu_post: AddressFilter::from_addresses(cpu_post.keys().copied()),
bus_read_pre: bus_read_pre.filter(),
@@ -147,7 +147,7 @@ impl LuaCallback {
}
}
-impl LuaScriptHost {
+impl LuaHost {
pub fn from_file(path: &str) -> LuaResult<Self> {
let source = std::fs::read_to_string(path).map_err(|e| mlua::Error::runtime(e.to_string()))?;
Self::from_source(path, &source)
@@ -155,7 +155,7 @@ impl LuaScriptHost {
pub fn from_source(name: &str, source: &str) -> LuaResult<Self> {
let lua = Lua::new();
- #[cfg(feature = "scripting-mut-traps")]
+ #[cfg(feature = "hooks-mut-traps")]
let refresh_requested = Arc::new(AtomicBool::new(false));
let log_fn = lua.create_function(|_, msg: String| {
@@ -164,7 +164,7 @@ impl LuaScriptHost {
})?;
lua.globals().set("log", log_fn)?;
- #[cfg(feature = "scripting-mut-traps")]
+ #[cfg(feature = "hooks-mut-traps")]
{
let refresh_requested_fn = refresh_requested.clone();
let refresh_fn = lua.create_function(move |_, ()| {
@@ -176,10 +176,10 @@ impl LuaScriptHost {
lua.load(source).set_name(name).exec()?;
- let mut host = LuaScriptHost {
+ let mut host = LuaHost {
lua,
flags: HookFlags::empty(),
- #[cfg(feature = "scripting-mut-traps")]
+ #[cfg(feature = "hooks-mut-traps")]
refresh_requested,
cpu_pre: CpuHookDispatch::default(),
cpu_post: CpuHookDispatch::default(),
@@ -192,7 +192,7 @@ impl LuaScriptHost {
Ok(host)
}
- fn reload_dispatches(&mut self) -> LuaResult<ScriptHookState> {
+ fn reload_dispatches(&mut self) -> LuaResult<HookState> {
let loaded = LoadedDispatches::from_lua(&self.lua)?;
let state = loaded.state.clone();
self.flags = state.flags;
@@ -202,7 +202,7 @@ impl LuaScriptHost {
self.bus_read_post = loaded.bus_read_post;
self.bus_write_pre = loaded.bus_write_pre;
self.bus_write_post = loaded.bus_write_post;
- #[cfg(feature = "scripting-mut-traps")]
+ #[cfg(feature = "hooks-mut-traps")]
self.refresh_requested.store(false, Ordering::Relaxed);
Ok(state)
}
@@ -445,7 +445,7 @@ unsafe impl Send for GameCubeRef {}
impl mlua::UserData for GameCubeRef {
fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
- LuaScriptHost::register_emu_methods(methods);
+ LuaHost::register_emu_methods(methods);
}
}
@@ -463,11 +463,11 @@ impl std::ops::DerefMut for GameCubeRef {
}
}
-impl ScriptHost for LuaScriptHost {
- fn hook_state(&self) -> ScriptHookState {
- ScriptHookState {
+impl Host for LuaHost {
+ fn hook_state(&self) -> HookState {
+ HookState {
flags: self.flags,
- filters: ScriptHookFilters {
+ filters: HookFilters {
cpu_pre: AddressFilter::from_addresses(self.cpu_pre.keys().copied()),
cpu_post: AddressFilter::from_addresses(self.cpu_post.keys().copied()),
bus_read_pre: self.bus_read_pre.filter(),
@@ -478,13 +478,13 @@ impl ScriptHost for LuaScriptHost {
}
}
- #[cfg(feature = "scripting-mut-traps")]
- fn force_refresh_traps(&mut self) -> Result<ScriptHookState, String> {
+ #[cfg(feature = "hooks-mut-traps")]
+ fn force_refresh_traps(&mut self) -> Result<HookState, String> {
self.reload_dispatches().map_err(|err| err.to_string())
}
- #[cfg(feature = "scripting-mut-traps")]
- fn take_pending_hook_state(&mut self) -> Result<Option<ScriptHookState>, String> {
+ #[cfg(feature = "hooks-mut-traps")]
+ fn take_pending_hook_state(&mut self) -> Result<Option<HookState>, String> {
if !self.refresh_requested.swap(false, Ordering::Relaxed) {
return Ok(None);
}
diff --git a/crates/tinyapp/Cargo.toml b/crates/tinyapp/Cargo.toml
index f032662..6c2081f 100644
--- a/crates/tinyapp/Cargo.toml
+++ b/crates/tinyapp/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2024"
[features]
idle-skip = ["gecko/idle-skip"]
-scripting = ["gecko/scripting", "dep:scripting"]
-scripting-mut-traps = ["scripting", "gecko/scripting-mut-traps", "scripting/scripting-mut-traps"]
+scripting = ["gecko/hooks", "dep:scripting"]
+scripting-mut-traps = ["scripting", "gecko/hooks-mut-traps", "scripting/hooks-mut-traps"]
[dependencies]
gecko = { path = "../gecko" }
diff --git a/crates/tinyapp/src/main.rs b/crates/tinyapp/src/main.rs
index 4bdfa4b..964f209 100644
--- a/crates/tinyapp/src/main.rs
+++ b/crates/tinyapp/src/main.rs
@@ -553,8 +553,8 @@ fn main() {
#[cfg(feature = "scripting")]
if let Some(ref path) = args.script {
- let host = scripting::LuaScriptHost::from_file(path).expect("failed to load script");
- emulator.set_script_host(Box::new(host));
+ let host = scripting::LuaHost::from_file(path).expect("failed to load script");
+ emulator.set_hook_host(Box::new(host));
}
// Channel 0 always has a controller connected
diff --git a/crates/tinytracer/Cargo.toml b/crates/tinytracer/Cargo.toml
index 667f98b..e2500c9 100644
--- a/crates/tinytracer/Cargo.toml
+++ b/crates/tinytracer/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2024"
[features]
idle-skip = ["gecko/idle-skip"]
-scripting = ["gecko/scripting", "dep:scripting"]
-scripting-mut-traps = ["scripting", "gecko/scripting-mut-traps", "scripting/scripting-mut-traps"]
+scripting = ["gecko/hooks", "dep:scripting"]
+scripting-mut-traps = ["scripting", "gecko/hooks-mut-traps", "scripting/hooks-mut-traps"]
[dependencies]
gecko = { path = "../gecko" }
diff --git a/crates/tinytracer/src/main.rs b/crates/tinytracer/src/main.rs
index d08656b..cf640f4 100644
--- a/crates/tinytracer/src/main.rs
+++ b/crates/tinytracer/src/main.rs
@@ -117,8 +117,8 @@ fn main() {
#[cfg(feature = "scripting")]
if let Some(path) = &args.script {
- let host = scripting::LuaScriptHost::from_file(path).expect("failed to load script");
- emulator.set_script_host(Box::new(host));
+ let host = scripting::LuaHost::from_file(path).expect("failed to load script");
+ emulator.set_hook_host(Box::new(host));
}
let symbols = args.elf.as_ref().map(|path| {
diff --git a/crates/web/Cargo.toml b/crates/web/Cargo.toml
index 7d4b865..026eb84 100644
--- a/crates/web/Cargo.toml
+++ b/crates/web/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "gecko-web"
+name = "web"
version = "0.1.0"
edition = "2024"
@@ -35,6 +35,4 @@ web-sys = { version = "0.3.94", features = [
"Performance",
"console",
] }
-js-sys = "0.3.94"
console_error_panic_hook = "0.1.7"
-tracing = "0.1.44"