Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

single precision instructions are supposed to duplicate into ps0 and ps1

Layleec13fe76cdf3
diff --git a/crates/gekko/src/cpu/interpreter/fp_ops.rs b/crates/gekko/src/cpu/interpreter/fp_ops.rs
index 24613d0..95bfa86 100644
--- a/crates/gekko/src/cpu/interpreter/fp_ops.rs
+++ b/crates/gekko/src/cpu/interpreter/fp_ops.rs
@@ -68,11 +68,8 @@ pub fn fp_ops<const OP: u32>(ctx: &mut crate::gekko::Gekko, instr: crate::cpu::s
}
}
crate::cpu::lut::OP_FRSPX => {
- ctx.cpu
- .write_fpr(instr.rd(), ctx.cpu.read_fpr(instr.rb()) as f32 as f64);
- if instr.rc() {
- ctx.cpu.update_cr1();
- }
+ let val = ctx.cpu.read_fpr(instr.rb()) as f32 as f64;
+ fp_write_single(ctx, &instr, val);
}
crate::cpu::lut::OP_FCTIWX => {
let res = ctx.cpu.read_fpr(instr.rb()).round() as i32;
@@ -126,51 +123,51 @@ pub fn fp_ops<const OP: u32>(ctx: &mut crate::gekko::Gekko, instr: crate::cpu::s
&instr,
-(ctx.cpu.read_fpr(instr.ra()) * ctx.cpu.read_fpr(instr.fc()) - ctx.cpu.read_fpr(instr.rb())),
),
- crate::cpu::lut::OP_FADDSX => fp_write(
+ crate::cpu::lut::OP_FADDSX => fp_write_single(
ctx,
&instr,
(ctx.cpu.read_fpr(instr.ra()) + ctx.cpu.read_fpr(instr.rb())) as f32 as f64,
),
- crate::cpu::lut::OP_FSUBSX => fp_write(
+ crate::cpu::lut::OP_FSUBSX => fp_write_single(
ctx,
&instr,
(ctx.cpu.read_fpr(instr.ra()) - ctx.cpu.read_fpr(instr.rb())) as f32 as f64,
),
- crate::cpu::lut::OP_FMULSX => fp_write(
+ crate::cpu::lut::OP_FMULSX => fp_write_single(
ctx,
&instr,
(ctx.cpu.read_fpr(instr.ra()) * ctx.cpu.read_fpr(instr.fc())) as f32 as f64,
),
- crate::cpu::lut::OP_FDIVSX => fp_write(
+ crate::cpu::lut::OP_FDIVSX => fp_write_single(
ctx,
&instr,
(ctx.cpu.read_fpr(instr.ra()) / ctx.cpu.read_fpr(instr.rb())) as f32 as f64,
),
- crate::cpu::lut::OP_FMADDSX => fp_write(
+ crate::cpu::lut::OP_FMADDSX => fp_write_single(
ctx,
&instr,
(ctx.cpu.read_fpr(instr.ra()) * ctx.cpu.read_fpr(instr.fc()) + ctx.cpu.read_fpr(instr.rb())) as f32 as f64,
),
- crate::cpu::lut::OP_FMSUBSX => fp_write(
+ crate::cpu::lut::OP_FMSUBSX => fp_write_single(
ctx,
&instr,
(ctx.cpu.read_fpr(instr.ra()) * ctx.cpu.read_fpr(instr.fc()) - ctx.cpu.read_fpr(instr.rb())) as f32 as f64,
),
- crate::cpu::lut::OP_FNMADDSX => fp_write(
+ crate::cpu::lut::OP_FNMADDSX => fp_write_single(
ctx,
&instr,
(-(ctx.cpu.read_fpr(instr.ra()) * ctx.cpu.read_fpr(instr.fc()) + ctx.cpu.read_fpr(instr.rb()))) as f32
as f64,
),
- crate::cpu::lut::OP_FNMSUBSX => fp_write(
+ crate::cpu::lut::OP_FNMSUBSX => fp_write_single(
ctx,
&instr,
(-(ctx.cpu.read_fpr(instr.ra()) * ctx.cpu.read_fpr(instr.fc()) - ctx.cpu.read_fpr(instr.rb()))) as f32
as f64,
),
crate::cpu::lut::OP_FSQRTX => fp_write(ctx, &instr, ctx.cpu.read_fpr(instr.rb()).sqrt()),
- crate::cpu::lut::OP_FSQRTSX => fp_write(ctx, &instr, (ctx.cpu.read_fpr(instr.rb()).sqrt()) as f32 as f64),
- crate::cpu::lut::OP_FRESX => fp_write(ctx, &instr, (1.0f32 / ctx.cpu.read_fpr(instr.rb()) as f32) as f64),
+ crate::cpu::lut::OP_FSQRTSX => fp_write_single(ctx, &instr, (ctx.cpu.read_fpr(instr.rb()).sqrt()) as f32 as f64),
+ crate::cpu::lut::OP_FRESX => fp_write_single(ctx, &instr, (1.0f32 / ctx.cpu.read_fpr(instr.rb()) as f32) as f64),
crate::cpu::lut::OP_FRSQRTEX => fp_write(ctx, &instr, 1.0 / ctx.cpu.read_fpr(instr.rb()).sqrt()),
crate::cpu::lut::OP_FSELX => {
let fa = ctx.cpu.read_fpr(instr.ra());
@@ -191,3 +188,14 @@ fn fp_write(ctx: &mut crate::gekko::Gekko, instr: &crate::cpu::semantics::Instru
ctx.cpu.update_cr1();
}
}
+
+/// Write single-precision FP result to fD.
+/// On Gekko, single-precision instructions duplicate the result into both ps0 and ps1.
+#[inline(always)]
+fn fp_write_single(ctx: &mut crate::gekko::Gekko, instr: &crate::cpu::semantics::Instruction, val: f64) {
+ ctx.cpu.write_fpr(instr.rd(), val);
+ ctx.cpu.write_ps1(instr.rd(), val);
+ if instr.rc() {
+ ctx.cpu.update_cr1();
+ }
+}
diff --git a/crates/gekko/src/cpu/interpreter/store_load.rs b/crates/gekko/src/cpu/interpreter/store_load.rs
index 90d9c16..0411025 100644
--- a/crates/gekko/src/cpu/interpreter/store_load.rs
+++ b/crates/gekko/src/cpu/interpreter/store_load.rs
@@ -196,6 +196,7 @@ pub fn store_load_fp<const OP: u32>(ctx: &mut crate::gekko::Gekko, instr: crate:
let addr = ctx.cpu.read_gpr_or_zero(instr.ra()).wrapping_add_signed(instr.disp());
let val = ctx.read_f32(addr);
ctx.cpu.write_fpr(instr.rd(), val);
+ ctx.cpu.write_ps1(instr.rd(), val);
if OP == crate::cpu::lut::OP_LFSU {
ctx.cpu.write_gpr(instr.ra(), addr);
}
@@ -214,6 +215,7 @@ pub fn store_load_fp<const OP: u32>(ctx: &mut crate::gekko::Gekko, instr: crate:
.wrapping_add(ctx.cpu.read_gpr(instr.rb()));
let val = ctx.read_f32(addr);
ctx.cpu.write_fpr(instr.rd(), val);
+ ctx.cpu.write_ps1(instr.rd(), val);
if OP == crate::cpu::lut::OP_LFSUX {
ctx.cpu.write_gpr(instr.ra(), addr);
}