Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

chipi 0.9.0

Laylef9d8f4749430
diff --git a/Cargo.lock b/Cargo.lock
index 38b4114..cb55270 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -457,22 +457,18 @@ dependencies = [
[[package]]
name = "chipi-build"
-version = "0.8.2"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2676885c88403477d9053fc020668dd50d352bd05c8ff4668a276f79655c3550"
+checksum = "bc93ee723a2e1024de5fdcb59d2dfac6e06edf9a9ad7a3941920d5d9296b8fdc"
dependencies = [
"chipi-core",
]
[[package]]
name = "chipi-core"
-version = "0.8.2"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c00155ee6a20d40473b212f6b33d20d14525b47df5f5628e609b05c78272833"
-dependencies = [
- "serde",
- "toml",
-]
+checksum = "7c334634fcf9d942efa6f676b81d3dbf14c0bcf94fede78738d02a09eb3cc30a"
[[package]]
name = "clap"
@@ -3098,15 +3094,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "serde_spanned"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876ac351060d4f882bb1032b6369eb0aef79ad9df1ea8bc404874d8cc3d0cd98"
-dependencies = [
- "serde_core",
-]
-
[[package]]
name = "sha3"
version = "0.10.8"
@@ -3501,21 +3488,6 @@ dependencies = [
"tracing-subscriber",
]
-[[package]]
-name = "toml"
-version = "1.1.0+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8195ca05e4eb728f4ba94f3e3291661320af739c4e43779cbdfae82ab239fcc"
-dependencies = [
- "indexmap",
- "serde_core",
- "serde_spanned",
- "toml_datetime",
- "toml_parser",
- "toml_writer",
- "winnow",
-]
-
[[package]]
name = "toml_datetime"
version = "1.1.0+spec-1.1.0"
@@ -3546,12 +3518,6 @@ dependencies = [
"winnow",
]
-[[package]]
-name = "toml_writer"
-version = "1.1.0+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d282ade6016312faf3e41e57ebbba0c073e4056dab1232ab1cb624199648f8ed"
-
[[package]]
name = "tracing"
version = "0.1.44"
diff --git a/crates/disasm/Cargo.toml b/crates/disasm/Cargo.toml
index 45856a3..ffd1af8 100644
--- a/crates/disasm/Cargo.toml
+++ b/crates/disasm/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.1.0"
edition = "2024"
[build-dependencies]
-chipi-build = "0.8.2"
\ No newline at end of file
+chipi-build = "0.9.0"
\ No newline at end of file
diff --git a/crates/disasm/build.rs b/crates/disasm/build.rs
index bce541b..1d70a43 100644
--- a/crates/disasm/build.rs
+++ b/crates/disasm/build.rs
@@ -1,3 +1,4 @@
fn main() {
- chipi_build::run_config("chipi.toml").expect("chipi codegen failed");
+ chipi_build::generate_bindings("gekko.bindings.chipi").expect("chipi codegen failed (gekko)");
+ chipi_build::generate_bindings("dsp.bindings.chipi").expect("chipi codegen failed (dsp)");
}
diff --git a/crates/disasm/chipi.toml b/crates/disasm/chipi.toml
deleted file mode 100644
index 6e592f1..0000000
--- a/crates/disasm/chipi.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[[gen]]
-input = "../../submodules/chipi-spec/gamecube/gekko.chipi"
-lang = "rust"
-output = "$OUT_DIR/gekko.rs"
-
-[gen.type_map]
-gpr = "crate::cpu::Gpr"
-fpr = "crate::cpu::Fpr"
-
-[[gen]]
-input = "../../submodules/chipi-spec/gamecube/dsp.chipi"
-lang = "rust"
-output = "$OUT_DIR/dsp.rs"
diff --git a/crates/disasm/dsp.bindings.chipi b/crates/disasm/dsp.bindings.chipi
new file mode 100644
index 0000000..36f6d85
--- /dev/null
+++ b/crates/disasm/dsp.bindings.chipi
@@ -0,0 +1,7 @@
+include "../../submodules/chipi-spec/gamecube/dsp.chipi"
+
+target rust {
+ decoder GcDsp {
+ output "$OUT_DIR/dsp.rs"
+ }
+}
diff --git a/crates/disasm/gekko.bindings.chipi b/crates/disasm/gekko.bindings.chipi
new file mode 100644
index 0000000..a399708
--- /dev/null
+++ b/crates/disasm/gekko.bindings.chipi
@@ -0,0 +1,10 @@
+include "../../submodules/chipi-spec/gamecube/gekko.chipi"
+
+target rust {
+ decoder Gekko {
+ output "$OUT_DIR/gekko.rs"
+
+ type gpr = crate::cpu::Gpr
+ type fpr = crate::cpu::Fpr
+ }
+}
diff --git a/crates/gecko/Cargo.toml b/crates/gecko/Cargo.toml
index fd35a96..ae5f81e 100644
--- a/crates/gecko/Cargo.toml
+++ b/crates/gecko/Cargo.toml
@@ -14,7 +14,7 @@ hooks-mut-traps = ["hooks"]
efb-writeback = ["dep:crossbeam-channel"]
[build-dependencies]
-chipi-build = "0.8.2"
+chipi-build = "0.9.0"
[dependencies]
chapa = "0.1.2"
diff --git a/crates/gecko/build.rs b/crates/gecko/build.rs
index bce541b..1d70a43 100644
--- a/crates/gecko/build.rs
+++ b/crates/gecko/build.rs
@@ -1,3 +1,4 @@
fn main() {
- chipi_build::run_config("chipi.toml").expect("chipi codegen failed");
+ chipi_build::generate_bindings("gekko.bindings.chipi").expect("chipi codegen failed (gekko)");
+ chipi_build::generate_bindings("dsp.bindings.chipi").expect("chipi codegen failed (dsp)");
}
diff --git a/crates/gecko/chipi.toml b/crates/gecko/chipi.toml
deleted file mode 100644
index 4606378..0000000
--- a/crates/gecko/chipi.toml
+++ /dev/null
@@ -1,288 +0,0 @@
-[[lut]]
-input = "../../submodules/chipi-spec/gamecube/gekko.chipi"
-output = "$OUT_DIR/gekko_lut.rs"
-handler_mod = "crate::cpu::interpreter"
-ctx_type = "crate::gamecube::GameCube"
-instr_type = "crate::cpu::instruction::Instruction"
-lut_mod = "crate::cpu::lut"
-dispatch = "fn_ptr_lut"
-instr_type_output = "$OUT_DIR/gekko_instr.rs"
-
-[lut.groups]
-branch = ["bx", "bcx", "bclrx", "bcctrx"]
-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",
-]
-rotate = ["rlwinmx", "rlwimix", "rlwnmx"]
-msr = ["mtmsr", "mfmsr", "rfi"]
-spr = ["mtspr", "mfspr"]
-segment = ["mtsr", "mfsr"]
-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",
-]
-store_load_fp = [
- "lfd",
- "lfdu",
- "stfd",
- "stfdu",
- "lfs",
- "lfsu",
- "stfs",
- "stfsu",
- "lfsx",
- "lfsux",
- "lfdx",
- "lfdux",
- "stfsx",
- "stfsux",
- "stfdx",
- "stfdux",
- "stfiwx",
-]
-store_load_psq = [
- "psq_l",
- "psq_lu",
- "psq_st",
- "psq_stu",
- "psq_lx",
- "psq_lux",
- "psq_stx",
- "psq_stux",
-]
-compare = ["cmp", "cmpi", "cmpli", "cmpl"]
-nop = [
- "isync",
- "sync",
- "eieio",
- "dcbf",
- "dcbi",
- "dcbst",
- "dcbt",
- "dcbtst",
- "dcba",
- "dcbz",
- "dcbz_l",
- "icbi",
- "tlbie",
- "tlbia",
- "tlbsync",
- "tlbld",
- "tlbli",
-]
-logical = [
- "andx",
- "orx",
- "xorx",
- "nandx",
- "norx",
- "andcx",
- "orcx",
- "eqvx",
- "slwx",
- "srwx",
- "srawx",
- "srawix",
- "cntlzwx",
- "extshx",
- "extsbx",
-]
-cr_ops = [
- "mtcrf",
- "mfcr",
- "crxor",
- "cror",
- "crand",
- "creqv",
- "crnor",
- "crnand",
- "crandc",
- "crorc",
- "mcrf",
-]
-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",
-]
-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",
-]
-
-[[lut]]
-input = "../../submodules/chipi-spec/gamecube/dsp.chipi"
-output = "$OUT_DIR/dsp_lut.rs"
-handler_mod = "crate::flipper::dsp::interpreter"
-ctx_type = "crate::gamecube::GameCube"
-instr_type = "crate::flipper::dsp::instruction::Instruction"
-lut_mod = "crate::flipper::dsp::lut"
-dispatch = "fn_ptr_lut"
-instr_type_output = "$OUT_DIR/dsp_instr.rs"
-
-[lut.groups]
-control = ["nop", "halt", "ifcc", "jcc", "callcc", "retcc", "rticc", "jrcc", "callrcc"]
-loops = ["loop_reg", "bloop", "loopi", "bloopi"]
-addr_reg = ["dar", "iar", "subarn", "addarn"]
-load_store = [
- "lri", "lr", "sr", "mrr", "si",
- "lrr", "lrrd", "lrri", "lrrn",
- "srr", "srrd", "srri", "srrn",
- "lrs", "srsh", "srs",
- "ilrr", "ilrrd", "ilrri", "ilrrn",
-]
-imm_alu = ["addi", "xori", "andi", "ori", "cmpi", "andf", "andcf", "addis", "cmpis", "lris"]
-add_sub = ["addr", "addax", "add", "addp", "subr", "subax", "sub", "subp", "addaxl", "addpaxz"]
-move_ops = ["movr", "movax", "mov", "movp", "movpz", "movnp"]
-inc_dec = ["incm", "inc", "decm", "dec", "neg", "abs_ac"]
-cmp_test = ["cmp", "cmpaxh", "tst", "tstprod", "tstaxh", "nx_0", "nx_1", "clr", "clrp", "clrl"]
-logic = ["xorr", "andr", "orr", "andc", "orc", "xorc", "not_ac"]
-shifts = [
- "lsl", "lsr", "asl", "asr",
- "lsl16", "lsr16", "asr16",
- "lsrn", "asrn", "lsrnrx", "asrnrx", "lsrnr", "asrnr",
-]
-status = ["sbclr", "sbset", "m2", "m0", "clr15", "set15", "set16", "set40"]
-mul = [
- "mul", "mulx", "mulc", "mulaxh",
- "mulmv", "mulmvz", "mulac",
- "mulxmv", "mulxmvz", "mulxac",
- "mulcmv", "mulcmvz", "mulcac",
- "madd", "msub", "maddx", "msubx", "maddc", "msubc",
-]
-
-[lut.subdecoder_instr_type_outputs]
-GcDspExt = "$OUT_DIR/dsp_ext_instr.rs"
-
-[lut.subdecoder_instr_types]
-GcDspExt = "crate::flipper::dsp::instruction::GcDspExt"
-
-[lut.subdecoder_groups.GcDspExt]
-ext_addr = ["ext_dr", "ext_ir", "ext_nr"]
-ext_load = ["ext_l", "ext_ln"]
-ext_store = ["ext_s", "ext_sn"]
-ext_load_store = [
- "ext_ls", "ext_sl", "ext_lsn", "ext_sln",
- "ext_lsm", "ext_slm", "ext_lsnm", "ext_slnm",
-]
-ext_ld = ["ext_ld_00", "ext_ldn_01", "ext_ldm_10", "ext_ldnm_11"]
-ext_ldax = ["ext_ldax", "ext_ldaxn", "ext_ldaxm", "ext_ldaxnm"]
diff --git a/crates/gecko/dsp.bindings.chipi b/crates/gecko/dsp.bindings.chipi
new file mode 100644
index 0000000..ff3356a
--- /dev/null
+++ b/crates/gecko/dsp.bindings.chipi
@@ -0,0 +1,231 @@
+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
+ 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<const OP> {
+ nop
+ halt
+ ifcc
+ jcc
+ callcc
+ retcc
+ rticc
+ jrcc
+ callrcc
+ }
+
+ handler loops<const OP> {
+ loop_reg
+ bloop
+ loopi
+ bloopi
+ }
+
+ handler addr_reg<const OP> {
+ dar
+ iar
+ subarn
+ addarn
+ }
+
+ handler load_store<const OP> {
+ lri
+ lr
+ sr
+ mrr
+ si
+ lrr
+ lrrd
+ lrri
+ lrrn
+ srr
+ srrd
+ srri
+ srrn
+ lrs
+ srsh
+ srs
+ ilrr
+ ilrrd
+ ilrri
+ ilrrn
+ }
+
+ handler imm_alu<const OP> {
+ addi
+ xori
+ andi
+ ori
+ cmpi
+ andf
+ andcf
+ addis
+ cmpis
+ lris
+ }
+
+ handler add_sub<const OP> {
+ addr
+ addax
+ add
+ addp
+ subr
+ subax
+ sub
+ subp
+ addaxl
+ addpaxz
+ }
+
+ handler move_ops<const OP> {
+ movr
+ movax
+ mov
+ movp
+ movpz
+ movnp
+ }
+
+ handler inc_dec<const OP> {
+ incm
+ inc
+ decm
+ dec
+ neg
+ abs_ac
+ }
+
+ handler cmp_test<const OP> {
+ cmp
+ cmpaxh
+ tst
+ tstprod
+ tstaxh
+ nx_0
+ nx_1
+ clr
+ clrp
+ clrl
+ }
+
+ handler logic<const OP> {
+ xorr
+ andr
+ orr
+ andc
+ orc
+ xorc
+ not_ac
+ }
+
+ handler shifts<const OP> {
+ lsl
+ lsr
+ asl
+ asr
+ lsl16
+ lsr16
+ asr16
+ lsrn
+ asrn
+ lsrnrx
+ asrnrx
+ lsrnr
+ asrnr
+ }
+
+ handler status<const OP> {
+ sbclr
+ sbset
+ m2
+ m0
+ clr15
+ set15
+ set16
+ set40
+ }
+
+ handler mul<const OP> {
+ 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<const OP> {
+ ext_dr
+ ext_ir
+ ext_nr
+ }
+
+ handler ext_load<const OP> {
+ ext_l
+ ext_ln
+ }
+
+ handler ext_store<const OP> {
+ ext_s
+ ext_sn
+ }
+
+ handler ext_load_store<const OP> {
+ ext_ls
+ ext_sl
+ ext_lsn
+ ext_sln
+ ext_lsm
+ ext_slm
+ ext_lsnm
+ ext_slnm
+ }
+
+ handler ext_ld<const OP> {
+ ext_ld_00
+ ext_ldn_01
+ ext_ldm_10
+ ext_ldnm_11
+ }
+
+ handler ext_ldax<const OP> {
+ ext_ldax
+ ext_ldaxn
+ ext_ldaxm
+ ext_ldaxnm
+ }
+ }
+ }
+}
diff --git a/crates/gecko/gekko.bindings.chipi b/crates/gecko/gekko.bindings.chipi
new file mode 100644
index 0000000..18c5bc4
--- /dev/null
+++ b/crates/gecko/gekko.bindings.chipi
@@ -0,0 +1,275 @@
+include "../../submodules/chipi-spec/gamecube/gekko.chipi"
+
+target rust {
+ dispatch Gekko {
+ output "$OUT_DIR/gekko_lut.rs"
+
+ context crate::gamecube::GameCube
+ handlers crate::cpu::interpreter
+ strategy fn_ptr_lut
+
+ invalid_handler crate::cpu::interpreter::invalid
+
+ instruction_type crate::cpu::instruction::Instruction {
+ output "$OUT_DIR/gekko_instr.rs"
+ }
+
+ handler branch<const OP> {
+ bx
+ bcx
+ bclrx
+ bcctrx
+ }
+
+ handler alu<const OP> {
+ 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<const OP> {
+ rlwinmx
+ rlwimix
+ rlwnmx
+ }
+
+ handler msr<const OP> {
+ mtmsr
+ mfmsr
+ rfi
+ }
+
+ handler spr<const OP> {
+ mtspr
+ mfspr
+ }
+
+ handler segment<const OP> {
+ mtsr
+ mfsr
+ }
+
+ handler store_load<const OP> {
+ 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<const OP> {
+ lfd
+ lfdu
+ stfd
+ stfdu
+ lfs
+ lfsu
+ stfs
+ stfsu
+ lfsx
+ lfsux
+ lfdx
+ lfdux
+ stfsx
+ stfsux
+ stfdx
+ stfdux
+ stfiwx
+ }
+
+ handler store_load_psq<const OP> {
+ psq_l
+ psq_lu
+ psq_st
+ psq_stu
+ psq_lx
+ psq_lux
+ psq_stx
+ psq_stux
+ }
+
+ handler compare<const OP> {
+ cmp
+ cmpi
+ cmpli
+ cmpl
+ }
+
+ handler nop<const OP> {
+ isync
+ sync
+ eieio
+ dcbf
+ dcbi
+ dcbst
+ dcbt
+ dcbtst
+ dcba
+ dcbz
+ dcbz_l
+ icbi
+ tlbie
+ tlbia
+ tlbsync
+ tlbld
+ tlbli
+ }
+
+ handler logical<const OP> {
+ andx
+ orx
+ xorx
+ nandx
+ norx
+ andcx
+ orcx
+ eqvx
+ slwx
+ srwx
+ srawx
+ srawix
+ cntlzwx
+ extshx
+ extsbx
+ }
+
+ handler cr_ops<const OP> {
+ mtcrf
+ mfcr
+ crxor
+ cror
+ crand
+ creqv
+ crnor
+ crnand
+ crandc
+ crorc
+ mcrf
+ }
+
+ handler fp_ops<const OP> {
+ 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<const OP> {
+ 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/src/cpu/interpreter.rs b/crates/gecko/src/cpu/interpreter.rs
index 30da9a2..389a957 100644
--- a/crates/gecko/src/cpu/interpreter.rs
+++ b/crates/gecko/src/cpu/interpreter.rs
@@ -19,3 +19,9 @@ 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};
+
+#[cold]
+#[inline(never)]
+pub fn invalid(_ctx: &mut crate::gamecube::GameCube, instr: crate::cpu::instruction::Instruction) {
+ panic!("unimplemented Gekko opcode {:#010x}", instr.0);
+}
diff --git a/crates/gecko/src/flipper/dsp.rs b/crates/gecko/src/flipper/dsp.rs
index 04f820a..ebdddb2 100644
--- a/crates/gecko/src/flipper/dsp.rs
+++ b/crates/gecko/src/flipper/dsp.rs
@@ -421,4 +421,4 @@ pub fn dispatch_gc_dsp_ext<const SYSTEM: SystemId>(ctx: &mut System<SYSTEM>, ins
} else {
todo!()
}
-}
\ No newline at end of file
+}
diff --git a/crates/gecko/src/flipper/dsp/interpreter.rs b/crates/gecko/src/flipper/dsp/interpreter.rs
index 262fb21..dd5e343 100644
--- a/crates/gecko/src/flipper/dsp/interpreter.rs
+++ b/crates/gecko/src/flipper/dsp/interpreter.rs
@@ -2,9 +2,21 @@ use crate::flipper::dsp;
use crate::flipper::dsp::condition::BranchControl;
use crate::flipper::dsp::core::regs::{SignExtensionMode, StatusRegister};
use crate::flipper::dsp::core::{Registers, reg};
-use crate::flipper::dsp::instruction::Instruction;
+use crate::flipper::dsp::instruction::{GcDspExt, Instruction};
use crate::flipper::dsp::lut::*;
+#[cold]
+#[inline(never)]
+pub fn invalid(_ctx: &mut crate::gamecube::GameCube, instr: Instruction) {
+ panic!("unimplemented DSP opcode {:#06x}", instr.0);
+}
+
+#[cold]
+#[inline(never)]
+pub fn invalid_ext(_ctx: &mut crate::gamecube::GameCube, instr: GcDspExt) {
+ panic!("unimplemented DSP ext opcode {:#04x}", instr.0);
+}
+
#[inline(always)]
fn multiply(regs: &mut Registers, a: i16, b: i16) {
let mut result = a as i32 as i64 * b as i32 as i64;
@@ -1084,8 +1096,6 @@ pub fn status<const OP: u32>(ctx: &mut crate::gamecube::GameCube, instr: Instruc
}
// Extension opcode handlers
-use dsp::instruction::GcDspExt;
-
#[inline(always)]
pub fn ext_nop(_ctx: &mut crate::gamecube::GameCube, _instr: GcDspExt) {}