From patchwork Sat Oct 1 16:23:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 611392 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp278514pvb; Sat, 1 Oct 2022 09:40:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4O/3Ikc3n2arxAakzrBK+BFv95EZSfPIw7BjsIxrc07Rnf/4md6j39cami2p5d+qMrquCc X-Received: by 2002:ad4:5bc3:0:b0:4b1:77b6:1555 with SMTP id t3-20020ad45bc3000000b004b177b61555mr4837113qvt.51.1664642457317; Sat, 01 Oct 2022 09:40:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664642457; cv=none; d=google.com; s=arc-20160816; b=0TRrP6Da4vA4dimGsUH3KLKr5F82ykBM1ZZepOfsng8D/Voh8RYDnjmHbp48hcwH4h CpBQZPi2+5kbNaG0ON/jOdpxwGEMxTCpz4VTdNfJptYZCKy77Wa/TDBAhvTtkNHhPEhA 3KxUURAQ5C/9j0jhYzFaPqcM9AblyJ7xRcCD4KXF/lQk+PQ10v0OJ/EoBUfRb36YcTak +q36SNundKlnBM+vExXl+9oFWgCUG1iQHhNeybic1Rk/0cGTZMbVI6KnWN/7sHmQjcx9 5RsMOiq4rj2HZ5FZggWg7cECuWaqaIWlKABJuS67XinsLfVpmI/C+lYEABrho6u7HNDi WBJw== 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=1wNWHezVm2UV71ghHCMk5XJVYInqSqpNnuv7vR6v7WU=; b=RUoOxyJCea0CM+z2lmcL4VFELjFaRxrjXOYYO04jKWqOAcLRZ2kiHnOJbCDJwvQh7B WHDSlyjsgLJsUpgbvR5buafvoHqf9Fxecy3AzCddwzi/xKGEUG+rICbihIiimYpUvCSF 0cVqPDbKE753SakmCMgXxQ1a67lpr3UXOBe3M6V5A+W9rb1iMRrwFsOnLtsp7CXPgxO3 mNVnnuISBIIZvsl9RBlY/s4cZ5Ctr9ZiBwJX5QJX6yJvb/Z88SiDLMbZxiVzd06vhed3 SNgy1fW/Ucu8VOEvVDylfPdFPjWKC5n7gMZwlc9/HF+TFEJbsS38jbLB058ZNjeQKr6N a75Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uta0XtAq; 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 o13-20020a0ce40d000000b004ac84553c3bsi2476017qvl.421.2022.10.01.09.40.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Oct 2022 09:40:57 -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=uta0XtAq; 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]:51876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oefXs-00053e-Qu for patch@linaro.org; Sat, 01 Oct 2022 12:40:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oefI3-0007y6-76 for qemu-devel@nongnu.org; Sat, 01 Oct 2022 12:24:35 -0400 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]:35429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oefI1-0006Nb-GF for qemu-devel@nongnu.org; Sat, 01 Oct 2022 12:24:34 -0400 Received: by mail-qt1-x82b.google.com with SMTP id g23so4351608qtu.2 for ; Sat, 01 Oct 2022 09:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=1wNWHezVm2UV71ghHCMk5XJVYInqSqpNnuv7vR6v7WU=; b=uta0XtAq0zkGKDu1c8hXsyDPsYAVjvfwUFxTlVAbeYrrGuciXQxZBWDudQidrIOY8u dVq9oEyZaBn8TJ/rEzaVbMjB+LBstcPRC9TWdLCCKdxJ34bhzDJsZHwxyGS9djzqSk9p /QL8aUdQqIm2S25JCv2yI57K82sqYDmyc6SY79UXucx7wUwTjDXu9YkxEHWDXAMXsloK oE+jaT9tgbJTspU7ZslVg7kzYAuy1PQMy06Fn4MJrZBD5CEnmfvFX9nVjwrkDK+uVNOm gymT77MgonR9yAMCSUA4OHT7LMi9hb970673mONltVyy21rcGW1qsPt+M7pFuUFADpUp Fnng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=1wNWHezVm2UV71ghHCMk5XJVYInqSqpNnuv7vR6v7WU=; b=NbSFe6Tbe31XM9JKx6tQn4TVxDzupgsENVhUaavN6vfK02mVWhdmozUjWhtqoO3DTn xHzgWiYsnzrDjxMn8T/HL9m2QcGajP0SMdPTDPkaS6Ng0RSww0ByPhI9RQXITMD/SF24 Nhma9lRnopSSh5pEfYUzZXg1c3rZSaWk0GdHTJWTisO0ksA1/JEC9m0cHKbxRHxs0IgW q0USp38m6vZ0vSGhwwTtSqihjVOzkaqI766N58ftq2k5c4SNAPtYE9REASD4xjQMgXRg nqCXE/Q7DTtfQjD6A2p8vEoLuGp5M/obH4BwoblHB0IfNtQspoXw87XEtyE6JJ7FyjET FiBg== X-Gm-Message-State: ACrzQf3udccrh9y7XZWPtABqtSmiIH4rHQ/AWaixSDfLxJTOFkyTt8jd gggoqP4J/lucRLqZvPKJnW0WFurfHUk6hg== X-Received: by 2002:ac8:5c0b:0:b0:35c:e066:998d with SMTP id i11-20020ac85c0b000000b0035ce066998dmr10906978qti.336.1664641472882; Sat, 01 Oct 2022 09:24:32 -0700 (PDT) Received: from stoup.. ([2605:ef80:8084:91a4:f7cb:db31:c505:b931]) by smtp.gmail.com with ESMTPSA id t4-20020a37ea04000000b006d1d8fdea8asm4387445qkj.85.2022.10.01.09.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 09:24:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v3 29/42] target/arm: Use bool consistently for get_phys_addr subroutines Date: Sat, 1 Oct 2022 09:23:05 -0700 Message-Id: <20221001162318.153420-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221001162318.153420-1-richard.henderson@linaro.org> References: <20221001162318.153420-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82b; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x82b.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 autolearn=ham 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 Reviewed-by: Peter Maydell --- target/arm/ptw.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 3f5733a237..445382ab03 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2432,7 +2432,7 @@ static bool get_phys_addr_disabled(CPUARMState *env, target_ulong address, result->f.lg_page_size = TARGET_PAGE_BITS; result->cacheattrs.shareability = shareability; result->cacheattrs.attrs = memattr; - return 0; + return false; } static bool get_phys_addr_twostage(CPUARMState *env, target_ulong address, @@ -2444,8 +2444,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, target_ulong address, { hwaddr ipa; int s1_prot; - int ret; - bool ipa_secure, s2walk_secure; + bool ret, ipa_secure, s2walk_secure; ARMCacheAttrs cacheattrs1; ARMMMUIdx s2_mmu_idx; bool is_el0; @@ -2524,7 +2523,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, target_ulong address, || (env->cp15.vstcr_el2 & (VSTCR_SA | VSTCR_SW))); } } - return 0; + return false; } static bool get_phys_addr_with_secure_debug(CPUARMState *env,