diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-04-20 13:04:23 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-04-25 11:18:33 +0200 |
| commit | be1c17c7fdc16d9cb88f4092f23a494b942b68d7 (patch) | |
| tree | 8efd5c6494eb0efd390b9a63a0fa43c9bff6864d /target-i386 | |
| parent | 4cc5383f807a7d70942de51326a8dddad7331fa5 (diff) | |
| download | qemu-be1c17c7fdc16d9cb88f4092f23a494b942b68d7.tar.gz | |
target-i386: fix helper_fscale() wrt softfloat
Use the scalbn softfloat function to implement helper_fscale(). This
fixes corner cases (e.g. NaN) and makes a few more GNU libc math tests
to pass.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/exec.h | 4 | ||||
| -rw-r--r-- | target-i386/op_helper.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/target-i386/exec.h b/target-i386/exec.h index ae6b94740f..211cc8c28e 100644 --- a/target-i386/exec.h +++ b/target-i386/exec.h @@ -115,9 +115,11 @@ static inline void svm_check_intercept(uint32_t type) #define floatx_sub floatx80_sub #define floatx_abs floatx80_abs #define floatx_chs floatx80_chs +#define floatx_scalbn floatx80_scalbn #define floatx_round_to_int floatx80_round_to_int #define floatx_compare floatx80_compare #define floatx_compare_quiet floatx80_compare_quiet +#define floatx_is_any_nan floatx80_is_any_nan #else #define floatx_to_int32 float64_to_int32 #define floatx_to_int64 float64_to_int64 @@ -134,9 +136,11 @@ static inline void svm_check_intercept(uint32_t type) #define floatx_sub float64_sub #define floatx_abs float64_abs #define floatx_chs float64_chs +#define floatx_scalbn float64_scalbn #define floatx_round_to_int float64_round_to_int #define floatx_compare float64_compare #define floatx_compare_quiet float64_compare_quiet +#define floatx_is_any_nan float64_is_any_nan #endif #define RC_MASK 0xc00 diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index fba536f0fb..dce28fa054 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -4174,7 +4174,12 @@ void helper_frndint(void) void helper_fscale(void) { - ST0 = ldexp (ST0, (int)(ST1)); + if (floatx_is_any_nan(ST1)) { + ST0 = ST1; + } else { + int n = floatx_to_int32_round_to_zero(ST1, &env->fp_status); + ST0 = floatx_scalbn(ST0, n, &env->fp_status); + } } void helper_fsin(void) |