From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCUOi-0000JD-1O for qemu-devel@nongnu.org; Wed, 20 Apr 2011 06:12:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QCUOX-0004SD-E9 for qemu-devel@nongnu.org; Wed, 20 Apr 2011 06:12:36 -0400 Received: from hall.aurel32.net ([88.191.126.93]:43743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCUOX-0004Rl-4v for qemu-devel@nongnu.org; Wed, 20 Apr 2011 06:12:25 -0400 From: Aurelien Jarno Date: Wed, 20 Apr 2011 12:11:59 +0200 Message-Id: <1303294329-22634-11-git-send-email-aurelien@aurel32.net> In-Reply-To: <1303294329-22634-1-git-send-email-aurelien@aurel32.net> References: <1303294329-22634-1-git-send-email-aurelien@aurel32.net> Subject: [Qemu-devel] [PATCH v2 10/20] target-i386: fix helper_fscale() wrt softfloat List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Aurelien Jarno 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 Signed-off-by: Aurelien Jarno --- target-i386/exec.h | 4 ++++ 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 ae6b947..211cc8c 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 a73427f..f614893 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) -- 1.7.2.3