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 | fec05e429943a2486ebe4c65da7b46a90f2dcfb2 (patch) | |
| tree | d28a05071c59ee66d0ffe4568c3039d4e4fec374 | |
| parent | 13822781d4732f847555a2f60560c71c531c9f98 (diff) | |
target-i386: fix helper_fsqrt() wrt softfloat
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | target-i386/exec.h | 4 | ||||
| -rw-r--r-- | target-i386/op_helper.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/target-i386/exec.h b/target-i386/exec.h index b2af8945c5..292e0de325 100644 --- a/target-i386/exec.h +++ b/target-i386/exec.h @@ -114,6 +114,7 @@ static inline void svm_check_intercept(uint32_t type) #define floatx_div floatx80_div #define floatx_mul floatx80_mul #define floatx_sub floatx80_sub +#define floatx_sqrt floatx80_sqrt #define floatx_abs floatx80_abs #define floatx_chs floatx80_chs #define floatx_scalbn floatx80_scalbn @@ -121,6 +122,7 @@ static inline void svm_check_intercept(uint32_t type) #define floatx_compare floatx80_compare #define floatx_compare_quiet floatx80_compare_quiet #define floatx_is_any_nan floatx80_is_any_nan +#define floatx_is_neg floatx80_is_neg #define floatx_is_zero floatx80_is_zero #else #define floatx_to_int32 float64_to_int32 @@ -137,6 +139,7 @@ static inline void svm_check_intercept(uint32_t type) #define floatx_div float64_div #define floatx_mul float64_mul #define floatx_sub float64_sub +#define floatx_sqrt float64_sqrt #define floatx_abs float64_abs #define floatx_chs float64_chs #define floatx_scalbn float64_scalbn @@ -144,6 +147,7 @@ static inline void svm_check_intercept(uint32_t type) #define floatx_compare float64_compare #define floatx_compare_quiet float64_compare_quiet #define floatx_is_any_nan float64_is_any_nan +#define floatx_is_neg float64_is_neg #define floatx_is_zero float64_is_zero #endif diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index bd24d8c442..589a68bc71 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -4152,14 +4152,11 @@ void helper_fyl2xp1(void) void helper_fsqrt(void) { - CPU86_LDouble fptemp; - - fptemp = ST0; - if (fptemp<0.0) { + if (floatx_is_neg(ST0)) { env->fpus &= (~0x4700); /* (C3,C2,C1,C0) <-- 0000 */ env->fpus |= 0x400; } - ST0 = sqrt(fptemp); + ST0 = floatx_sqrt(ST0, &env->fp_status); } void helper_fsincos(void) |