diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-12-31 10:09:03 -0800 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-01-05 10:12:49 +0000 |
| commit | 17ed229379d971ae117245b353324115a62b0014 (patch) | |
| tree | 14550aafa433d95e3f7d1e12e2fd71642aa06216 /fpu | |
| parent | a4c7ecd8ca998044bfafa0bdd7ea47270e7ebad6 (diff) | |
softfloat: Fix uint64_to_float64
The interface to normalizeRoundAndPackFloat64 requires that the
high bit be clear. Perform one shift-right-and-jam if needed.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'fpu')
| -rw-r--r-- | fpu/softfloat.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 0cfa6b4831..20b05d4392 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1271,11 +1271,18 @@ float64 int64_to_float64( int64 a STATUS_PARAM ) } -float64 uint64_to_float64( uint64 a STATUS_PARAM ) +float64 uint64_to_float64(uint64 a STATUS_PARAM) { - if ( a == 0 ) return float64_zero; - return normalizeRoundAndPackFloat64( 0, 0x43C, a STATUS_VAR ); + int exp = 0x43C; + if (a == 0) { + return float64_zero; + } + if ((int64_t)a < 0) { + shift64RightJamming(a, 1, &a); + exp += 1; + } + return normalizeRoundAndPackFloat64(0, exp, a STATUS_VAR); } /*---------------------------------------------------------------------------- |