From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id uCfnM6EUMGMXrD8AWB0awg (envelope-from ) for ; Sun, 25 Sep 2022 04:43:13 -0400 Received: by simark.ca (Postfix, from userid 112) id D18291E112; Sun, 25 Sep 2022 04:43:13 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=BzJrOILJ; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.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 6BC8F1E0D3 for ; Sun, 25 Sep 2022 04:43:13 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B0E3D385843A for ; Sun, 25 Sep 2022 08:43:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B0E3D385843A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664095392; bh=3G0zp3SU46TzOytSX0rp0/tBNQDHTesrzlpNdbwl7uA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=BzJrOILJviFran/eUKLg2GSQqc7iHgJ0byoa9R79epsp4DCLVimMfeCgsgBxo9Knn VR0tQ6hpmvCOjFA7+k/XCvxPv6n8hhF2GBU1jRUhDAyyySTXRisL2rZpYhGdFoNEH2 5e8jrgBeky+mfeqWtbATV4GH2ss49PvO2XVQKMlk= Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id C6E2338582B2 for ; Sun, 25 Sep 2022 08:42:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C6E2338582B2 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 171A0300089; Sun, 25 Sep 2022 08:42:41 +0000 (UTC) To: Tsukasa OI , Andrew Burgess , Mike Frysinger Subject: [PATCH v2 2/5] sim: Make WITH_{TRACE,PROFILE}-based macros bool Date: Sun, 25 Sep 2022 08:42:03 +0000 Message-Id: <5e4eb547bed6f4335099f242aebd39768bb1cb40.1664095312.git.research_trasio@irq.a4lg.com> In-Reply-To: References: 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: Tsukasa OI via Gdb-patches Reply-To: Tsukasa OI Cc: gdb-patches@sourceware.org Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" 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/ChangeLog: * common/sim-profile.h (WITH_PROFILE_INSN_P, WITH_PROFILE_MEMORY_P, WITH_PROFILE_MODEL_P, WITH_PROFILE_SCACHE_P, WITH_PROFILE_PC_P, WITH_PROFILE_CORE_P): Make predicate macros boolean. * common/sim-trace.h (WITH_TRACE_P, WITH_TRACE_ANY_P): Likewise. --- 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..acf0f7d74e2 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)) +#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)) /* 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..bc3e690a4cc 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))) /* Preprocessor macros to simplify tests of WITH_TRACE. */ -#define WITH_TRACE_ANY_P (WITH_TRACE) +#define WITH_TRACE_ANY_P (!!(WITH_TRACE)) #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