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.
This commit is contained in:
Tsukasa OI
2022-10-06 06:43:50 +00:00
committed by Andrew Burgess
parent 5294d882eb
commit 25ae9e2659
2 changed files with 8 additions and 8 deletions

View File

@@ -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

View File

@@ -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)