From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sender-0.a4lg.com (mail-sender-0.a4lg.com [IPv6:2401:2500:203:30b:4000:6bfe:4757:0]) by sourceware.org (Postfix) with ESMTPS id 10E39384BC00 for ; Thu, 6 Oct 2022 06:44:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 10E39384BC00 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 2FAA9300089; Thu, 6 Oct 2022 06:44:19 +0000 (UTC) From: Tsukasa OI To: Tsukasa OI , Andrew Burgess , Mike Frysinger Cc: gdb-patches@sourceware.org Subject: [PATCH v3 2/5] sim: Make WITH_{TRACE,PROFILE}-based macros bool Date: Thu, 6 Oct 2022 06:43:50 +0000 Message-Id: <66f25fcb1054003f83348b6e378d6c9710a02aa4.1665038297.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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: , X-List-Received-Date: Thu, 06 Oct 2022 06:44:23 -0000 Clang generates a warning if there is an ambiguous expression (possibly a bitwise operation (& or |), but a logical operator (&& or ||) is used; "-Wconstant-logical-operand"). On the default configuration, it causes a build failure (unless "--disable-werror" is specified). This is caused by predicate macros that use the form (base_variable & flag). Clang considers them as regular integer values (not boolean) and generates that warning. This commit makes Clang think those predicate macros to be boolean. --- sim/common/sim-profile.h | 12 ++++++------ sim/common/sim-trace.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sim/common/sim-profile.h b/sim/common/sim-profile.h index 61d5039e10d..d072621a514 100644 --- a/sim/common/sim-profile.h +++ b/sim/common/sim-profile.h @@ -87,12 +87,12 @@ SIM_RC sim_profile_set_option (SIM_DESC sd_, const char *name_, int idx_, #define PROFILE_core (1 << PROFILE_CORE_IDX) /* Preprocessor macros to simplify tests of WITH_PROFILE. */ -#define WITH_PROFILE_INSN_P (WITH_PROFILE & PROFILE_insn) -#define WITH_PROFILE_MEMORY_P (WITH_PROFILE & PROFILE_memory) -#define WITH_PROFILE_MODEL_P (WITH_PROFILE & PROFILE_model) -#define WITH_PROFILE_SCACHE_P (WITH_PROFILE & PROFILE_scache) -#define WITH_PROFILE_PC_P (WITH_PROFILE & PROFILE_pc) -#define WITH_PROFILE_CORE_P (WITH_PROFILE & PROFILE_core) +#define WITH_PROFILE_INSN_P ((WITH_PROFILE & PROFILE_insn) != 0) +#define WITH_PROFILE_MEMORY_P ((WITH_PROFILE & PROFILE_memory) != 0) +#define WITH_PROFILE_MODEL_P ((WITH_PROFILE & PROFILE_model) != 0) +#define WITH_PROFILE_SCACHE_P ((WITH_PROFILE & PROFILE_scache) != 0) +#define WITH_PROFILE_PC_P ((WITH_PROFILE & PROFILE_pc) != 0) +#define WITH_PROFILE_CORE_P ((WITH_PROFILE & PROFILE_core) != 0) /* If MAX_TARGET_MODES isn't defined, we can't do memory profiling. ??? It is intended that this is a temporary occurrence. Normally diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h index d08810d9fcc..8d4ab130815 100644 --- a/sim/common/sim-trace.h +++ b/sim/common/sim-trace.h @@ -125,10 +125,10 @@ enum { #define TRACE_debug (1 << TRACE_DEBUG_IDX) /* Return non-zero if tracing of idx is enabled (compiled in). */ -#define WITH_TRACE_P(idx) (WITH_TRACE & (1 << idx)) +#define WITH_TRACE_P(idx) ((WITH_TRACE & (1 << idx)) != 0) /* Preprocessor macros to simplify tests of WITH_TRACE. */ -#define WITH_TRACE_ANY_P (WITH_TRACE) +#define WITH_TRACE_ANY_P (WITH_TRACE != 0) #define WITH_TRACE_INSN_P WITH_TRACE_P (TRACE_INSN_IDX) #define WITH_TRACE_DISASM_P WITH_TRACE_P (TRACE_DISASM_IDX) #define WITH_TRACE_DECODE_P WITH_TRACE_P (TRACE_DECODE_IDX) -- 2.34.1