Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

encoder consolidation

Layle708da9d04413
diff --git a/crates/backend-wgpu/src/action.rs b/crates/backend-wgpu/src/action.rs
index f2adf22..03c3c9a 100644
--- a/crates/backend-wgpu/src/action.rs
+++ b/crates/backend-wgpu/src/action.rs
@@ -588,9 +588,7 @@ impl GxRenderer {
self.bind_group_cache.insert(self.draw_bg_keys[i].clone(), new_bg);
}
- let mut encoder = device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
- label: Some("gx_draw_flush_encoder"),
- });
+ let mut encoder = self.take_or_create_encoder(device);
#[cfg(feature = "renderdoc-capture")]
let group_label = format!(
"GX FIFO Execution / EFB Rendering: draws={} vertices={}",
@@ -787,7 +785,7 @@ impl GxRenderer {
#[cfg(feature = "renderdoc-capture")]
encoder.pop_debug_group();
- self.pending_command_buffers.push(encoder.finish());
+ self.current_encoder = Some(encoder);
self.draw_bufs_write_pending = true;
}
diff --git a/crates/backend-wgpu/src/clear.rs b/crates/backend-wgpu/src/clear.rs
index ab66965..d4779b0 100644
--- a/crates/backend-wgpu/src/clear.rs
+++ b/crates/backend-wgpu/src/clear.rs
@@ -215,13 +215,12 @@ impl EfbClear {
}
/// Clear a rectangular region with independent RGB, alpha, and depth
- /// masks. Returns the finished CommandBuffer so the caller can batch
- /// it with surrounding work; returns None on no-op early-outs
- /// (all masks off / zero-area / fully clamped away).
+ /// masks. Records into `encoder` so the surrounding frame's work
+ /// shares one persistent encoder.
pub fn clear_region_masked(
&self,
- device: &wgpu::Device,
queue: &wgpu::Queue,
+ encoder: &mut wgpu::CommandEncoder,
msaa_color_view: &wgpu::TextureView,
resolve_color_view: &wgpu::TextureView,
depth_view: &wgpu::TextureView,
@@ -236,14 +235,14 @@ impl EfbClear {
color_update: bool,
alpha_update: bool,
z_update: bool,
- ) -> Option<wgpu::CommandBuffer> {
+ ) -> bool {
if !color_update && !alpha_update && !z_update {
- return None;
+ return false;
}
if w == 0 || h == 0 {
tracing::warn!(x, y, w, h, "clear: zero-area clear region, skipping");
- return None;
+ return false;
}
let x = x.min(target_width);
@@ -252,7 +251,7 @@ impl EfbClear {
let h = h.min(target_height.saturating_sub(y));
if w == 0 || h == 0 {
tracing::warn!(x, y, w, h, "clear: zero-area after clamping to target, skipping");
- return None;
+ return false;
}
// im gonna vomit
@@ -282,9 +281,6 @@ impl EfbClear {
h,
clear_mask_label(color_update, alpha_update, z_update)
);
- let mut encoder = device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
- label: Some("efb_clear_encoder"),
- });
encoder.push_debug_group(&group_label);
{
let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
@@ -332,7 +328,6 @@ impl EfbClear {
rpass.draw(0..3, 0..1);
}
encoder.pop_debug_group();
-
- Some(encoder.finish())
+ true
}
}
diff --git a/crates/backend-wgpu/src/lib.rs b/crates/backend-wgpu/src/lib.rs
index 77c591e..2c0e599 100644
--- a/crates/backend-wgpu/src/lib.rs
+++ b/crates/backend-wgpu/src/lib.rs
@@ -239,6 +239,9 @@ pub struct GxRenderer {
// Region-scoped EFB clear.
pub(crate) efb_clear: clear::EfbClear,
pub(crate) pending_command_buffers: Vec<wgpu::CommandBuffer>,
+ /// Persistent encoder accumulating GPU commands across operations within
+ /// a frame.
+ pub(crate) current_encoder: Option<wgpu::CommandEncoder>,
pub(crate) draw_bufs_write_pending: bool,
pub(crate) xfb_copy_uniform_write_pending: bool,
pub(crate) efb_clear_uniform_write_pending: bool,
@@ -766,6 +769,7 @@ impl GxRenderer {
xfb_copy_uniform_buffer,
efb_clear,
pending_command_buffers: Vec::with_capacity(8),
+ current_encoder: None,
draw_bufs_write_pending: false,
xfb_copy_uniform_write_pending: false,
efb_clear_uniform_write_pending: false,
@@ -779,7 +783,21 @@ impl GxRenderer {
}
}
+ /// Take ownership of the persistent frame encoder, or create a fresh
+ /// one if there isn't one yet. Caller appends commands and must put it
+ /// back via `self.current_encoder = Some(encoder)`.
+ pub(crate) fn take_or_create_encoder(&mut self, device: &wgpu::Device) -> wgpu::CommandEncoder {
+ self.current_encoder.take().unwrap_or_else(|| {
+ device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
+ label: Some("gx_frame_encoder"),
+ })
+ })
+ }
+
pub(crate) fn submit_pending(&mut self, queue: &wgpu::Queue) {
+ if let Some(encoder) = self.current_encoder.take() {
+ self.pending_command_buffers.push(encoder.finish());
+ }
if self.pending_command_buffers.is_empty() {
return;
}
@@ -811,9 +829,10 @@ impl GxRenderer {
self.submit_pending(queue);
}
- if let Some(cb) = self.efb_clear.clear_region_masked(
- device,
+ let mut encoder = self.take_or_create_encoder(device);
+ let did_clear = self.efb_clear.clear_region_masked(
queue,
+ &mut encoder,
&self.efb_msaa_view,
&self.efb_view,
&self.efb_depth_view,
@@ -828,8 +847,9 @@ impl GxRenderer {
color_update,
alpha_update,
z_update,
- ) {
- self.pending_command_buffers.push(cb);
+ );
+ self.current_encoder = Some(encoder);
+ if did_clear {
self.efb_clear_uniform_write_pending = true;
}
}
diff --git a/crates/backend-wgpu/src/render.rs b/crates/backend-wgpu/src/render.rs
index 3022757..30d0783 100644
--- a/crates/backend-wgpu/src/render.rs
+++ b/crates/backend-wgpu/src/render.rs
@@ -168,6 +168,8 @@ impl GxRenderer {
self.submit_pending(queue);
}
+ let mut encoder = self.take_or_create_encoder(device);
+
let entry = self.xfb_copies.entry(id).or_insert_with(|| {
let texture_label = format!("xfb_copy_tmp id={id} size={width}x{dst_h}");
let tex = device.create_texture(&wgpu::TextureDescriptor {
@@ -218,9 +220,6 @@ impl GxRenderer {
let group_label = format!(
"CopyXfb id={id} src=({src_x},{src_y} {width}x{height}) dst_h={dst_h} gamma={gamma:.3} clear={clear}"
);
- let mut encoder = device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
- label: Some("copy_xfb_encoder"),
- });
encoder.push_debug_group(&group_label);
if needs_shader_copy {
encoder.insert_debug_marker("CopyXfb path: shader copy for scale/gamma");
@@ -309,7 +308,7 @@ impl GxRenderer {
}
encoder.pop_debug_group();
- self.pending_command_buffers.push(encoder.finish());
+ self.current_encoder = Some(encoder);
if needs_shader_copy {
self.xfb_copy_uniform_write_pending = true;
}
@@ -434,9 +433,7 @@ impl GxRenderer {
let group_label = format!(
"CopyEfbToTexture addr={dest_addr:#010x} src=({src_x},{src_y} {width}x{height}) dst={dst_w}x{dst_h} fmt={copy_format:?}"
);
- let mut encoder = device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
- label: Some("efb_pack_encoder"),
- });
+ let mut encoder = self.take_or_create_encoder(device);
encoder.push_debug_group(&group_label);
{
let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
@@ -461,7 +458,7 @@ impl GxRenderer {
rpass.draw(0..3, 0..1);
}
encoder.pop_debug_group();
- self.pending_command_buffers.push(encoder.finish());
+ self.current_encoder = Some(encoder);
self.xfb_copy_uniform_write_pending = true;
self.efb_copy_cache.insert(
@@ -537,9 +534,7 @@ impl GxRenderer {
}
let group_label = format!("PresentXfb size={width}x{height} parts={}", parts.len());
- let mut encoder = device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
- label: Some("present_xfb_encoder"),
- });
+ let mut encoder = self.take_or_create_encoder(device);
encoder.push_debug_group(&group_label);
// Don't clear the XFB: let previous content persist so partial
@@ -594,7 +589,7 @@ impl GxRenderer {
}
encoder.pop_debug_group();
- self.pending_command_buffers.push(encoder.finish());
+ self.current_encoder = Some(encoder);
self.submit_pending(queue);
self.xfb_has_content = true;
}
@@ -667,9 +662,7 @@ impl GxRenderer {
let group_label = format!(
"CopyEfbToTexture addr={dest_addr:#010x} src=({src_x},{src_y} {width}x{height}) fmt={copy_format_enum:?} mip={mipmap} stride={stride} depth={depth_copy}"
);
- let mut encoder = device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
- label: Some("efb_to_texture_copy_encoder"),
- });
+ let mut encoder = self.take_or_create_encoder(device);
encoder.push_debug_group(&group_label);
encoder.copy_texture_to_buffer(
wgpu::TexelCopyTextureInfo {
@@ -697,7 +690,7 @@ impl GxRenderer {
},
);
encoder.pop_debug_group();
- self.pending_command_buffers.push(encoder.finish());
+ self.current_encoder = Some(encoder);
let swap_bgra = matches!(
self.surface_format,
@@ -793,10 +786,8 @@ impl GxRenderer {
let staging_size = bytes_per_row * encode_h as u64;
let (staging, staging_capacity) = self.acquire_readback_staging(device, staging_size);
+ let mut encoder = self.take_or_create_encoder(device);
let (writeback_tex, writeback_view) = self.efb_depth_writeback_target.as_ref().unwrap();
- let mut encoder = device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
- label: Some("efb_depth_encoder"),
- });
encoder.push_debug_group(&format!(
"EfbDepth addr={dest_addr:#010x} src=({src_x},{src_y} {width}x{height}) dst={encode_w}x{encode_h}"
));
diff --git a/crates/gecko/build.rs b/crates/gecko/build.rs
index d8048ed..d01268f 100644
--- a/crates/gecko/build.rs
+++ b/crates/gecko/build.rs
@@ -1,9 +1,9 @@
fn main() {
- chipi_build::generate_bindings("gekko.bindings.chipi").expect("chipi codegen failed (gekko)");
- chipi_build::generate_bindings("dsp.bindings.chipi").expect("chipi codegen failed (dsp)");
- chipi_build::generate_bindings("wii_gekko.bindings.chipi").expect("chipi codegen failed (wii gekko)");
- chipi_build::generate_bindings("wii_dsp.bindings.chipi").expect("chipi codegen failed (wii dsp)");
- chipi_build::generate_bindings("gekko_jit.bindings.chipi").expect("chipi codegen failed (gekko jit)");
- chipi_build::generate_bindings("wii_gekko_jit.bindings.chipi").expect("chipi codegen failed (wii gekko jit)");
- chipi_build::generate_bindings("dsp_jit.bindings.chipi").expect("chipi codegen failed (dsp jit)");
+ chipi_build::generate_bindings("spec/gekko.bindings.chipi").expect("chipi codegen failed (gekko)");
+ chipi_build::generate_bindings("spec/dsp.bindings.chipi").expect("chipi codegen failed (dsp)");
+ chipi_build::generate_bindings("spec/wii_gekko.bindings.chipi").expect("chipi codegen failed (wii gekko)");
+ chipi_build::generate_bindings("spec/wii_dsp.bindings.chipi").expect("chipi codegen failed (wii dsp)");
+ chipi_build::generate_bindings("spec/gekko_jit.bindings.chipi").expect("chipi codegen failed (gekko jit)");
+ chipi_build::generate_bindings("spec/wii_gekko_jit.bindings.chipi").expect("chipi codegen failed (wii gekko jit)");
+ chipi_build::generate_bindings("spec/dsp_jit.bindings.chipi").expect("chipi codegen failed (dsp jit)");
}
diff --git a/crates/gecko/dsp.bindings.chipi b/crates/gecko/dsp.bindings.chipi
deleted file mode 100644
index a32436c..0000000
--- a/crates/gecko/dsp.bindings.chipi
+++ /dev/null
@@ -1,232 +0,0 @@
-include "../../submodules/chipi-spec/gamecube/dsp.chipi"
-
-target rust {
- dispatch GcDsp {
- output "$OUT_DIR/dsp_lut.rs"
-
- context crate::gamecube::GameCube
- handlers crate::flipper::dsp::interpreter
- handler_const crate::system::GC
- strategy fn_ptr_lut
-
- invalid_handler crate::flipper::dsp::interpreter::invalid
-
- instruction_type crate::flipper::dsp::instruction::Instruction {
- output "$OUT_DIR/dsp_instr.rs"
- }
-
- handler control {
- nop
- halt
- ifcc
- jcc
- callcc
- retcc
- rticc
- jrcc
- callrcc
- }
-
- handler loops {
- loop_reg
- bloop
- loopi
- bloopi
- }
-
- handler addr_reg {
- dar
- iar
- subarn
- addarn
- }
-
- handler load_store {
- lri
- lr
- sr
- mrr
- si
- lrr
- lrrd
- lrri
- lrrn
- srr
- srrd
- srri
- srrn
- lrs
- srsh
- srs
- ilrr
- ilrrd
- ilrri
- ilrrn
- }
-
- handler imm_alu {
- addi
- xori
- andi
- ori
- cmpi
- andf
- andcf
- addis
- cmpis
- lris
- }
-
- handler add_sub {
- addr
- addax
- add
- addp
- subr
- subax
- sub
- subp
- addaxl
- addpaxz
- }
-
- handler move_ops {
- movr
- movax
- mov
- movp
- movpz
- movnp
- }
-
- handler inc_dec {
- incm
- inc
- decm
- dec
- neg
- abs_ac
- }
-
- handler cmp_test {
- cmp
- cmpaxh
- tst
- tstprod
- tstaxh
- nx_0
- nx_1
- clr
- clrp
- clrl
- }
-
- handler logic {
- xorr
- andr
- orr
- andc
- orc
- xorc
- not_ac
- }
-
- handler shifts {
- lsl
- lsr
- asl
- asr
- lsl16
- lsr16
- asr16
- lsrn
- asrn
- lsrnrx
- asrnrx
- lsrnr
- asrnr
- }
-
- handler status {
- sbclr
- sbset
- m2
- m0
- clr15
- set15
- set16
- set40
- }
-
- handler mul {
- mul
- mulx
- mulc
- mulaxh
- mulmv
- mulmvz
- mulac
- mulxmv
- mulxmvz
- mulxac
- mulcmv
- mulcmvz
- mulcac
- madd
- msub
- maddx
- msubx
- maddc
- msubc
- }
-
- subdispatch GcDspExt {
- invalid_handler crate::flipper::dsp::interpreter::invalid_ext
-
- instruction_type crate::flipper::dsp::instruction::GcDspExt {
- output "$OUT_DIR/dsp_ext_instr.rs"
- }
-
- handler ext_addr {
- ext_dr
- ext_ir
- ext_nr
- }
-
- handler ext_load {
- ext_l
- ext_ln
- }
-
- handler ext_store {
- ext_s
- ext_sn
- }
-
- handler ext_load_store {
- ext_ls
- ext_sl
- ext_lsn
- ext_sln
- ext_lsm
- ext_slm
- ext_lsnm
- ext_slnm
- }
-
- handler ext_ld {
- ext_ld_00
- ext_ldn_01
- ext_ldm_10
- ext_ldnm_11
- }
-
- handler ext_ldax {
- ext_ldax
- ext_ldaxn
- ext_ldaxm
- ext_ldaxnm
- }
- }
- }
-}
diff --git a/crates/gecko/dsp_jit.bindings.chipi b/crates/gecko/dsp_jit.bindings.chipi
deleted file mode 100644
index 459c8c7..0000000
--- a/crates/gecko/dsp_jit.bindings.chipi
+++ /dev/null
@@ -1,228 +0,0 @@
-include "../../submodules/chipi-spec/gamecube/dsp.chipi"
-
-target rust {
- dispatch GcDsp {
- output "$OUT_DIR/dsp_jit_lut.rs"
-
- context crate::flipper::dsp::jit::translate::TranslatorCtx
- handlers crate::flipper::dsp::jit::translate
- handler_const crate::system::GC
- strategy fn_ptr_lut
-
- invalid_handler crate::flipper::dsp::jit::translate::invalid
-
- instruction_type crate::flipper::dsp::instruction::Instruction
-
- handler control {
- nop
- halt
- ifcc
- jcc
- callcc
- retcc
- rticc
- jrcc
- callrcc
- }
-
- handler loops {
- loop_reg
- bloop
- loopi
- bloopi
- }
-
- handler addr_reg {
- dar
- iar
- subarn
- addarn
- }
-
- handler load_store {
- lri
- lr
- sr
- mrr
- si
- lrr
- lrrd
- lrri
- lrrn
- srr
- srrd
- srri
- srrn
- lrs
- srsh
- srs
- ilrr
- ilrrd
- ilrri
- ilrrn
- }
-
- handler imm_alu {
- addi
- xori
- andi
- ori
- cmpi
- andf
- andcf
- addis
- cmpis
- lris
- }
-
- handler add_sub {
- addr
- addax
- add
- addp
- subr
- subax
- sub
- subp
- addaxl
- addpaxz
- }
-
- handler move_ops {
- movr
- movax
- mov
- movp
- movpz
- movnp
- }
-
- handler inc_dec {
- incm
- inc
- decm
- dec
- neg
- abs_ac
- }
-
- handler cmp_test {
- cmp
- cmpaxh
- tst
- tstprod
- tstaxh
- nx_0
- nx_1
- clr
- clrp
- clrl
- }
-
- handler logic {
- xorr
- andr
- orr
- andc
- orc
- xorc
- not_ac
- }
-
- handler shifts {
- lsl
- lsr
- asl
- asr
- lsl16
- lsr16
- asr16
- lsrn
- asrn
- lsrnrx
- asrnrx
- lsrnr
- asrnr
- }
-
- handler status {
- sbclr
- sbset
- m2
- m0
- clr15
- set15
- set16
- set40
- }
-
- handler mul {
- mul
- mulx
- mulc
- mulaxh
- mulmv
- mulmvz
- mulac
- mulxmv
- mulxmvz
- mulxac
- mulcmv
- mulcmvz
- mulcac
- madd
- msub
- maddx
- msubx
- maddc
- msubc
- }
-
- subdispatch GcDspExt {
- invalid_handler crate::flipper::dsp::jit::translate::invalid_ext
-
- instruction_type crate::flipper::dsp::instruction::GcDspExt
-
- handler ext_addr {
- ext_dr
- ext_ir
- ext_nr
- }
-
- handler ext_load {
- ext_l
- ext_ln
- }
-
- handler ext_store {
- ext_s
- ext_sn
- }
-
- handler ext_load_store {
- ext_ls
- ext_sl
- ext_lsn
- ext_sln
- ext_lsm
- ext_slm
- ext_lsnm
- ext_slnm
- }
-
- handler ext_ld {
- ext_ld_00
- ext_ldn_01
- ext_ldm_10
- ext_ldnm_11
- }
-
- handler ext_ldax {
- ext_ldax
- ext_ldaxn
- ext_ldaxm
- ext_ldaxnm
- }
- }
- }
-}
diff --git a/crates/gecko/gekko.bindings.chipi b/crates/gecko/gekko.bindings.chipi
deleted file mode 100644
index 2061c94..0000000
--- a/crates/gecko/gekko.bindings.chipi
+++ /dev/null
@@ -1,276 +0,0 @@
-include "../../submodules/chipi-spec/gamecube/gekko.chipi"
-
-target rust {
- dispatch Gekko {
- output "$OUT_DIR/gekko_lut.rs"
-
- context crate::gamecube::GameCube
- handlers crate::gekko::interpreter
- handler_const crate::system::GC
- strategy fn_ptr_lut
-
- invalid_handler crate::gekko::interpreter::invalid
-
- instruction_type crate::gekko::instruction::Instruction {
- output "$OUT_DIR/gekko_instr.rs"
- }
-
- handler branch {
- bx
- bcx
- bclrx
- bcctrx
- }
-
- handler alu {
- ori
- oris
- addx
- addi
- addis
- xori
- xoris
- andi_dot
- andis_dot
- subfx
- negx
- addcx
- subfcx
- addex
- subfex
- addzex
- subfzex
- addmex
- subfmex
- mullwx
- divwux
- divwx
- mulhwux
- mulhwx
- subfic
- addic
- addic_dot
- mulli
- }
-
- handler rotate {
- rlwinmx
- rlwimix
- rlwnmx
- }
-
- handler msr {
- mtmsr
- mfmsr
- rfi
- }
-
- handler spr {
- mtspr
- mfspr
- }
-
- handler segment {
- mtsr
- mfsr
- }
-
- handler store_load {
- stw
- stwu
- sth
- sthu
- lwz
- lwzu
- lbz
- lbzu
- stb
- stbu
- lhz
- lhzu
- lha
- lhau
- lmw
- stmw
- lwzx
- lbzx
- lhzx
- lhax
- stwx
- stbx
- sthx
- lwzux
- lbzux
- lhzux
- lhaux
- stwux
- stbux
- sthux
- lwbrx
- lhbrx
- stwbrx
- sthbrx
- }
-
- handler store_load_fp {
- lfd
- lfdu
- stfd
- stfdu
- lfs
- lfsu
- stfs
- stfsu
- lfsx
- lfsux
- lfdx
- lfdux
- stfsx
- stfsux
- stfdx
- stfdux
- stfiwx
- }
-
- handler store_load_psq {
- psq_l
- psq_lu
- psq_st
- psq_stu
- psq_lx
- psq_lux
- psq_stx
- psq_stux
- }
-
- handler compare {
- cmp
- cmpi
- cmpli
- cmpl
- }
-
- handler nop {
- isync
- sync
- eieio
- dcbf
- dcbi
- dcbst
- dcbt
- dcbtst
- dcba
- dcbz
- dcbz_l
- icbi
- tlbie
- tlbia
- tlbsync
- tlbld
- tlbli
- }
-
- handler logical {
- andx
- orx
- xorx
- nandx
- norx
- andcx
- orcx
- eqvx
- slwx
- srwx
- srawx
- srawix
- cntlzwx
- extshx
- extsbx
- }
-
- handler cr_ops {
- mtcrf
- mfcr
- crxor
- cror
- crand
- creqv
- crnor
- crnand
- crandc
- crorc
- mcrf
- }
-
- handler fp_ops {
- mtfsfx
- mffsx
- mtfsb0x
- mtfsb1x
- mtfsfix
- mcrfs
- fmrx
- fnegx
- fabsx
- fnabsx
- frspx
- fctiwx
- fctiwzx
- fcmpu
- fcmpo
- faddx
- fsubx
- fmulx
- fdivx
- fmaddx
- fmsubx
- fnmaddx
- fnmsubx
- faddsx
- fsubsx
- fmulsx
- fdivsx
- fmaddsx
- fmsubsx
- fnmaddsx
- fnmsubsx
- fsqrtsx
- fresx
- fsqrtx
- fselx
- frsqrtex
- }
-
- handler ps_ops {
- ps_cmpu0
- ps_cmpo0
- ps_cmpu1
- ps_cmpo1
- ps_res
- ps_rsqrte
- ps_neg
- ps_mr
- ps_nabs
- ps_abs
- ps_merge00
- ps_merge01
- ps_merge10
- ps_merge11
- ps_sum0
- ps_sum1
- ps_muls0
- ps_muls1
- ps_madds0
- ps_madds1
- ps_div
- ps_sub
- ps_add
- ps_sel
- ps_mul
- ps_msub
- ps_madd
- ps_nmsub
- ps_nmadd
- }
- }
-}
diff --git a/crates/gecko/gekko_jit.bindings.chipi b/crates/gecko/gekko_jit.bindings.chipi
deleted file mode 100644
index 17e6c2a..0000000
--- a/crates/gecko/gekko_jit.bindings.chipi
+++ /dev/null
@@ -1,276 +0,0 @@
-include "../../submodules/chipi-spec/gamecube/gekko.chipi"
-
-target rust {
- dispatch Gekko {
- output "$OUT_DIR/gekko_jit_lut.rs"
-
- context crate::gekko::jit::translator::JitTranslator
- handlers crate::gekko::jit::handlers
- handler_const crate::system::GC
- strategy fn_ptr_lut
-
- invalid_handler crate::gekko::jit::handlers::invalid
-
- instruction_type crate::gekko::instruction::Instruction {
- output "$OUT_DIR/gekko_jit_instr.rs"
- }
-
- handler branch {
- bx
- bcx
- bclrx
- bcctrx
- }
-
- handler alu {
- ori
- oris
- addx
- addi
- addis
- xori
- xoris
- andi_dot
- andis_dot
- subfx
- negx
- addcx
- subfcx
- addex
- subfex
- addzex
- subfzex
- addmex
- subfmex
- mullwx
- divwux
- divwx
- mulhwux
- mulhwx
- subfic
- addic
- addic_dot
- mulli
- }
-
- handler rotate {
- rlwinmx
- rlwimix
- rlwnmx
- }
-
- handler msr {
- mtmsr
- mfmsr
- rfi
- }
-
- handler spr {
- mtspr
- mfspr
- }
-
- handler segment {
- mtsr
- mfsr
- }
-
- handler store_load {
- stw
- stwu
- sth
- sthu
- lwz
- lwzu
- lbz
- lbzu
- stb
- stbu
- lhz
- lhzu
- lha
- lhau
- lmw
- stmw
- lwzx
- lbzx
- lhzx
- lhax
- stwx
- stbx
- sthx
- lwzux
- lbzux
- lhzux
- lhaux
- stwux
- stbux
- sthux
- lwbrx
- lhbrx
- stwbrx
- sthbrx
- }
-
- handler store_load_fp {
- lfd
- lfdu
- stfd
- stfdu
- lfs
- lfsu
- stfs
- stfsu
- lfsx
- lfsux
- lfdx
- lfdux
- stfsx
- stfsux
- stfdx
- stfdux
- stfiwx
- }
-
- handler store_load_psq {
- psq_l
- psq_lu
- psq_st
- psq_stu
- psq_lx
- psq_lux
- psq_stx
- psq_stux
- }
-
- handler compare {
- cmp
- cmpi
- cmpli
- cmpl
- }
-
- handler nop {
- isync
- sync
- eieio
- dcbf
- dcbi
- dcbst
- dcbt
- dcbtst
- dcba
- dcbz
- dcbz_l
- icbi
- tlbie
- tlbia
- tlbsync
- tlbld
- tlbli
- }
-
- handler logical {
- andx
- orx
- xorx
- nandx
- norx
- andcx
- orcx
- eqvx
- slwx
- srwx
- srawx
- srawix
- cntlzwx
- extshx
- extsbx
- }
-
- handler cr_ops {
- mtcrf
- mfcr
- crxor
- cror
- crand
- creqv
- crnor
- crnand
- crandc
- crorc
- mcrf
- }
-
- handler fp_ops {
- mtfsfx
- mffsx
- mtfsb0x
- mtfsb1x
- mtfsfix
- mcrfs
- fmrx
- fnegx
- fabsx
- fnabsx
- frspx
- fctiwx
- fctiwzx
- fcmpu
- fcmpo
- faddx
- fsubx
- fmulx
- fdivx
- fmaddx
- fmsubx
- fnmaddx
- fnmsubx
- faddsx
- fsubsx
- fmulsx
- fdivsx
- fmaddsx
- fmsubsx
- fnmaddsx
- fnmsubsx
- fsqrtsx
- fresx
- fsqrtx
- fselx
- frsqrtex
- }
-
- handler ps_ops {
- ps_cmpu0
- ps_cmpo0
- ps_cmpu1
- ps_cmpo1
- ps_res
- ps_rsqrte
- ps_neg
- ps_mr
- ps_nabs
- ps_abs
- ps_merge00
- ps_merge01
- ps_merge10
- ps_merge11
- ps_sum0
- ps_sum1
- ps_muls0
- ps_muls1
- ps_madds0
- ps_madds1
- ps_div
- ps_sub
- ps_add
- ps_sel
- ps_mul
- ps_msub
- ps_madd
- ps_nmsub
- ps_nmadd
- }
- }
-}
diff --git a/crates/gecko/wii_dsp.bindings.chipi b/crates/gecko/wii_dsp.bindings.chipi
deleted file mode 100644
index 281612a..0000000
--- a/crates/gecko/wii_dsp.bindings.chipi
+++ /dev/null
@@ -1,232 +0,0 @@
-include "../../submodules/chipi-spec/gamecube/dsp.chipi"
-
-target rust {
- dispatch GcDsp {
- output "$OUT_DIR/dsp_lut_wii.rs"
-
- context crate::wii::Wii
- handlers crate::flipper::dsp::interpreter
- handler_const crate::system::WII
- strategy fn_ptr_lut
-
- invalid_handler crate::flipper::dsp::interpreter::invalid
-
- instruction_type crate::flipper::dsp::instruction::Instruction {
- output "$OUT_DIR/dsp_instr_wii.rs"
- }
-
- handler control {
- nop
- halt
- ifcc
- jcc
- callcc
- retcc
- rticc
- jrcc
- callrcc
- }
-
- handler loops {
- loop_reg
- bloop
- loopi
- bloopi
- }
-
- handler addr_reg {
- dar
- iar
- subarn
- addarn
- }
-
- handler load_store {
- lri
- lr
- sr
- mrr
- si
- lrr
- lrrd
- lrri
- lrrn
- srr
- srrd
- srri
- srrn
- lrs
- srsh
- srs
- ilrr
- ilrrd
- ilrri
- ilrrn
- }
-
- handler imm_alu {
- addi
- xori
- andi
- ori
- cmpi
- andf
- andcf
- addis
- cmpis
- lris
- }
-
- handler add_sub {
- addr
- addax
- add
- addp
- subr
- subax
- sub
- subp
- addaxl
- addpaxz
- }
-
- handler move_ops {
- movr
- movax
- mov
- movp
- movpz
- movnp
- }
-
- handler inc_dec {
- incm
- inc
- decm
- dec
- neg
- abs_ac
- }
-
- handler cmp_test {
- cmp
- cmpaxh
- tst
- tstprod
- tstaxh
- nx_0
- nx_1
- clr
- clrp
- clrl
- }
-
- handler logic {
- xorr
- andr
- orr
- andc
- orc
- xorc
- not_ac
- }
-
- handler shifts {
- lsl
- lsr
- asl
- asr
- lsl16
- lsr16
- asr16
- lsrn
- asrn
- lsrnrx
- asrnrx
- lsrnr
- asrnr
- }
-
- handler status {
- sbclr
- sbset
- m2
- m0
- clr15
- set15
- set16
- set40
- }
-
- handler mul {
- mul
- mulx
- mulc
- mulaxh
- mulmv
- mulmvz
- mulac
- mulxmv
- mulxmvz
- mulxac
- mulcmv
- mulcmvz
- mulcac
- madd
- msub
- maddx
- msubx
- maddc
- msubc
- }
-
- subdispatch GcDspExt {
- invalid_handler crate::flipper::dsp::interpreter::invalid_ext
-
- instruction_type crate::flipper::dsp::instruction::GcDspExt {
- output "$OUT_DIR/dsp_ext_instr_wii.rs"
- }
-
- handler ext_addr {
- ext_dr
- ext_ir
- ext_nr
- }
-
- handler ext_load {
- ext_l
- ext_ln
- }
-
- handler ext_store {
- ext_s
- ext_sn
- }
-
- handler ext_load_store {
- ext_ls
- ext_sl
- ext_lsn
- ext_sln
- ext_lsm
- ext_slm
- ext_lsnm
- ext_slnm
- }
-
- handler ext_ld {
- ext_ld_00
- ext_ldn_01
- ext_ldm_10
- ext_ldnm_11
- }
-
- handler ext_ldax {
- ext_ldax
- ext_ldaxn
- ext_ldaxm
- ext_ldaxnm
- }
- }
- }
-}
diff --git a/crates/gecko/wii_gekko.bindings.chipi b/crates/gecko/wii_gekko.bindings.chipi
deleted file mode 100644
index 611fe24..0000000
--- a/crates/gecko/wii_gekko.bindings.chipi
+++ /dev/null
@@ -1,276 +0,0 @@
-include "../../submodules/chipi-spec/gamecube/gekko.chipi"
-
-target rust {
- dispatch Gekko {
- output "$OUT_DIR/gekko_lut_wii.rs"
-
- context crate::wii::Wii
- handlers crate::gekko::interpreter
- handler_const crate::system::WII
- strategy fn_ptr_lut
-
- invalid_handler crate::gekko::interpreter::invalid
-
- instruction_type crate::gekko::instruction::Instruction {
- output "$OUT_DIR/gekko_instr_wii.rs"
- }
-
- handler branch {
- bx
- bcx
- bclrx
- bcctrx
- }
-
- handler alu {
- ori
- oris
- addx
- addi
- addis
- xori
- xoris
- andi_dot
- andis_dot
- subfx
- negx
- addcx
- subfcx
- addex
- subfex
- addzex
- subfzex
- addmex
- subfmex
- mullwx
- divwux
- divwx
- mulhwux
- mulhwx
- subfic
- addic
- addic_dot
- mulli
- }
-
- handler rotate {
- rlwinmx
- rlwimix
- rlwnmx
- }
-
- handler msr {
- mtmsr
- mfmsr
- rfi
- }
-
- handler spr {
- mtspr
- mfspr
- }
-
- handler segment {
- mtsr
- mfsr
- }
-
- handler store_load {
- stw
- stwu
- sth
- sthu
- lwz
- lwzu
- lbz
- lbzu
- stb
- stbu
- lhz
- lhzu
- lha
- lhau
- lmw
- stmw
- lwzx
- lbzx
- lhzx
- lhax
- stwx
- stbx
- sthx
- lwzux
- lbzux
- lhzux
- lhaux
- stwux
- stbux
- sthux
- lwbrx
- lhbrx
- stwbrx
- sthbrx
- }
-
- handler store_load_fp {
- lfd
- lfdu
- stfd
- stfdu
- lfs
- lfsu
- stfs
- stfsu
- lfsx
- lfsux
- lfdx
- lfdux
- stfsx
- stfsux
- stfdx
- stfdux
- stfiwx
- }
-
- handler store_load_psq {
- psq_l
- psq_lu
- psq_st
- psq_stu
- psq_lx
- psq_lux
- psq_stx
- psq_stux
- }
-
- handler compare {
- cmp
- cmpi
- cmpli
- cmpl
- }
-
- handler nop {
- isync
- sync
- eieio
- dcbf
- dcbi
- dcbst
- dcbt
- dcbtst
- dcba
- dcbz
- dcbz_l
- icbi
- tlbie
- tlbia
- tlbsync
- tlbld
- tlbli
- }
-
- handler logical {
- andx
- orx
- xorx
- nandx
- norx
- andcx
- orcx
- eqvx
- slwx
- srwx
- srawx
- srawix
- cntlzwx
- extshx
- extsbx
- }
-
- handler cr_ops {
- mtcrf
- mfcr
- crxor
- cror
- crand
- creqv
- crnor
- crnand
- crandc
- crorc
- mcrf
- }
-
- handler fp_ops {
- mtfsfx
- mffsx
- mtfsb0x
- mtfsb1x
- mtfsfix
- mcrfs
- fmrx
- fnegx
- fabsx
- fnabsx
- frspx
- fctiwx
- fctiwzx
- fcmpu
- fcmpo
- faddx
- fsubx
- fmulx
- fdivx
- fmaddx
- fmsubx
- fnmaddx
- fnmsubx
- faddsx
- fsubsx
- fmulsx
- fdivsx
- fmaddsx
- fmsubsx
- fnmaddsx
- fnmsubsx
- fsqrtsx
- fresx
- fsqrtx
- fselx
- frsqrtex
- }
-
- handler ps_ops {
- ps_cmpu0
- ps_cmpo0
- ps_cmpu1
- ps_cmpo1
- ps_res
- ps_rsqrte
- ps_neg
- ps_mr
- ps_nabs
- ps_abs
- ps_merge00
- ps_merge01
- ps_merge10
- ps_merge11
- ps_sum0
- ps_sum1
- ps_muls0
- ps_muls1
- ps_madds0
- ps_madds1
- ps_div
- ps_sub
- ps_add
- ps_sel
- ps_mul
- ps_msub
- ps_madd
- ps_nmsub
- ps_nmadd
- }
- }
-}
diff --git a/crates/gecko/wii_gekko_jit.bindings.chipi b/crates/gecko/wii_gekko_jit.bindings.chipi
deleted file mode 100644
index eedbd87..0000000
--- a/crates/gecko/wii_gekko_jit.bindings.chipi
+++ /dev/null
@@ -1,276 +0,0 @@
-include "../../submodules/chipi-spec/gamecube/gekko.chipi"
-
-target rust {
- dispatch Gekko {
- output "$OUT_DIR/gekko_jit_lut_wii.rs"
-
- context crate::gekko::jit::translator::JitTranslator
- handlers crate::gekko::jit::handlers
- handler_const crate::system::WII
- strategy fn_ptr_lut
-
- invalid_handler crate::gekko::jit::handlers::invalid
-
- instruction_type crate::gekko::instruction::Instruction {
- output "$OUT_DIR/gekko_jit_instr_wii.rs"
- }
-
- handler branch {
- bx
- bcx
- bclrx
- bcctrx
- }
-
- handler alu {
- ori
- oris
- addx
- addi
- addis
- xori
- xoris
- andi_dot
- andis_dot
- subfx
- negx
- addcx
- subfcx
- addex
- subfex
- addzex
- subfzex
- addmex
- subfmex
- mullwx
- divwux
- divwx
- mulhwux
- mulhwx
- subfic
- addic
- addic_dot
- mulli
- }
-
- handler rotate {
- rlwinmx
- rlwimix
- rlwnmx
- }
-
- handler msr {
- mtmsr
- mfmsr
- rfi
- }
-
- handler spr {
- mtspr
- mfspr
- }
-
- handler segment {
- mtsr
- mfsr
- }
-
- handler store_load {
- stw
- stwu
- sth
- sthu
- lwz
- lwzu
- lbz
- lbzu
- stb
- stbu
- lhz
- lhzu
- lha
- lhau
- lmw
- stmw
- lwzx
- lbzx
- lhzx
- lhax
- stwx
- stbx
- sthx
- lwzux
- lbzux
- lhzux
- lhaux
- stwux
- stbux
- sthux
- lwbrx
- lhbrx
- stwbrx
- sthbrx
- }
-
- handler store_load_fp {
- lfd
- lfdu
- stfd
- stfdu
- lfs
- lfsu
- stfs
- stfsu
- lfsx
- lfsux
- lfdx
- lfdux
- stfsx
- stfsux
- stfdx
- stfdux
- stfiwx
- }
-
- handler store_load_psq {
- psq_l
- psq_lu
- psq_st
- psq_stu
- psq_lx
- psq_lux
- psq_stx
- psq_stux
- }
-
- handler compare {
- cmp
- cmpi
- cmpli
- cmpl
- }
-
- handler nop {
- isync
- sync
- eieio
- dcbf
- dcbi
- dcbst
- dcbt
- dcbtst
- dcba
- dcbz
- dcbz_l
- icbi
- tlbie
- tlbia
- tlbsync
- tlbld
- tlbli
- }
-
- handler logical {
- andx
- orx
- xorx
- nandx
- norx
- andcx
- orcx
- eqvx
- slwx
- srwx
- srawx
- srawix
- cntlzwx
- extshx
- extsbx
- }
-
- handler cr_ops {
- mtcrf
- mfcr
- crxor
- cror
- crand
- creqv
- crnor
- crnand
- crandc
- crorc
- mcrf
- }
-
- handler fp_ops {
- mtfsfx
- mffsx
- mtfsb0x
- mtfsb1x
- mtfsfix
- mcrfs
- fmrx
- fnegx
- fabsx
- fnabsx
- frspx
- fctiwx
- fctiwzx
- fcmpu
- fcmpo
- faddx
- fsubx
- fmulx
- fdivx
- fmaddx
- fmsubx
- fnmaddx
- fnmsubx
- faddsx
- fsubsx
- fmulsx
- fdivsx
- fmaddsx
- fmsubsx
- fnmaddsx
- fnmsubsx
- fsqrtsx
- fresx
- fsqrtx
- fselx
- frsqrtex
- }
-
- handler ps_ops {
- ps_cmpu0
- ps_cmpo0
- ps_cmpu1
- ps_cmpo1
- ps_res
- ps_rsqrte
- ps_neg
- ps_mr
- ps_nabs
- ps_abs
- ps_merge00
- ps_merge01
- ps_merge10
- ps_merge11
- ps_sum0
- ps_sum1
- ps_muls0
- ps_muls1
- ps_madds0
- ps_madds1
- ps_div
- ps_sub
- ps_add
- ps_sel
- ps_mul
- ps_msub
- ps_madd
- ps_nmsub
- ps_nmadd
- }
- }
-}