From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1726) id C08CB38582B7; Tue, 11 Oct 2022 14:19:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C08CB38582B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665497961; bh=7g8iGkepwBtLhcffx8nRycg1+RjreRHuApYpf2u6gnI=; h=From:To:Subject:Date:From; b=yz1qx52ZxZGqkCwzAKQH/Y+2p6SXnfGNrq9/9gszHo8DGTffZXdFVctJmG9AuIzhp 7P7/Ls4WE/bHd/gV+T8n5lNZTHKKZ8fOy1f0eANuUOYzmZdKogHT5MjORrsK+LjA+l tVAvTzMqn3hhJP2eNquGNwbZ0qXmk5yFeOT85Q/I= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Andrew Burgess To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: Make WITH_{TRACE,PROFILE}-based macros bool X-Act-Checkin: binutils-gdb X-Git-Author: Tsukasa OI X-Git-Refname: refs/heads/master X-Git-Oldrev: 5294d882ebb5b10f8a246f2c51ffef05622ef16c X-Git-Newrev: 25ae9e265976b45897865d14ed454ec3c937bd78 Message-Id: <20221011141921.C08CB38582B7@sourceware.org> Date: Tue, 11 Oct 2022 14:19:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D25ae9e265976= b45897865d14ed454ec3c937bd78 commit 25ae9e265976b45897865d14ed454ec3c937bd78 Author: Tsukasa OI Date: Thu Oct 6 06:43:50 2022 +0000 sim: Make WITH_{TRACE,PROFILE}-based macros bool =20 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). =20 This is caused by predicate macros that use the form (base_variable & f= lag). Clang considers them as regular integer values (not boolean) and generates that warning. =20 This commit makes Clang think those predicate macros to be boolean. Diff: --- 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) =20 /* 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) !=3D 0) +#define WITH_PROFILE_MEMORY_P ((WITH_PROFILE & PROFILE_memory) !=3D 0) +#define WITH_PROFILE_MODEL_P ((WITH_PROFILE & PROFILE_model) !=3D 0) +#define WITH_PROFILE_SCACHE_P ((WITH_PROFILE & PROFILE_scache) !=3D 0) +#define WITH_PROFILE_PC_P ((WITH_PROFILE & PROFILE_pc) !=3D 0) +#define WITH_PROFILE_CORE_P ((WITH_PROFILE & PROFILE_core) !=3D 0) =20 /* 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) =20 /* 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)) !=3D 0) =20 /* Preprocessor macros to simplify tests of WITH_TRACE. */ -#define WITH_TRACE_ANY_P (WITH_TRACE) +#define WITH_TRACE_ANY_P (WITH_TRACE !=3D 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)