From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LCH1h-00057b-Nr for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:14:37 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LCH1h-00056d-0Z for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:14:37 -0500 Received: from [199.232.76.173] (port=38803 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LCH1g-00056Q-Sa for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:14:36 -0500 Received: from savannah.gnu.org ([199.232.41.3]:48421 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LCH1g-0004pO-Mv for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:14:36 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LCH1g-0002rV-6N for qemu-devel@nongnu.org; Mon, 15 Dec 2008 17:14:36 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LCH1f-0002rR-TO for qemu-devel@nongnu.org; Mon, 15 Dec 2008 17:14:36 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Mon, 15 Dec 2008 17:14:35 +0000 Subject: [Qemu-devel] [6052] target-ppc: fadd/fsub: correctly propagate NaN Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6052 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6052 Author: aurel32 Date: 2008-12-15 17:14:35 +0000 (Mon, 15 Dec 2008) Log Message: ----------- target-ppc: fadd/fsub: correctly propagate NaN Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/target-ppc/op_helper.c Modified: trunk/target-ppc/op_helper.c =================================================================== --- trunk/target-ppc/op_helper.c 2008-12-15 17:14:27 UTC (rev 6051) +++ trunk/target-ppc/op_helper.c 2008-12-15 17:14:35 UTC (rev 6052) @@ -563,17 +563,7 @@ return ((u.ll >> 52) & 0x7FF) == 0; } - #ifdef CONFIG_SOFTFLOAT -static always_inline int isfinite (float64 d) -{ - CPU_DoubleU u; - - u.d = d; - - return (((u.ll >> 52) & 0x7FF) != 0x7FF); -} - static always_inline int isnormal (float64 d) { CPU_DoubleU u; @@ -1028,12 +1018,12 @@ float64_is_signaling_nan(farg2.d))) { /* sNaN addition */ farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN); - } else if (likely(isfinite(farg1.d) || isfinite(farg2.d) || - float64_is_neg(farg1.d) == float64_is_neg(farg2.d))) { - farg1.d = float64_add(farg1.d, farg2.d, &env->fp_status); - } else { + } else if (unlikely(float64_is_infinity(farg1.d) && float64_is_infinity(farg2.d) && + float64_is_neg(farg1.d) != float64_is_neg(farg2.d))) { /* Magnitude subtraction of infinities */ farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXISI); + } else { + farg1.d = float64_add(farg1.d, farg2.d, &env->fp_status); } #else farg1.d = float64_add(farg1.d, farg2.d, &env->fp_status); @@ -1054,12 +1044,12 @@ float64_is_signaling_nan(farg2.d))) { /* sNaN subtraction */ farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN); - } else if (likely(isfinite(farg1.d) || isfinite(farg2.d) || - float64_is_neg(farg1.d) != float64_is_neg(farg2.d))) { - farg1.d = float64_sub(farg1.d, farg2.d, &env->fp_status); - } else { + } else if (unlikely(float64_is_infinity(farg1.d) && float64_is_infinity(farg2.d) && + float64_is_neg(farg1.d) == float64_is_neg(farg2.d))) { /* Magnitude subtraction of infinities */ farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXISI); + } else { + farg1.d = float64_sub(farg1.d, farg2.d, &env->fp_status); } } #else