From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LBSx5-0002WQ-AY for qemu-devel@nongnu.org; Sat, 13 Dec 2008 06:46:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LBSx4-0002Ve-8I for qemu-devel@nongnu.org; Sat, 13 Dec 2008 06:46:30 -0500 Received: from [199.232.76.173] (port=40506 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LBSx4-0002VW-3a for qemu-devel@nongnu.org; Sat, 13 Dec 2008 06:46:30 -0500 Received: from savannah.gnu.org ([199.232.41.3]:44745 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 1LBSx3-00056b-MQ for qemu-devel@nongnu.org; Sat, 13 Dec 2008 06:46:29 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LBSx2-00054u-Nm for qemu-devel@nongnu.org; Sat, 13 Dec 2008 11:46:28 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LBSx2-00054q-7J for qemu-devel@nongnu.org; Sat, 13 Dec 2008 11:46:28 +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: Sat, 13 Dec 2008 11:46:28 +0000 Subject: [Qemu-devel] [6003] target-ppc: fix compilation with CONFIG_SOFTFLOAT 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: 6003 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6003 Author: aurel32 Date: 2008-12-13 11:46:27 +0000 (Sat, 13 Dec 2008) Log Message: ----------- target-ppc: fix compilation with CONFIG_SOFTFLOAT Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/target-ppc/op_helper.c trunk/target-ppc/translate.c Modified: trunk/target-ppc/op_helper.c =================================================================== --- trunk/target-ppc/op_helper.c 2008-12-13 11:46:15 UTC (rev 6002) +++ trunk/target-ppc/op_helper.c 2008-12-13 11:46:27 UTC (rev 6003) @@ -1408,7 +1408,7 @@ farg1.d = float64_mul(farg1.d, farg2.d, &env->fp_status); farg1.d = float64_add(farg1.d, farg3.d, &env->fp_status); #endif - if (likely(!isnan(farg1.d))) + if (likely(!float64_is_nan(farg1.d))) farg1.d = float64_chs(farg1.d); } return farg1.ll; @@ -1448,7 +1448,7 @@ farg1.d = float64_mul(farg1.d, farg2.d, &env->fp_status); farg1.d = float64_sub(farg1.d, farg3.d, &env->fp_status); #endif - if (likely(!isnan(farg1.d))) + if (likely(!float64_is_nan(farg1.d))) farg1.d = float64_chs(farg1.d); } return farg1.ll; @@ -1510,7 +1510,7 @@ farg.ll = 0xFFF0000000000000ULL; } else if (farg.ll == 0x0000000000000000ULL) { farg.ll = 0x7FF0000000000000ULL; - } else if (isnan(farg.d)) { + } else if (float64_is_nan(farg.d)) { farg.ll = 0x7FF8000000000000ULL; } else if (fpisneg(farg.d)) { farg.ll = 0x8000000000000000ULL; @@ -1545,7 +1545,7 @@ farg.ll = 0xFFF0000000000000ULL; } else if (farg.ll == 0x0000000000000000ULL) { farg.ll = 0x7FF0000000000000ULL; - } else if (isnan(farg.d)) { + } else if (float64_is_nan(farg.d)) { farg.ll = 0x7FF8000000000000ULL; } else if (fpisneg(farg.d)) { farg.ll = 0x8000000000000000ULL; @@ -1576,7 +1576,7 @@ farg.ll = 0xFFF0000000000000ULL; } else if (farg.ll == 0x0000000000000000ULL) { farg.ll = 0x7FF0000000000000ULL; - } else if (isnan(farg.d)) { + } else if (float64_is_nan(farg.d)) { farg.ll |= 0x000FFFFFFFFFFFFFULL; } else if (fpisneg(farg.d)) { farg.ll = 0x7FF8000000000000ULL; @@ -2065,7 +2065,7 @@ u.l = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.f))) + if (unlikely(float32_is_nan(u.f))) return 0; return float32_to_int32(u.f, &env->spe_status); @@ -2077,7 +2077,7 @@ u.l = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.f))) + if (unlikely(float32_is_nan(u.f))) return 0; return float32_to_uint32(u.f, &env->spe_status); @@ -2089,7 +2089,7 @@ u.l = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.f))) + if (unlikely(float32_is_nan(u.f))) return 0; return float32_to_int32_round_to_zero(u.f, &env->spe_status); @@ -2101,7 +2101,7 @@ u.l = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.f))) + if (unlikely(float32_is_nan(u.f))) return 0; return float32_to_uint32_round_to_zero(u.f, &env->spe_status); @@ -2138,7 +2138,7 @@ u.l = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.f))) + if (unlikely(float32_is_nan(u.f))) return 0; tmp = uint64_to_float32(1ULL << 32, &env->spe_status); u.f = float32_mul(u.f, tmp, &env->spe_status); @@ -2153,7 +2153,7 @@ u.l = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.f))) + if (unlikely(float32_is_nan(u.f))) return 0; tmp = uint64_to_float32(1ULL << 32, &env->spe_status); u.f = float32_mul(u.f, tmp, &env->spe_status); @@ -2407,7 +2407,7 @@ u.ll = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.d))) + if (unlikely(float64_is_nan(u.d))) return 0; return float64_to_int32(u.d, &env->spe_status); @@ -2419,7 +2419,7 @@ u.ll = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.d))) + if (unlikely(float64_is_nan(u.d))) return 0; return float64_to_uint32(u.d, &env->spe_status); @@ -2431,7 +2431,7 @@ u.ll = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.d))) + if (unlikely(float64_is_nan(u.d))) return 0; return float64_to_int32_round_to_zero(u.d, &env->spe_status); @@ -2443,7 +2443,7 @@ u.ll = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.d))) + if (unlikely(float64_is_nan(u.d))) return 0; return float64_to_int64_round_to_zero(u.d, &env->spe_status); @@ -2455,7 +2455,7 @@ u.ll = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.d))) + if (unlikely(float64_is_nan(u.d))) return 0; return float64_to_uint32_round_to_zero(u.d, &env->spe_status); @@ -2467,7 +2467,7 @@ u.ll = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.d))) + if (unlikely(float64_is_nan(u.d))) return 0; return float64_to_uint64_round_to_zero(u.d, &env->spe_status); @@ -2504,7 +2504,7 @@ u.ll = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.d))) + if (unlikely(float64_is_nan(u.d))) return 0; tmp = uint64_to_float64(1ULL << 32, &env->spe_status); u.d = float64_mul(u.d, tmp, &env->spe_status); @@ -2519,7 +2519,7 @@ u.ll = val; /* NaN are not treated the same way IEEE 754 does */ - if (unlikely(isnan(u.d))) + if (unlikely(float64_is_nan(u.d))) return 0; tmp = uint64_to_float64(1ULL << 32, &env->spe_status); u.d = float64_mul(u.d, tmp, &env->spe_status); Modified: trunk/target-ppc/translate.c =================================================================== --- trunk/target-ppc/translate.c 2008-12-13 11:46:15 UTC (rev 6002) +++ trunk/target-ppc/translate.c 2008-12-13 11:46:27 UTC (rev 6003) @@ -206,7 +206,7 @@ static always_inline void gen_reset_fpstatus (void) { #ifdef CONFIG_SOFTFLOAT - gen_op_reset_fpstatus(); + gen_helper_reset_fpstatus(); #endif }