From patchwork Sun Jul 3 08:24:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 586853 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp2940380mab; Sun, 3 Jul 2022 02:29:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uCOvQFs2V3SfSNLaSbqde+ei1IE7wyHF+sjrk1TWcLs4abEZinA+r/b3SMvTy62TOKJDsk X-Received: by 2002:a25:2541:0:b0:66e:2e17:7526 with SMTP id l62-20020a252541000000b0066e2e177526mr4924314ybl.312.1656840589072; Sun, 03 Jul 2022 02:29:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656840589; cv=none; d=google.com; s=arc-20160816; b=zlXohXEy50TaEb5cE1CO2hpnWynJ1+pQspdLoQyYiqMV0Jt2LgulWcgNp8N0Am+KYX cQK+Gpbm7sJLhfctnye17nptju0C2fSWQpnT8faz8HvF11x3qtTcy0iQZr76ap7tlE2x +Soyx2LoCi/RpkluCxh8HWSCC0dT6tlfleYNthYFAFBeh8ldznA6D6rpI3JiZuZbZ8if Toy77XU8zy1DBuwhqXtXduUzkob6ZfdlQGShhwdNXeEvz+vtAZDcK2QpOsxznzGimBQm kVwNnAIPp9YpppjAvEpJcddscBIL0BBdCtnzA1HFf+FmIodKeoqeJMbMA7JtpaMF+ovi 9oKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IFacPIEDusd1hE7rtQmwmoagq5wzcnFBcC4AqTaOWD4=; b=QanNvjNasODeOHhrcS2mkxwW+FWeFjCsSkJf7iT58/kbnQ/mp+OCmc+g56mhPSOsAZ YrHmC+BWS20PDCOdRnZIQuY1lvHv0VkY7RLulAj6L/KgmD/WHq+qUa74f1BBrWp2N8sk pcUs4UkB50uIlIR1YlrlPrRzNXAvU8c/x9rl+CW6OKaFv81JPreR2qS+C7KSwgg0dFs2 SZWIRAivti9RCAXQjRqziTIbfDzRCjyHuS1LCIvAAdbSOKkrp508GjGRnb804p5BES5Y n1yWbsdjdqCGfaHfVSB7AxR2ny20Dn1VU1JrcjnH9XTXpP9qseNPRjVyNqYlZt4QAcWA 2gsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rI43nmAv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a4-20020a254d04000000b0066e30bf9b51si3006560ybb.503.2022.07.03.02.29.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 03 Jul 2022 02:29:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rI43nmAv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7vvI-0005Ea-KY for patch@linaro.org; Sun, 03 Jul 2022 05:29:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7uzP-0001Bi-UT for qemu-devel@nongnu.org; Sun, 03 Jul 2022 04:29:59 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:38807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7uzO-0006iK-FE for qemu-devel@nongnu.org; Sun, 03 Jul 2022 04:29:59 -0400 Received: by mail-pl1-x633.google.com with SMTP id m14so6034713plg.5 for ; Sun, 03 Jul 2022 01:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IFacPIEDusd1hE7rtQmwmoagq5wzcnFBcC4AqTaOWD4=; b=rI43nmAv8FKAGO74g/+4inYLf8AMbBUR5jA9m6gi3h2SBv1sc0QKicyPKe2PEN+jSI lc8DCPbKOXtnIcJxAqff2KTk9fXdAfosMoUEMmpw67MymbnKKlnvAgMr9i1pt10VLnp9 wHUx8zAwCGkY5xbuLs1hORXajB5rzdQiJRvNg2p2BeTMjMlklrp1N96y8RlgPREV1ssq l527MWQZ8kDvPg4rbrY6KNquU2N/t8PbGvvg7uSFlUKVMrUITFIZ6huoYkbY3MZT3x1N 2ZPHZPUfDFgDWWiYAODAACDAGAkpzt7ZOszi/N6yWtgQAF7GAzGcn3i2JARTufcUIJQh Sipw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IFacPIEDusd1hE7rtQmwmoagq5wzcnFBcC4AqTaOWD4=; b=49JuQ4Ozwmhh4eMpOLum5GQwFrPi71SIGyONVFRu+7KHsEdYPkcJ9HjF0KNvuK/qJV fiUgQSBm5x7jaoPVPTmrsZT47uiWrYzxJZeV5xMfG3NSdNqDkEIBa3kFlFqSM0F3SADC bhwteYI3iC3SjSWXYqt1mBrC7FpZgkyoeNwoJopBzDln6o02xicZ3Uzk9LRnGQcLCFY/ md99LsoD8aL+4EvVCrFDb0+YdnHdotaT94C7AXMEFcJvJ1R3e+AP8Q7vnXlLJ+2RLF0G VIupqTEt5dyuas5q2HRU2dscfxnDiPhLFstd+rKiOmcJ3fdJXReZNBI2C/px5dT6oGye y1yg== X-Gm-Message-State: AJIora+a7BnXq+Df3BG7ZR+/GxMetsc0U2aATDKFGTMAShWzDw/fBH0n eG0862iOPK5H1+nGEWeaivE4P4wp5Sp9upTZ X-Received: by 2002:a17:902:c402:b0:16a:5204:3066 with SMTP id k2-20020a170902c40200b0016a52043066mr30085987plk.126.1656836997241; Sun, 03 Jul 2022 01:29:57 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id g6-20020a1709026b4600b0016788487357sm18574523plt.132.2022.07.03.01.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 01:29:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 49/62] target/arm: Use bool consistently for get_phys_addr subroutines Date: Sun, 3 Jul 2022 13:54:06 +0530 Message-Id: <20220703082419.770989-50-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220703082419.770989-1-richard.henderson@linaro.org> References: <20220703082419.770989-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The return type of the functions is already bool, but in a few instances we used an integer type with the return statement. Signed-off-by: Richard Henderson --- target/arm/ptw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 993f015904..a2c441d947 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2376,7 +2376,7 @@ static bool get_phys_addr_disabled(CPUARMState *env, target_ulong address, fi->type = ARMFault_AddressSize; fi->level = 0; fi->stage2 = false; - return 1; + return true; } /* @@ -2397,7 +2397,7 @@ static bool get_phys_addr_disabled(CPUARMState *env, target_ulong address, result->cacheattrs.is_s2_format = false; result->cacheattrs.shareability = shareability; result->cacheattrs.attrs = memattr; - return 0; + return false; } static bool get_phys_addr_twostage(CPUARMState *env, target_ulong address, @@ -2408,7 +2408,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, target_ulong address, { hwaddr ipa; int s1_prot; - int ret; + bool ret; bool ipa_secure; ARMCacheAttrs cacheattrs1; ARMMMUIdx s2_mmu_idx; @@ -2486,7 +2486,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, target_ulong address, (env->cp15.vstcr_el2.raw_tcr & (VSTCR_SA | VSTCR_SW))); } } - return 0; + return false; } /**