Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
softfloat: Fix float64_to_uint32_round_to_zero
The float64_to_uint32_round_to_zero routine is incorrect.

For example, the following test pattern:

    425F81378DC0CD1F / 0x1.f81378dc0cd1fp+38

will erroneously set the inexact flag.

This patch re-implements the routine to use the float64_to_uint64_round_to_zero
routine.  If saturation occurs we ignore any flags set by the
conversion function and raise only Invalid.

This contribution can be licensed under either the softfloat-2a or -2b
license.

Signed-off-by: Tom Musta <tommusta@gmail.com>
Message-id: 1387397961-4894-6-git-send-email-tommusta@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
  • Loading branch information
Tom Musta authored and pm215 committed Jan 8, 2014
1 parent 5e7f654 commit fd728f2
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions fpu/softfloat.c
Expand Up @@ -6667,19 +6667,18 @@ uint32 float64_to_uint32( float64 a STATUS_PARAM )

uint32 float64_to_uint32_round_to_zero( float64 a STATUS_PARAM )
{
int64_t v;
uint64_t v;
uint32 res;
int old_exc_flags = get_float_exception_flags(status);

v = float64_to_int64_round_to_zero(a STATUS_VAR);
if (v < 0) {
res = 0;
float_raise( float_flag_invalid STATUS_VAR);
} else if (v > 0xffffffff) {
v = float64_to_uint64_round_to_zero(a STATUS_VAR);
if (v > 0xffffffff) {
res = 0xffffffff;
float_raise( float_flag_invalid STATUS_VAR);
} else {
res = v;
return v;
}
set_float_exception_flags(old_exc_flags, status);
float_raise(float_flag_invalid STATUS_VAR);
return res;
}

Expand Down

0 comments on commit fd728f2

Please sign in to comment.