From nobody Sat Jul 12 15:26:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486016872258358.6498194105782; Wed, 1 Feb 2017 22:27:52 -0800 (PST) Received: from localhost ([::1]:54614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZAs2-0003Gb-B9 for importer@patchew.org; Thu, 02 Feb 2017 01:27:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZ9k2-0007f8-WB for qemu-devel@nongnu.org; Thu, 02 Feb 2017 00:15:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZ9jx-00042K-Ef for qemu-devel@nongnu.org; Thu, 02 Feb 2017 00:15:30 -0500 Received: from ozlabs.org ([103.22.144.67]:36607) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZ9jw-0003y2-VO; Thu, 02 Feb 2017 00:15:25 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vDSqT523Wz9s8P; Thu, 2 Feb 2017 16:15:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1486012501; bh=Q61WqJnlpB+Ho8P/8eB6I8pYlh/g50ABFEfwuTuYCEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=djqlJdaf7Dxtj5b7orYx6Ug4DHkB6aHfwc7Gsgjo6nTQy89iUJZLJSKU5OvUU9/oI 1lLRd++BwKGXOdy4p9F2vo01imYy3Q4UXpNuHyez/IB8F4NRU6Z0LxsfrQsD9f+GqK V1towkrF3detIqMHGAR5wzO0bN5yrIjxnpIw4dTg= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 2 Feb 2017 16:14:05 +1100 Message-Id: <20170202051445.5735-68-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170202051445.5735-1-david@gibson.dropbear.id.au> References: <20170202051445.5735-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 067/107] ppc: Fix a warning in bcdcfz code and improve BCD_DIG_BYTE macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, Jose Ricardo Ziviani , mdroth@linux.vnet.ibm.com, agraf@suse.de, aik@ozlabs.ru, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jose Ricardo Ziviani This commit fixes a warning in the code "(i * 2) ? .. : ..", which should be better as "i ? .. : ..", and improves the BCD_DIG_BYTE macro by placing parentheses around its argument to avoid possible expansion issues like: BCD_DIG_BYTE(i + j). Signed-off-by: Jose Ricardo Ziviani Reviewed-by: Eric Blake Signed-off-by: David Gibson --- target/ppc/int_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index 81f134b..8cf4ee3 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -2551,9 +2551,9 @@ void helper_vsubecuq(ppc_avr_t *r, ppc_avr_t *a, ppc_= avr_t *b, ppc_avr_t *c) #define NATIONAL_NEG 0x2D =20 #if defined(HOST_WORDS_BIGENDIAN) -#define BCD_DIG_BYTE(n) (15 - (n/2)) +#define BCD_DIG_BYTE(n) (15 - ((n) / 2)) #else -#define BCD_DIG_BYTE(n) (n/2) +#define BCD_DIG_BYTE(n) ((n) / 2) #endif =20 static int bcd_get_sgn(ppc_avr_t *bcd) @@ -2876,7 +2876,7 @@ uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, ui= nt32_t ps) } =20 for (i =3D 0; i < 16; i++) { - zone_digit =3D (i * 2) ? b->u8[BCD_DIG_BYTE(i * 2)] >> 4 : zone_le= ad; + zone_digit =3D i ? b->u8[BCD_DIG_BYTE(i * 2)] >> 4 : zone_lead; digit =3D b->u8[BCD_DIG_BYTE(i * 2)] & 0xF; if (unlikely(zone_digit !=3D zone_lead || digit > 0x9)) { invalid =3D 1; --=20 2.9.3