From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qHO7Cg4fh2GOYAAAWB0awg (envelope-from ) for ; Sat, 06 Nov 2021 20:34:22 -0400 Received: by simark.ca (Postfix, from userid 112) id 23F581F0C1; Sat, 6 Nov 2021 20:34:22 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id AD0DE1EE1A for ; Sat, 6 Nov 2021 20:34:19 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 38882385842E for ; Sun, 7 Nov 2021 00:34:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38882385842E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636245259; bh=K4F1cIUe98hkdWHlEl06BBNSF8SdeYUCgkCEUjH9PA8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=BZgpgagKF5ei7SQfMUInih3a8ZL0eDXLvVNPHFIwzGq8o8SCkgWiUPG22A1U31NJE b1DM0Om5Q/WJTSjgJAG/NmfgU0eAEixJh/QjDSlhrA7C5eluXHUB38q/0fc/2dyDdW izYbCrXSOYe+b4ooLyv//4ZqWhdvhpUxQNoNq5LY= Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id B9ED83858401 for ; Sun, 7 Nov 2021 00:33:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B9ED83858401 Received: by smtp.gentoo.org (Postfix, from userid 559) id 5EA93343156; Sun, 7 Nov 2021 00:33:01 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 3/6] sim: sh: fix various parentheses warnings Date: Sat, 6 Nov 2021 20:32:51 -0400 Message-Id: <20211107003254.4298-3-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211107003254.4298-1-vapier@gentoo.org> References: <20211107003254.4298-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Add parentheses to a bunch of places where the compiler suggests we do to avoid confusion to most readers. --- sim/sh/gencode.c | 18 +++++++++--------- sim/sh/interp.c | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sim/sh/gencode.c b/sim/sh/gencode.c index ae44bc8825b8..28b483208f3a 100644 --- a/sim/sh/gencode.c +++ b/sim/sh/gencode.c @@ -1863,7 +1863,7 @@ op ppi_tab[] = "if (i <= 16)", " res = Sz << i;", "else if (i >= 128 - 16)", - " res = (unsigned) Sz >> 128 - i; /* no sign extension */", + " res = (unsigned) Sz >> (128 - i); /* no sign extension */", "else", " {", " RAISE_EXCEPTION (SIGILL);", @@ -1887,7 +1887,7 @@ op ppi_tab[] = " else", " {", " res = Sz << i;", - " res_grd = Sz_grd << i | (unsigned) Sz >> 32 - i;", + " res_grd = Sz_grd << i | (unsigned) Sz >> (32 - i);", " }", " res_grd = SEXT (res_grd);", " carry = res_grd & 1;", @@ -1902,7 +1902,7 @@ op ppi_tab[] = " }", " else", " {", - " res = Sz >> i | Sz_grd << 32 - i;", + " res = Sz >> i | Sz_grd << (32 - i);", " res_grd = Sz_grd >> i;", " }", " carry = Sz >> (i - 1) & 1;", @@ -1973,7 +1973,7 @@ op ppi_tab[] = "ADD_SUB_GE;", "DSR &= ~0xf1;\n", "if (res || res_grd)\n", - " DSR |= greater_equal | res_grd >> 2 & DSR_MASK_N | overflow;\n", + " DSR |= greater_equal | (res_grd >> 2 & DSR_MASK_N) | overflow;\n", "else\n", " DSR |= DSR_MASK_Z | overflow;\n", "DSR |= carry;\n", @@ -1992,7 +1992,7 @@ op ppi_tab[] = "ADD_SUB_GE;", "DSR &= ~0xf1;\n", "if (res || res_grd)\n", - " DSR |= greater_equal | res_grd >> 2 & DSR_MASK_N | overflow;\n", + " DSR |= greater_equal | (res_grd >> 2 & DSR_MASK_N) | overflow;\n", "else\n", " DSR |= DSR_MASK_Z | overflow;\n", "DSR |= carry;\n", @@ -2148,7 +2148,7 @@ op ppi_tab[] = "if (Sy <= 16)", " res = Sx << Sy;", "else if (Sy >= 128 - 16)", - " res = (unsigned) Sx >> 128 - Sy; /* no sign extension */", + " res = (unsigned) Sx >> (128 - Sy); /* no sign extension */", "else", " {", " RAISE_EXCEPTION (SIGILL);", @@ -2171,7 +2171,7 @@ op ppi_tab[] = " else", " {", " res = Sx << Sy;", - " res_grd = Sx_grd << Sy | (unsigned) Sx >> 32 - Sy;", + " res_grd = Sx_grd << Sy | (unsigned) Sx >> (32 - Sy);", " }", " res_grd = SEXT (res_grd);", " carry = res_grd & 1;", @@ -2186,7 +2186,7 @@ op ppi_tab[] = " }", " else", " {", - " res = Sx >> Sy | Sx_grd << 32 - Sy;", + " res = Sx >> Sy | Sx_grd << (32 - Sy);", " res_grd = Sx_grd >> Sy;", " }", " carry = Sx >> (Sy - 1) & 1;", @@ -3347,7 +3347,7 @@ ppi_gensim (void) printf (" }\n"); printf (" DSR &= ~0xf1;\n"); printf (" if (res || res_grd)\n"); - printf (" DSR |= greater_equal | res_grd >> 2 & DSR_MASK_N | overflow;\n"); + printf (" DSR |= greater_equal | (res_grd >> 2 & DSR_MASK_N) | overflow;\n"); printf (" else\n"); printf (" DSR |= DSR_MASK_Z | overflow;\n"); printf (" assign_dc:\n"); diff --git a/sim/sh/interp.c b/sim/sh/interp.c index 4cac8de89d53..2bae4484e349 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -195,11 +195,11 @@ do { \ #define SET_SR_CS(EXP) SET_SR_BIT ((EXP), SR_MASK_CS) #define SET_BANKN(EXP) \ do { \ - IBNR = (IBNR & 0xfe00) | (EXP & 0x1f); \ + IBNR = (IBNR & 0xfe00) | ((EXP) & 0x1f); \ } while (0) #define SET_ME(EXP) \ do { \ - IBNR = (IBNR & 0x3fff) | ((EXP & 0x3) << 14); \ + IBNR = (IBNR & 0x3fff) | (((EXP) & 0x3) << 14); \ } while (0) #define SET_SR_M(EXP) SET_SR_BIT ((EXP), SR_MASK_M) #define SET_SR_Q(EXP) SET_SR_BIT ((EXP), SR_MASK_Q) -- 2.33.0