From patchwork Fri Sep 10 20:59:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 64471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 10D85B6F07 for ; Sat, 11 Sep 2010 07:23:07 +1000 (EST) Received: from localhost ([127.0.0.1]:50897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuAqh-0005uQ-Lq for incoming@patchwork.ozlabs.org; Fri, 10 Sep 2010 17:09:31 -0400 Received: from [140.186.70.92] (port=48048 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuAhf-0001o7-Gt for qemu-devel@nongnu.org; Fri, 10 Sep 2010 17:00:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OuAhd-0001hP-Sq for qemu-devel@nongnu.org; Fri, 10 Sep 2010 17:00:11 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:36853) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OuAhd-0001ej-Q9 for qemu-devel@nongnu.org; Fri, 10 Sep 2010 17:00:09 -0400 Received: by mail-qw0-f45.google.com with SMTP id 4so10818qwi.4 for ; Fri, 10 Sep 2010 14:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=drvdKE5TGvgHrebEwreOYGpHUEmHwzbZeaOerzpKj50=; b=mG2b0LduYfUwLqWFFWl7wSLHOGwu5DYkb3T0kBMV//Xjf2KG2NKM5sqb9WoaDtrH0f rcyiUT08b2iBbhEeX6uD7+TZ0qCkWnWa6m+GTDepCa5aYSuPUqfFY+A2KFDRxF3q97CT /tP037ejz/29RQTDulf82LTinHCxFhp3gVeZU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=fCIdJQZwh5kC1mX7KQ1Y6FQczfI3sowHtLrdLjryzZARuyGcETGLWnaKdpT+1C+PoV s/TefV8h9RJkW41hp4H9llYCSPqV3U5ErYe7vx96UlRvIInm/A513xDC0CEHkRagEHz7 7rC+102LHGe2IbRK1u7sY8KTay7DWR6WuH88c= Received: by 10.229.219.70 with SMTP id ht6mr1137249qcb.105.1284152409191; Fri, 10 Sep 2010 14:00:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.240.135 with HTTP; Fri, 10 Sep 2010 13:59:49 -0700 (PDT) From: Blue Swirl Date: Fri, 10 Sep 2010 20:59:49 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 09/15] PPC: Suppress gcc warnings with -Wtype-limits X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The hack added by c5b76b381081680633e2e0a91216507430409fb2 was not enough to avoid warnings with gcc flag -Wtype-limits. Add a new macro to fix both problems. Signed-off-by: Blue Swirl --- target-ppc/op_helper.c | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) } else { \ @@ -1970,30 +1970,30 @@ target_ulong helper_dlmzb (target_ulong high, target_ulong low, uint32_t update_ } \ return r; \ } -SATCVT(sh, sb, int16_t, int8_t, INT8_MIN, INT8_MAX, 1, 1) -SATCVT(sw, sh, int32_t, int16_t, INT16_MIN, INT16_MAX, 1, 1) -SATCVT(sd, sw, int64_t, int32_t, INT32_MIN, INT32_MAX, 1, 1) - -/* Work around gcc problems with the macro version */ -static inline uint8_t cvtuhub(uint16_t x, int *sat) -{ - uint8_t r; - - if (x > UINT8_MAX) { - r = UINT8_MAX; - *sat = 1; - } else { - r = x; +#define SATCVTU(from, to, from_type, to_type, min, max) \ + static inline to_type cvt##from##to(from_type x, int *sat) \ + { \ + to_type r; \ + if (x > (from_type)max) { \ + r = max; \ + *sat = 1; \ + } else { \ + r = x; \ + } \ + return r; \ } - return r; -} -//SATCVT(uh, ub, uint16_t, uint8_t, 0, UINT8_MAX, 0, 1) -SATCVT(uw, uh, uint32_t, uint16_t, 0, UINT16_MAX, 0, 1) -SATCVT(ud, uw, uint64_t, uint32_t, 0, UINT32_MAX, 0, 1) -SATCVT(sh, ub, int16_t, uint8_t, 0, UINT8_MAX, 1, 1) -SATCVT(sw, uh, int32_t, uint16_t, 0, UINT16_MAX, 1, 1) -SATCVT(sd, uw, int64_t, uint32_t, 0, UINT32_MAX, 1, 1) +SATCVT(sh, sb, int16_t, int8_t, INT8_MIN, INT8_MAX) +SATCVT(sw, sh, int32_t, int16_t, INT16_MIN, INT16_MAX) +SATCVT(sd, sw, int64_t, int32_t, INT32_MIN, INT32_MAX) + +SATCVTU(uh, ub, uint16_t, uint8_t, 0, UINT8_MAX) +SATCVTU(uw, uh, uint32_t, uint16_t, 0, UINT16_MAX) +SATCVTU(ud, uw, uint64_t, uint32_t, 0, UINT32_MAX) +SATCVT(sh, ub, int16_t, uint8_t, 0, UINT8_MAX) +SATCVT(sw, uh, int32_t, uint16_t, 0, UINT16_MAX) +SATCVT(sd, uw, int64_t, uint32_t, 0, UINT32_MAX) #undef SATCVT +#undef SATCVTU #define LVE(name, access, swap, element) \ void helper_##name (ppc_avr_t *r, target_ulong addr) \ diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 8cf34d4..3e6db85 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -1955,14 +1955,14 @@ target_ulong helper_dlmzb (target_ulong high, target_ulong low, uint32_t update_ DO_HANDLE_NAN(result, x) DO_HANDLE_NAN(result, y) DO_HANDLE_NAN(result, z) /* Saturating arithmetic helpers. */ -#define SATCVT(from, to, from_type, to_type, min, max, use_min, use_max) \ +#define SATCVT(from, to, from_type, to_type, min, max) \ static inline to_type cvt##from##to(from_type x, int *sat) \ { \ to_type r; \ - if (use_min && x < min) { \ + if (x < (from_type)min) { \ r = min; \ *sat = 1; \ - } else if (use_max && x > max) { \ + } else if (x > (from_type)max) { \ r = max; \ *sat = 1; \