From 1698b74161e9bbcf36c5075fe5b8357024c4b5bb Mon Sep 17 00:00:00 2001 From: j_mayer Date: Wed, 21 Mar 2007 08:21:02 +0000 Subject: [PATCH] Fix compilation on 32 bits hosts (pb reported by Thiemo Seufer) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2521 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-ppc/op.c | 2 +- target-ppc/op_helper.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target-ppc/op.c b/target-ppc/op.c index 0b972c8..f13f6f5 100644 --- a/target-ppc/op.c +++ b/target-ppc/op.c @@ -720,7 +720,7 @@ void OPPROTO op_check_addo (void) void OPPROTO op_check_addo_64 (void) { if (likely(!(((uint64_t)T2 ^ (uint64_t)T1 ^ UINT64_MAX) & - ((uint64_t)T2 ^ (uint64_t)T0) & (1UL << 63)))) { + ((uint64_t)T2 ^ (uint64_t)T0) & (1ULL << 63)))) { xer_ov = 0; } else { xer_so = 1; diff --git a/target-ppc/op_helper.h b/target-ppc/op_helper.h index 8a735c1..3aa6045 100644 --- a/target-ppc/op_helper.h +++ b/target-ppc/op_helper.h @@ -313,12 +313,11 @@ static inline int _do_cntlzd (uint64_t val) cnt++; } #else - uint32_t tmp; /* Make it easier on 32 bits host machines */ if (!(val >> 32)) - cnt = cntlzw(val) + 32; + cnt = _do_cntlzw(val) + 32; else - cnt = cntlzw(val >> 32); + cnt = _do_cntlzw(val >> 32); #endif return cnt; } -- 2.7.4