From nobody Sat Nov 15 10:37:18 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754177789; cv=none; d=zohomail.com; s=zohoarc; b=ddwoJHIvjoRL9XerZa+RYMNS5gTN1A5HyO2loC9KQGygJbnSpnG1on/7FjD2MvXFdX2Ou1MVsO9JKOZ+NQ8kLi9XUMmfY2KK1aY9kpbPnHxhfK43zuIqDW6jcWS2DFhbAfNxmarBq9LyTzkM//G5uVQPUjszAE0eJUoGWziZVa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754177789; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZZOw9ryR7txUPbUNE8ys+z7FS49ZXU14iEzf3W4F/4k=; b=ZHeNbuQ1yh0oeW/nAId/rGVVWmEmeSxTyirt/SO+t5By+7NdMGeUCVTrcy6nYUOwKPsannWB+KVl5lV8sqBw3iQjzL/NI8JIVnaw8zkCEo67r4iW8ze3/mGTYS7RC7UNiUAupQFTgJ9sjsof2VNfW/ZuJ/iGs2YJloQvgRQi+mg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175417778911659.81124310966891; Sat, 2 Aug 2025 16:36:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiLkG-0006dr-1m; Sat, 02 Aug 2025 19:34:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uiLiv-0002SA-MD for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:33:10 -0400 Received: from mail-oa1-x2d.google.com ([2001:4860:4864:20::2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiLiu-0005JP-1X for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:33:09 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-2ea6dd628a7so2031138fac.1 for ; Sat, 02 Aug 2025 16:33:07 -0700 (PDT) Received: from stoup.. ([172.58.111.133]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-30b8e3c9b32sm71031fac.24.2025.08.02.16.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 16:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754177587; x=1754782387; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZZOw9ryR7txUPbUNE8ys+z7FS49ZXU14iEzf3W4F/4k=; b=EIcdRDc7SAW2FC5lZZc9JRtiEBUIvF3o7j4+6NoSdPzEiXyBMr+IOsFubTjY2L8JLl 3kcoHp20ehfrsM5wBHdEA1v+CvHD7zyEqcYVvdH7ltKOA8u1oVnkqAWEnmOlvtRSl2pc hJ/Ul43+ezrF/+o60ya7T43H0sDHu9V2WtFscWFe0qIHTT9Y0OLIsi0JNndBgybkAasX rdZXOlVJ48bAKH1UrBfMB4ORoB8Lpx3sOOcRbJWjlJkH3V6Cdv011JP/wBT5RqIAuno0 MNgFX1sTKU4o6eTq3cE0HvSU86lczXDK+0+yTyT4hB0NMXugUYb6/fRe8aEJpkVWm4hl 7zhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754177587; x=1754782387; 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:message-id:reply-to; bh=ZZOw9ryR7txUPbUNE8ys+z7FS49ZXU14iEzf3W4F/4k=; b=pHo7vPKG+yqWVwUYgzhrXMW+j+sBWz3MUPznl4nr86wYOLzXzvIavyQ1MCb1uPfW56 fIyN+0WZNAozuzIDN8tvwbecryJTMUbuG5yOMhB+zvOLaFZSICMoOB5D60GAOVJ7blkn nR3hpT45IaEdLhOz/HBETZM1wlwGMv2QksDYrms6TQpsrs8ltpU3fGIVwAOYAZlHkE0B IIAlzEgMFNW+fG5Gz7wMUr1HotGjGMPLycR7nitZBZ3ukd6adyTxZBIL6jLJwuDV2eCI P6YSLtQivnPmFEDqBoBInHOpqUQGRW4j6hT6hd/rgahw8dEZXZZBVtNULuvFFxhg/j+O YZrQ== X-Gm-Message-State: AOJu0YxIz8WRH/CvAdRpD12PTePM48m3j2jYpiH/jQggkTyjrzqFgQtA R7Rbi0mXuFFJYOrIMqp9xUfIWDd6ytV4aRgsmdJNwgUobHceNv8NxDoffC3auLqWuyRPIOFljcZ kAqmQbZ8= X-Gm-Gg: ASbGncscWEuI/0Pzxinodsc1DBCpM2wN0BXFosGAVlraFf5P5pZStp5qYWC9QjrFDMn P3p8uhYUCPjxl9eWTNClR6IS46smEaGYfC+1ndSlualGRPLOM6SeeOrG3ewR0baQglWkCQTYIE0 Xg/BcAAd/KZLE4BIrYbVON70pUkPLVIUf+P8Fkmtn2+4/WRVuF+oGV+I2panxUQRvZmbfVAbGyi rbL8nvy28OhTaj4ul2HTAjPUElW5B3NPmg1FNIcWQG0pAhdCuegr6a34CGxl2cBbtGKpu+cWSMG q+OlLNCTl/TxcU6vJzvNh0u3TTxs5MnWc7IscQxYOgXI6D/TTxjHHxjocWg7rRB1ntcqSUWLo+d n8jxk3BvCR5Z9kQoB82/yep454SBST4BwBYkvaHInudleBSP03l8nO3dG5G7ncKM= X-Google-Smtp-Source: AGHT+IH0EzsRlOzQYJxanoiCj/EWxT2adLgfV4RiogBEjgQRPRARAdLAq1jGkbGtwLdAt9tFZFWJig== X-Received: by 2002:a05:6870:ad08:b0:2ea:83e7:d525 with SMTP id 586e51a60fabf-30b676c5e7dmr2352236fac.16.1754177586827; Sat, 02 Aug 2025 16:33:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v2 39/85] target/arm: Remove unused env argument from regime_is_user Date: Sun, 3 Aug 2025 09:29:07 +1000 Message-ID: <20250802232953.413294-40-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250802232953.413294-1-richard.henderson@linaro.org> References: <20250802232953.413294-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754177789965116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/internals.h | 2 +- target/arm/helper.c | 2 +- target/arm/ptw.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index f665971b97..ea210c7179 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1034,7 +1034,7 @@ static inline bool regime_is_stage2(ARMMMUIdx mmu_idx) return mmu_idx =3D=3D ARMMMUIdx_Stage2 || mmu_idx =3D=3D ARMMMUIdx_Sta= ge2_S; } =20 -static inline bool regime_is_user(CPUARMState *env, ARMMMUIdx mmu_idx) +static inline bool regime_is_user(ARMMMUIdx mmu_idx) { switch (mmu_idx) { case ARMMMUIdx_E10_0: diff --git a/target/arm/helper.c b/target/arm/helper.c index 78f670314d..090076af24 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9692,7 +9692,7 @@ ARMVAParameters aa64_va_parameters(CPUARMState *env, = uint64_t va, ds =3D extract64(tcr, 59, 1); =20 if (e0pd && cpu_isar_feature(aa64_e0pd, cpu) && - regime_is_user(env, mmu_idx)) { + regime_is_user(mmu_idx)) { epd =3D true; } =20 diff --git a/target/arm/ptw.c b/target/arm/ptw.c index c75b15b263..493ec78c1a 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -964,7 +964,7 @@ static int ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mm= u_idx, int ap, int domain_prot) { return ap_to_rw_prot_is_user(env, mmu_idx, ap, domain_prot, - regime_is_user(env, mmu_idx)); + regime_is_user(mmu_idx)); } =20 /* @@ -990,7 +990,7 @@ static int simple_ap_to_rw_prot_is_user(int ap, bool is= _user) =20 static int simple_ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int a= p) { - return simple_ap_to_rw_prot_is_user(ap, regime_is_user(env, mmu_idx)); + return simple_ap_to_rw_prot_is_user(ap, regime_is_user(mmu_idx)); } =20 static bool get_phys_addr_v5(CPUARMState *env, S1Translate *ptw, @@ -1377,7 +1377,7 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu= _idx, bool is_aa64, ARMSecuritySpace in_pa, ARMSecuritySpace out_pa) { ARMCPU *cpu =3D env_archcpu(env); - bool is_user =3D regime_is_user(env, mmu_idx); + bool is_user =3D regime_is_user(mmu_idx); bool have_wxn; int wxn =3D 0; =20 @@ -1539,7 +1539,7 @@ static int get_S1prot_indirect(CPUARMState *env, S1Tr= anslate *ptw, if ((u_perm & (PAGE_RWX | PAGE_GCS)) && regime_is_pan(mmu_idx)) { p_perm &=3D ~(PAGE_READ | PAGE_WRITE); } - perm =3D regime_is_user(env, mmu_idx) ? u_perm : p_perm; + perm =3D regime_is_user(mmu_idx) ? u_perm : p_perm; } =20 if (in_pa !=3D out_pa) { @@ -2384,7 +2384,7 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t mask; uint32_t base; ARMMMUIdx mmu_idx =3D ptw->in_mmu_idx; - bool is_user =3D regime_is_user(env, mmu_idx); + bool is_user =3D regime_is_user(mmu_idx); =20 if (regime_translation_disabled(env, mmu_idx, ptw->in_space)) { /* MPU disabled. */ @@ -2551,7 +2551,7 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, ARMCPU *cpu =3D env_archcpu(env); int n; ARMMMUIdx mmu_idx =3D ptw->in_mmu_idx; - bool is_user =3D regime_is_user(env, mmu_idx); + bool is_user =3D regime_is_user(mmu_idx); bool secure =3D arm_space_is_secure(ptw->in_space); =20 result->f.phys_addr =3D address; @@ -2771,7 +2771,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t add= ress, * memory system to use a subpage. */ ARMCPU *cpu =3D env_archcpu(env); - bool is_user =3D regime_is_user(env, mmu_idx); + bool is_user =3D regime_is_user(mmu_idx); int n; int matchregion =3D -1; bool hit =3D false; @@ -3651,7 +3651,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, break; } =20 - result->f.attrs.user =3D regime_is_user(env, mmu_idx); + result->f.attrs.user =3D regime_is_user(mmu_idx); =20 /* * Fast Context Switch Extension. This doesn't exist at all in v8. --=20 2.43.0