From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XN3IW-0008Hj-6V for qemu-devel@nongnu.org; Thu, 28 Aug 2014 13:15:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XN3IO-0000gZ-EE for qemu-devel@nongnu.org; Thu, 28 Aug 2014 13:15:44 -0400 From: Paolo Bonzini Date: Thu, 28 Aug 2014 19:15:01 +0200 Message-Id: <1409246113-6519-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1409246113-6519-1-git-send-email-pbonzini@redhat.com> References: <1409246113-6519-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 05/17] ppc: use CRF_* in fpu_helper.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgibson@redhat.com, qemu-ppc@nongnu.org, tommusta@gmail.com Signed-off-by: Paolo Bonzini --- target-ppc/fpu_helper.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c index da93d12..0fe006a 100644 --- a/target-ppc/fpu_helper.c +++ b/target-ppc/fpu_helper.c @@ -1043,7 +1043,7 @@ uint32_t helper_ftdiv(uint64_t fra, uint64_t frb) } } - return 0x8 | (fg_flag ? 4 : 0) | (fe_flag ? 2 : 0); + return (1 << CRF_LT) | (fg_flag << CRF_GT) | (fe_flag << CRF_EQ); } uint32_t helper_ftsqrt(uint64_t frb) @@ -1074,7 +1074,7 @@ uint32_t helper_ftsqrt(uint64_t frb) } } - return 0x8 | (fg_flag ? 4 : 0) | (fe_flag ? 2 : 0); + return (1 << CRF_LT) | (fg_flag << CRF_GT) | (fe_flag << CRF_EQ); } void helper_fcmpu(CPUPPCState *env, uint64_t arg1, uint64_t arg2, @@ -1088,19 +1088,19 @@ void helper_fcmpu(CPUPPCState *env, uint64_t arg1, uint64_t arg2, if (unlikely(float64_is_any_nan(farg1.d) || float64_is_any_nan(farg2.d))) { - ret = 0x01UL; + ret = CRF_SO; } else if (float64_lt(farg1.d, farg2.d, &env->fp_status)) { - ret = 0x08UL; + ret = CRF_LT; } else if (!float64_le(farg1.d, farg2.d, &env->fp_status)) { - ret = 0x04UL; + ret = CRF_GT; } else { - ret = 0x02UL; + ret = CRF_EQ; } env->fpscr &= ~(0x0F << FPSCR_FPRF); - env->fpscr |= ret << FPSCR_FPRF; - env->crf[crfD] = ret; - if (unlikely(ret == 0x01UL + env->fpscr |= (0x01 << FPSCR_FPRF) << ret; + env->crf[crfD] = (1 << ret); + if (unlikely(ret == CRF_SO && (float64_is_signaling_nan(farg1.d) || float64_is_signaling_nan(farg2.d)))) { /* sNaN comparison */ @@ -1119,19 +1119,19 @@ void helper_fcmpo(CPUPPCState *env, uint64_t arg1, uint64_t arg2, if (unlikely(float64_is_any_nan(farg1.d) || float64_is_any_nan(farg2.d))) { - ret = 0x01UL; + ret = CRF_SO; } else if (float64_lt(farg1.d, farg2.d, &env->fp_status)) { - ret = 0x08UL; + ret = CRF_LT; } else if (!float64_le(farg1.d, farg2.d, &env->fp_status)) { - ret = 0x04UL; + ret = CRF_GT; } else { - ret = 0x02UL; + ret = CRF_EQ; } env->fpscr &= ~(0x0F << FPSCR_FPRF); - env->fpscr |= ret << FPSCR_FPRF; - env->crf[crfD] = ret; - if (unlikely(ret == 0x01UL)) { + env->fpscr |= (0x01 << FPSCR_FPRF) << ret; + env->crf[crfD] = (1 << ret); + if (unlikely(ret == CRF_SO)) { if (float64_is_signaling_nan(farg1.d) || float64_is_signaling_nan(farg2.d)) { /* sNaN comparison */ -- 1.8.3.1