diff options
| author | Peter Maydell | 2018-05-15 15:58:42 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-05-15 15:58:42 +0200 |
| commit | 333583757c5e910b040bef793974773635ce1918 (patch) | |
| tree | a1245074df3397ae29e4a00b732740ca945b9a06 /fpu | |
| parent | fpu/softfloat: int_to_float ensure r fully initialised (diff) | |
| download | qemu-333583757c5e910b040bef793974773635ce1918.tar.gz qemu-333583757c5e910b040bef793974773635ce1918.tar.xz qemu-333583757c5e910b040bef793974773635ce1918.zip | |
fpu/softfloat: Don't set Invalid for float-to-int(MAXINT)
In float-to-integer conversion, if the floating point input
converts exactly to the largest or smallest integer that
fits in to the result type, this is not an overflow.
In this situation we were producing the correct result value,
but were incorrectly setting the Invalid flag.
For example for Arm A64, "FCVTAS w0, d0" on an input of
0x41dfffffffc00000 should produce 0x7fffffff and set no flags.
Fix the boundary case to take the right half of the if()
statements.
This fixes a regression from 2.11 introduced by the softfloat
refactoring.
Cc: qemu-stable@nongnu.org
Fixes: ab52f973a50
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180510140141.12120-1-peter.maydell@linaro.org
Diffstat (limited to 'fpu')
| -rw-r--r-- | fpu/softfloat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpu/softfloat.c b/fpu/softfloat.c index b39c0c6fbb..bc0f52fa54 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1368,14 +1368,14 @@ static int64_t round_to_int_and_pack(FloatParts in, int rmode, r = UINT64_MAX; } if (p.sign) { - if (r < -(uint64_t) min) { + if (r <= -(uint64_t) min) { return -r; } else { s->float_exception_flags = orig_flags | float_flag_invalid; return min; } } else { - if (r < max) { + if (r <= max) { return r; } else { s->float_exception_flags = orig_flags | float_flag_invalid; |