aboutsummaryrefslogtreecommitdiff
path: root/target-sh4
diff options
context:
space:
mode:
Diffstat (limited to 'target-sh4')
-rw-r--r--target-sh4/helper.h48
-rw-r--r--target-sh4/op_helper.c202
2 files changed, 92 insertions, 158 deletions
diff --git a/target-sh4/helper.h b/target-sh4/helper.h
index 2e52768..95e3c7c 100644
--- a/target-sh4/helper.h
+++ b/target-sh4/helper.h
@@ -23,31 +23,31 @@ DEF_HELPER_2(macw, void, i32, i32)
DEF_HELPER_1(ld_fpscr, void, i32)
-DEF_HELPER_1(fabs_FT, i32, i32)
-DEF_HELPER_1(fabs_DT, i64, i64)
-DEF_HELPER_2(fadd_FT, i32, i32, i32)
-DEF_HELPER_2(fadd_DT, i64, i64, i64)
-DEF_HELPER_1(fcnvsd_FT_DT, i64, i32)
-DEF_HELPER_1(fcnvds_DT_FT, i32, i64)
+DEF_HELPER_1(fabs_FT, f32, f32)
+DEF_HELPER_1(fabs_DT, f64, f64)
+DEF_HELPER_2(fadd_FT, f32, f32, f32)
+DEF_HELPER_2(fadd_DT, f64, f64, f64)
+DEF_HELPER_1(fcnvsd_FT_DT, f64, f32)
+DEF_HELPER_1(fcnvds_DT_FT, f32, f64)
-DEF_HELPER_2(fcmp_eq_FT, void, i32, i32)
-DEF_HELPER_2(fcmp_eq_DT, void, i64, i64)
-DEF_HELPER_2(fcmp_gt_FT, void, i32, i32)
-DEF_HELPER_2(fcmp_gt_DT, void, i64, i64)
-DEF_HELPER_2(fdiv_FT, i32, i32, i32)
-DEF_HELPER_2(fdiv_DT, i64, i64, i64)
-DEF_HELPER_1(float_FT, i32, i32)
-DEF_HELPER_1(float_DT, i64, i32)
-DEF_HELPER_3(fmac_FT, i32, i32, i32, i32)
-DEF_HELPER_2(fmul_FT, i32, i32, i32)
-DEF_HELPER_2(fmul_DT, i64, i64, i64)
-DEF_HELPER_1(fneg_T, i32, i32)
-DEF_HELPER_2(fsub_FT, i32, i32, i32)
-DEF_HELPER_2(fsub_DT, i64, i64, i64)
-DEF_HELPER_1(fsqrt_FT, i32, i32)
-DEF_HELPER_1(fsqrt_DT, i64, i64)
-DEF_HELPER_1(ftrc_FT, i32, i32)
-DEF_HELPER_1(ftrc_DT, i32, i64)
+DEF_HELPER_2(fcmp_eq_FT, void, f32, f32)
+DEF_HELPER_2(fcmp_eq_DT, void, f64, f64)
+DEF_HELPER_2(fcmp_gt_FT, void, f32, f32)
+DEF_HELPER_2(fcmp_gt_DT, void, f64, f64)
+DEF_HELPER_2(fdiv_FT, f32, f32, f32)
+DEF_HELPER_2(fdiv_DT, f64, f64, f64)
+DEF_HELPER_1(float_FT, f32, i32)
+DEF_HELPER_1(float_DT, f64, i32)
+DEF_HELPER_3(fmac_FT, f32, f32, f32, f32)
+DEF_HELPER_2(fmul_FT, f32, f32, f32)
+DEF_HELPER_2(fmul_DT, f64, f64, f64)
+DEF_HELPER_1(fneg_T, f32, f32)
+DEF_HELPER_2(fsub_FT, f32, f32, f32)
+DEF_HELPER_2(fsub_DT, f64, f64, f64)
+DEF_HELPER_1(fsqrt_FT, f32, f32)
+DEF_HELPER_1(fsqrt_DT, f64, f64)
+DEF_HELPER_1(ftrc_FT, i32, f32)
+DEF_HELPER_1(ftrc_DT, i32, f64)
DEF_HELPER_2(fipr, void, i32, i32)
DEF_HELPER_1(ftrv, void, i32)
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index b8f4ca2..c127860 100644
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -487,53 +487,38 @@ static void update_fpscr(void *retaddr)
}
}
-uint32_t helper_fabs_FT(uint32_t t0)
+float32 helper_fabs_FT(float32 t0)
{
- CPU_FloatU f;
- f.l = t0;
- f.f = float32_abs(f.f);
- return f.l;
+ return float32_abs(t0);
}
-uint64_t helper_fabs_DT(uint64_t t0)
+float64 helper_fabs_DT(float64 t0)
{
- CPU_DoubleU d;
- d.ll = t0;
- d.d = float64_abs(d.d);
- return d.ll;
+ return float64_abs(t0);
}
-uint32_t helper_fadd_FT(uint32_t t0, uint32_t t1)
+float32 helper_fadd_FT(float32 t0, float32 t1)
{
- CPU_FloatU f0, f1;
- f0.l = t0;
- f1.l = t1;
set_float_exception_flags(0, &env->fp_status);
- f0.f = float32_add(f0.f, f1.f, &env->fp_status);
+ t0 = float32_add(t0, t1, &env->fp_status);
update_fpscr(GETPC());
- return f0.l;
+ return t0;
}
-uint64_t helper_fadd_DT(uint64_t t0, uint64_t t1)
+float64 helper_fadd_DT(float64 t0, float64 t1)
{
- CPU_DoubleU d0, d1;
- d0.ll = t0;
- d1.ll = t1;
set_float_exception_flags(0, &env->fp_status);
- d0.d = float64_add(d0.d, d1.d, &env->fp_status);
+ t0 = float64_add(t0, t1, &env->fp_status);
update_fpscr(GETPC());
- return d0.ll;
+ return t0;
}
-void helper_fcmp_eq_FT(uint32_t t0, uint32_t t1)
+void helper_fcmp_eq_FT(float32 t0, float32 t1)
{
- CPU_FloatU f0, f1;
int relation;
- f0.l = t0;
- f1.l = t1;
set_float_exception_flags(0, &env->fp_status);
- relation = float32_compare(f0.f, f1.f, &env->fp_status);
+ relation = float32_compare(t0, t1, &env->fp_status);
if (unlikely(relation == float_relation_unordered)) {
update_fpscr(GETPC());
} else if (relation == float_relation_equal) {
@@ -543,15 +528,12 @@ void helper_fcmp_eq_FT(uint32_t t0, uint32_t t1)
}
}
-void helper_fcmp_eq_DT(uint64_t t0, uint64_t t1)
+void helper_fcmp_eq_DT(float64 t0, float64 t1)
{
- CPU_DoubleU d0, d1;
int relation;
- d0.ll = t0;
- d1.ll = t1;
set_float_exception_flags(0, &env->fp_status);
- relation = float64_compare(d0.d, d1.d, &env->fp_status);
+ relation = float64_compare(t0, t1, &env->fp_status);
if (unlikely(relation == float_relation_unordered)) {
update_fpscr(GETPC());
} else if (relation == float_relation_equal) {
@@ -561,15 +543,12 @@ void helper_fcmp_eq_DT(uint64_t t0, uint64_t t1)
}
}
-void helper_fcmp_gt_FT(uint32_t t0, uint32_t t1)
+void helper_fcmp_gt_FT(float32 t0, float32 t1)
{
- CPU_FloatU f0, f1;
int relation;
- f0.l = t0;
- f1.l = t1;
set_float_exception_flags(0, &env->fp_status);
- relation = float32_compare(f0.f, f1.f, &env->fp_status);
+ relation = float32_compare(t0, t1, &env->fp_status);
if (unlikely(relation == float_relation_unordered)) {
update_fpscr(GETPC());
} else if (relation == float_relation_greater) {
@@ -579,15 +558,12 @@ void helper_fcmp_gt_FT(uint32_t t0, uint32_t t1)
}
}
-void helper_fcmp_gt_DT(uint64_t t0, uint64_t t1)
+void helper_fcmp_gt_DT(float64 t0, float64 t1)
{
- CPU_DoubleU d0, d1;
int relation;
- d0.ll = t0;
- d1.ll = t1;
set_float_exception_flags(0, &env->fp_status);
- relation = float64_compare(d0.d, d1.d, &env->fp_status);
+ relation = float64_compare(t0, t1, &env->fp_status);
if (unlikely(relation == float_relation_unordered)) {
update_fpscr(GETPC());
} else if (relation == float_relation_greater) {
@@ -597,176 +573,134 @@ void helper_fcmp_gt_DT(uint64_t t0, uint64_t t1)
}
}
-uint64_t helper_fcnvsd_FT_DT(uint32_t t0)
+float64 helper_fcnvsd_FT_DT(float32 t0)
{
- CPU_DoubleU d;
- CPU_FloatU f;
- f.l = t0;
+ float64 ret;
set_float_exception_flags(0, &env->fp_status);
- d.d = float32_to_float64(f.f, &env->fp_status);
+ ret = float32_to_float64(t0, &env->fp_status);
update_fpscr(GETPC());
- return d.ll;
+ return ret;
}
-uint32_t helper_fcnvds_DT_FT(uint64_t t0)
+float32 helper_fcnvds_DT_FT(float64 t0)
{
- CPU_DoubleU d;
- CPU_FloatU f;
- d.ll = t0;
+ float32 ret;
set_float_exception_flags(0, &env->fp_status);
- f.f = float64_to_float32(d.d, &env->fp_status);
+ ret = float64_to_float32(t0, &env->fp_status);
update_fpscr(GETPC());
- return f.l;
+ return ret;
}
-uint32_t helper_fdiv_FT(uint32_t t0, uint32_t t1)
+float32 helper_fdiv_FT(float32 t0, float32 t1)
{
- CPU_FloatU f0, f1;
- f0.l = t0;
- f1.l = t1;
set_float_exception_flags(0, &env->fp_status);
- f0.f = float32_div(f0.f, f1.f, &env->fp_status);
+ t0 = float32_div(t0, t1, &env->fp_status);
update_fpscr(GETPC());
- return f0.l;
+ return t0;
}
-uint64_t helper_fdiv_DT(uint64_t t0, uint64_t t1)
+float64 helper_fdiv_DT(float64 t0, float64 t1)
{
- CPU_DoubleU d0, d1;
- d0.ll = t0;
- d1.ll = t1;
set_float_exception_flags(0, &env->fp_status);
- d0.d = float64_div(d0.d, d1.d, &env->fp_status);
+ t0 = float64_div(t0, t1, &env->fp_status);
update_fpscr(GETPC());
- return d0.ll;
+ return t0;
}
-uint32_t helper_float_FT(uint32_t t0)
+float32 helper_float_FT(uint32_t t0)
{
- CPU_FloatU f;
-
+ float32 ret;
set_float_exception_flags(0, &env->fp_status);
- f.f = int32_to_float32(t0, &env->fp_status);
+ ret = int32_to_float32(t0, &env->fp_status);
update_fpscr(GETPC());
-
- return f.l;
+ return ret;
}
-uint64_t helper_float_DT(uint32_t t0)
+float64 helper_float_DT(uint32_t t0)
{
- CPU_DoubleU d;
+ float64 ret;
set_float_exception_flags(0, &env->fp_status);
- d.d = int32_to_float64(t0, &env->fp_status);
+ ret = int32_to_float64(t0, &env->fp_status);
update_fpscr(GETPC());
- return d.ll;
+ return ret;
}
-uint32_t helper_fmac_FT(uint32_t t0, uint32_t t1, uint32_t t2)
+float32 helper_fmac_FT(float32 t0, float32 t1, float32 t2)
{
- CPU_FloatU f0, f1, f2;
- f0.l = t0;
- f1.l = t1;
- f2.l = t2;
set_float_exception_flags(0, &env->fp_status);
- f0.f = float32_mul(f0.f, f1.f, &env->fp_status);
- f0.f = float32_add(f0.f, f2.f, &env->fp_status);
+ t0 = float32_mul(t0, t1, &env->fp_status);
+ t0 = float32_add(t0, t2, &env->fp_status);
update_fpscr(GETPC());
-
- return f0.l;
+ return t0;
}
-uint32_t helper_fmul_FT(uint32_t t0, uint32_t t1)
+float32 helper_fmul_FT(float32 t0, float32 t1)
{
- CPU_FloatU f0, f1;
- f0.l = t0;
- f1.l = t1;
set_float_exception_flags(0, &env->fp_status);
- f0.f = float32_mul(f0.f, f1.f, &env->fp_status);
+ t0 = float32_mul(t0, t1, &env->fp_status);
update_fpscr(GETPC());
- return f0.l;
+ return t0;
}
-uint64_t helper_fmul_DT(uint64_t t0, uint64_t t1)
+float64 helper_fmul_DT(float64 t0, float64 t1)
{
- CPU_DoubleU d0, d1;
- d0.ll = t0;
- d1.ll = t1;
set_float_exception_flags(0, &env->fp_status);
- d0.d = float64_mul(d0.d, d1.d, &env->fp_status);
+ t0 = float64_mul(t0, t1, &env->fp_status);
update_fpscr(GETPC());
-
- return d0.ll;
+ return t0;
}
-uint32_t helper_fneg_T(uint32_t t0)
+float32 helper_fneg_T(float32 t0)
{
- CPU_FloatU f;
- f.l = t0;
- f.f = float32_chs(f.f);
- return f.l;
+ return float32_chs(t0);
}
-uint32_t helper_fsqrt_FT(uint32_t t0)
+float32 helper_fsqrt_FT(float32 t0)
{
- CPU_FloatU f;
- f.l = t0;
set_float_exception_flags(0, &env->fp_status);
- f.f = float32_sqrt(f.f, &env->fp_status);
+ t0 = float32_sqrt(t0, &env->fp_status);
update_fpscr(GETPC());
- return f.l;
+ return t0;
}
-uint64_t helper_fsqrt_DT(uint64_t t0)
+float64 helper_fsqrt_DT(float64 t0)
{
- CPU_DoubleU d;
- d.ll = t0;
set_float_exception_flags(0, &env->fp_status);
- d.d = float64_sqrt(d.d, &env->fp_status);
+ t0 = float64_sqrt(t0, &env->fp_status);
update_fpscr(GETPC());
- return d.ll;
+ return t0;
}
-uint32_t helper_fsub_FT(uint32_t t0, uint32_t t1)
+float32 helper_fsub_FT(float32 t0, float32 t1)
{
- CPU_FloatU f0, f1;
- f0.l = t0;
- f1.l = t1;
set_float_exception_flags(0, &env->fp_status);
- f0.f = float32_sub(f0.f, f1.f, &env->fp_status);
+ t0 = float32_sub(t0, t1, &env->fp_status);
update_fpscr(GETPC());
- return f0.l;
+ return t0;
}
-uint64_t helper_fsub_DT(uint64_t t0, uint64_t t1)
+float64 helper_fsub_DT(float64 t0, float64 t1)
{
- CPU_DoubleU d0, d1;
-
- d0.ll = t0;
- d1.ll = t1;
set_float_exception_flags(0, &env->fp_status);
- d0.d = float64_sub(d0.d, d1.d, &env->fp_status);
+ t0 = float64_sub(t0, t1, &env->fp_status);
update_fpscr(GETPC());
- return d0.ll;
+ return t0;
}
-uint32_t helper_ftrc_FT(uint32_t t0)
+uint32_t helper_ftrc_FT(float32 t0)
{
- CPU_FloatU f;
uint32_t ret;
- f.l = t0;
set_float_exception_flags(0, &env->fp_status);
- ret = float32_to_int32_round_to_zero(f.f, &env->fp_status);
+ ret = float32_to_int32_round_to_zero(t0, &env->fp_status);
update_fpscr(GETPC());
return ret;
}
-uint32_t helper_ftrc_DT(uint64_t t0)
+uint32_t helper_ftrc_DT(float64 t0)
{
- CPU_DoubleU d;
uint32_t ret;
- d.ll = t0;
set_float_exception_flags(0, &env->fp_status);
- ret = float64_to_int32_round_to_zero(d.d, &env->fp_status);
+ ret = float64_to_int32_round_to_zero(t0, &env->fp_status);
update_fpscr(GETPC());
return ret;
}
generated by cgit v1.1 at 2024-12-24 00:35:08 +0000