diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2019-08-26 09:54:34 -0700 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2019-08-29 09:46:07 +1000 |
| commit | 16ce2fffa660aa0593afaf8e38428c8e21df4080 (patch) | |
| tree | 9c309d49a6b0749daf7638cce800adfc426c5b9d | |
| parent | cbc65a8f22b29680f30a2c86da36be4aedb88b60 (diff) | |
target/ppc: Fix do_float_check_status vs inexact
The underflow and inexact exceptions are not mutually exclusive.
Check for both of them. Tidy the reset of FPSCR[FI].
Fixes: https://bugs.launchpad.net/bugs/1841442
Reported-by: Paul Clarke <pc@us.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Paul Clarke <pc@us.ibm.com>
Message-Id: <20190826165434.18403-2-richard.henderson@linaro.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | target/ppc/fpu_helper.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index c8e719272d..4b1a2e6178 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -630,19 +630,15 @@ static void do_float_check_status(CPUPPCState *env, uintptr_t raddr) { CPUState *cs = env_cpu(env); int status = get_float_exception_flags(&env->fp_status); - bool inexact_happened = false; if (status & float_flag_overflow) { float_overflow_excp(env); } else if (status & float_flag_underflow) { float_underflow_excp(env); - } else if (status & float_flag_inexact) { - float_inexact_excp(env); - inexact_happened = true; } - - /* if the inexact flag was not set */ - if (inexact_happened == false) { + if (status & float_flag_inexact) { + float_inexact_excp(env); + } else { env->fpscr &= ~(1 << FPSCR_FI); /* clear the FPSCR[FI] bit */ } |