diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2017-07-02 21:23:56 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2017-07-18 23:39:15 +0200 |
| commit | fea7d77d3ea287d3b1878648f3049fc6bb4fd57b (patch) | |
| tree | 91e4cfcc59ffbdaa3d0b1a883b37ff0e923770a7 /target/sh4 | |
| parent | 57f5c1b093e1c3ec185770d2a180259205f980be (diff) | |
target/sh4: fix FPU unorderered compare
In case of unordered compare, the fcmp instructions should either
trigger and invalid exception (if enabled) or set T=0. The existing code
left it unchanged.
LP: https://bugs.launchpad.net/qemu/+bug/1701821
Reported-by: Bruno Haible <bruno@clisp.org>
Message-Id: <20170702202814.27793-3-aurelien@aurel32.net>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'target/sh4')
| -rw-r--r-- | target/sh4/op_helper.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c index 5e3a3ba68c..f228daf125 100644 --- a/target/sh4/op_helper.c +++ b/target/sh4/op_helper.c @@ -274,11 +274,8 @@ void helper_fcmp_eq_FT(CPUSH4State *env, float32 t0, float32 t1) set_float_exception_flags(0, &env->fp_status); relation = float32_compare(t0, t1, &env->fp_status); - if (unlikely(relation == float_relation_unordered)) { - update_fpscr(env, GETPC()); - } else { - env->sr_t = (relation == float_relation_equal); - } + update_fpscr(env, GETPC()); + env->sr_t = (relation == float_relation_equal); } void helper_fcmp_eq_DT(CPUSH4State *env, float64 t0, float64 t1) @@ -287,11 +284,8 @@ void helper_fcmp_eq_DT(CPUSH4State *env, float64 t0, float64 t1) set_float_exception_flags(0, &env->fp_status); relation = float64_compare(t0, t1, &env->fp_status); - if (unlikely(relation == float_relation_unordered)) { - update_fpscr(env, GETPC()); - } else { - env->sr_t = (relation == float_relation_equal); - } + update_fpscr(env, GETPC()); + env->sr_t = (relation == float_relation_equal); } void helper_fcmp_gt_FT(CPUSH4State *env, float32 t0, float32 t1) @@ -300,11 +294,8 @@ void helper_fcmp_gt_FT(CPUSH4State *env, float32 t0, float32 t1) set_float_exception_flags(0, &env->fp_status); relation = float32_compare(t0, t1, &env->fp_status); - if (unlikely(relation == float_relation_unordered)) { - update_fpscr(env, GETPC()); - } else { - env->sr_t = (relation == float_relation_greater); - } + update_fpscr(env, GETPC()); + env->sr_t = (relation == float_relation_greater); } void helper_fcmp_gt_DT(CPUSH4State *env, float64 t0, float64 t1) @@ -313,11 +304,8 @@ void helper_fcmp_gt_DT(CPUSH4State *env, float64 t0, float64 t1) set_float_exception_flags(0, &env->fp_status); relation = float64_compare(t0, t1, &env->fp_status); - if (unlikely(relation == float_relation_unordered)) { - update_fpscr(env, GETPC()); - } else { - env->sr_t = (relation == float_relation_greater); - } + update_fpscr(env, GETPC()); + env->sr_t = (relation == float_relation_greater); } float64 helper_fcnvsd_FT_DT(CPUSH4State *env, float32 t0) |