public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] sim: Make WITH_{TRACE,PROFILE}-based macros bool
@ 2022-10-11 14:19 Andrew Burgess
0 siblings, 0 replies; only message in thread
From: Andrew Burgess @ 2022-10-11 14:19 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=25ae9e265976b45897865d14ed454ec3c937bd78
commit 25ae9e265976b45897865d14ed454ec3c937bd78
Author: Tsukasa OI <research_trasio@irq.a4lg.com>
Date: Thu Oct 6 06:43:50 2022 +0000
sim: Make WITH_{TRACE,PROFILE}-based macros bool
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.
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)
/* 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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-11 14:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-11 14:19 [binutils-gdb] sim: Make WITH_{TRACE,PROFILE}-based macros bool Andrew Burgess
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).