From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id trG4KzBXkWGTTgAAWB0awg (envelope-from ) for ; Sun, 14 Nov 2021 13:36:32 -0500 Received: by simark.ca (Postfix, from userid 112) id A1C971F0C1; Sun, 14 Nov 2021 13:36:32 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.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 69BA61E813 for ; Sun, 14 Nov 2021 13:36:31 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 726653858429 for ; Sun, 14 Nov 2021 18:36:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 726653858429 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636914990; bh=z826aSwiTSziH8oGN7FYyo2zV6mz+tzA4QEGp5SDZyE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=x+XU11Z/wL2qu/21jXbgOns0qDQex2S0wgC6P+QAU6XTIFEwgN+e8RNf2j1d68dRV HZ6jWQssvTQaAav5UmG6Sf4LOvomudkOfikV/ucTJqA1VCa0Ln+Q3kVGd8zD+fakA7 6+Xlrbc/1WEeH7sv6d3q3dd+iO9z9WQxFHnzB/Kc= Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id BC4BF385843B for ; Sun, 14 Nov 2021 18:36:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BC4BF385843B Received: by mail-wm1-x32d.google.com with SMTP id n33-20020a05600c502100b0032fb900951eso8737424wmr.4 for ; Sun, 14 Nov 2021 10:36:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z826aSwiTSziH8oGN7FYyo2zV6mz+tzA4QEGp5SDZyE=; b=alatRdYFz4FmZjVaXnb7Xauprao+DluaglrFraC53C+03o7J0iBW1RcDjDkjQQTPk0 WMAW6chJMjOogs/xye5AfkSrmc5IMubFMo10poLWd9sWsRoRGWJdiQNaMxVCYjCIAjzm I84gw+eSvTLvpOKajTMLar9WH3dRE7pyIohin6q45bOyA3WygqhOq4Q6tCbFJRgrtbvu A/P4pqEyAOn619igN8LEgP3EunTc1M5qAHojtZ0q2vOhUeDMxb8PVcmP8f/AFztP02WT XMozdjiVACFi2sZsVl09n9MRIFjO2VHica4Jfs70GcazmBZfZIGy46thHN/1KJ1oGiWJ Fr8Q== X-Gm-Message-State: AOAM532fmd/8pabsAL0alK+eSC02xhIbzapOexZAO47/7boV2sYJQaui Buog5i1jD74xUoc2RP7G4Ls= X-Google-Smtp-Source: ABdhPJwSFOS9mrjk5SfjbVhey34tINtSY2Tysty7Z/O+kLd39zecwUdKoIf+RJ0mG/FYv4Ave0mmVA== X-Received: by 2002:a1c:e90a:: with SMTP id q10mr36051566wmc.108.1636914968747; Sun, 14 Nov 2021 10:36:08 -0800 (PST) Received: from nz.home (host81-147-8-167.range81-147.btcentralplus.com. [81.147.8.167]) by smtp.gmail.com with ESMTPSA id d9sm11786924wre.52.2021.11.14.10.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Nov 2021 10:36:08 -0800 (PST) Received: by nz.home (Postfix, from userid 1000) id D1424ECDFE7D; Sun, 14 Nov 2021 18:36:07 +0000 (GMT) To: gdb-patches@sourceware.org Subject: [PATCH] cr16: fix build on gcc-12 (NULL comparison) Date: Sun, 14 Nov 2021 18:35:56 +0000 Message-Id: <20211114183556.3460823-1-slyich@gmail.com> X-Mailer: git-send-email 2.33.1 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: Sergei Trofimovich via Gdb-patches Reply-To: Sergei Trofimovich Cc: Sergei Trofimovich , M R Swami Reddy Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" From: Sergei Trofimovich On gcc-12 build fails as: sim/cr16/interp.c: In function 'lookup_hash': sim/cr16/interp.c:89:25: error: the comparison will always evaluate as 'true' for the address of 'mnimonic' will never be NULL [-Werror=address] 89 | if ((h->ops->mnimonic != NULL) && | ^~ 'mnimonic' is a sharr array within ops. It can never be NULL. While at it renamed 'mnimonic' to 'mnemonic'. --- sim/cr16/cr16_sim.h | 2 +- sim/cr16/interp.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16_sim.h index a865d093648..35a9614977c 100644 --- a/sim/cr16/cr16_sim.h +++ b/sim/cr16/cr16_sim.h @@ -59,7 +59,7 @@ typedef uint32 creg_t; struct simops { - char mnimonic[12]; + char mnemonic[12]; uint32 size; uint32 mask; uint32 opcode; diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c index e2aef013d16..ecc61362200 100644 --- a/sim/cr16/interp.c +++ b/sim/cr16/interp.c @@ -86,8 +86,7 @@ lookup_hash (SIM_DESC sd, SIM_CPU *cpu, uint64 ins, int size) mask = (((1 << (32 - h->mask)) -1) << h->mask); /* Adjuest mask for branch with 2 word instructions. */ - if ((h->ops->mnimonic != NULL) && - ((streq(h->ops->mnimonic,"b") && h->size == 2))) + if (streq(h->ops->mnemonic,"b") && h->size == 2) mask = 0xff0f0000; @@ -99,7 +98,7 @@ lookup_hash (SIM_DESC sd, SIM_CPU *cpu, uint64 ins, int size) mask = (((1 << (32 - h->mask)) -1) << h->mask); /* Adjuest mask for branch with 2 word instructions. */ - if ((streq(h->ops->mnimonic,"b")) && h->size == 2) + if ((streq(h->ops->mnemonic,"b")) && h->size == 2) mask = 0xff0f0000; } -- 2.33.1