From nobody Sat Nov 15 10:38:44 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=1754178995; cv=none; d=zohomail.com; s=zohoarc; b=WAXV1O1Xiugb4Wuv1w72250zuvGzyDvvJtimP5mUnkEm8pa03hn3vKH4fikUqOV1ql4KPir7oCYMnlCv4EzvRh7lqcB2m87qvACjqbbvQunVm9bUL0s7O4CktitnsGre3WZYTKztmrFBGOzimOe8JbtVLE7U4X4x7BVtPsDxr0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754178995; 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=hPINWJ4nV+k9v7TwnsVQ/3E97hW4E8lZ7vTBhJUQGXg=; b=EOLZwJycot/WnGF7L7XQ9/AuDvJSt69otWsuhv43v0TtFsmYsVGQ7Mm4LI+YlCdBaBAu/0OCuhr+LSETzzlUOHGyhPFnQIbJzB6ye77y7q7/Qph2PZ+6hvWFAxa3YAbe4KMyHZB3iEzr/J3jlLgZmC3JwV64y7X/8B1ojDDhecM= 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 1754178995065371.0267819349564; Sat, 2 Aug 2025 16:56:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiLpn-0000vl-0D; Sat, 02 Aug 2025 19:40:15 -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 1uiLmw-0003ej-Ik for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:37:18 -0400 Received: from mail-oo1-xc30.google.com ([2607:f8b0:4864:20::c30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiLmu-0005qI-Pd for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:37:18 -0400 Received: by mail-oo1-xc30.google.com with SMTP id 006d021491bc7-61998205433so136681eaf.1 for ; Sat, 02 Aug 2025 16:37:16 -0700 (PDT) Received: from stoup.. ([172.58.111.133]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-741a71dc78asm380409a34.30.2025.08.02.16.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 16:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754177835; x=1754782635; 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=hPINWJ4nV+k9v7TwnsVQ/3E97hW4E8lZ7vTBhJUQGXg=; b=fsZFQ9bIaigcSSUZeH6XfDA9+d8REqpMU5wTIDg4y9XXmWGlnHtGqnqoa+NaibUmcY BQljaH2QWWCnv6NjtVx6Dpo5lXDbgSFcx3X/z/gBgJQSHxlMqh10r0JvglX20KpGDkPa MpCXhaFCwO9VJpagHP+4TnkDPoaUNvdzt+tksDHKctVsWWdgz68Nc3i2CjWCftCew5qv MmqFPuTpP2vv1EdODxpcBunAPBoEzvYJqk1vUa7ngQdhdcsfexjyf67G79U8pDWN8hW3 Yv9jwx/WXLrdU9IEjp6et6RB54yp+qr3kOW3yvSaiRPxY5xq53TREcIxRtNQMsHlgx42 EQBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754177835; x=1754782635; 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=hPINWJ4nV+k9v7TwnsVQ/3E97hW4E8lZ7vTBhJUQGXg=; b=C6r+NnSI/QwUeaKGPIPZNeCI9dbE1v3bepHOCPix1XPVTimfIoeOu4LcBYmY7gBWCo 8KEOspOrSwUmmSg1/AoJXqcn45qix1bp0nIV4518Kp7eP5eDPs87pIHfC5CG8yCRhyi3 pVOv7pbDAHp9cZy5qYtb36mwhbahfALLSbjMwhuP96mEi2thGjD6fwKDWiuxBAMOaasY 7FK6ua//ltXFu54G+az5JNSayW/UfGXdH56jYZEpQkbcCtKbgv2qJlbk/ukEDxcdw9Gx McC8v8X97QXRxYzd21LVeqj3LQ/qJFSmranayJtNEr/HV/Akl5q4sNAK5r/uN+8bM4XM opWQ== X-Gm-Message-State: AOJu0YxzmP4o3SqUKvrTm+2jmUdLce11pYgMwNCsl+NmH9zDdcgosOEH 362tcjdnEBpEYXY0Vt8wF2hGYrv/BG+2nLy/rYphyA8g1+bPRu/go2aCUaahHLO8S50+yMk8KXY a23xXn5o= X-Gm-Gg: ASbGncvGPPUavxE/nF1xEepJI7eMbxk/ID566BBH7bntrI/SglWq3RNLUjoxmszlb+R jf2z/I4oez6DJM+POl95yu3Pc8OPqtJ97N/badqnO1zhVnaF1SqwnW6+8nuGp8zcZXfjlp7eP+j rDYA4krSNbbHiE8Mm5zadZ5KlDecAzAJkMjldEBRD7kC0ZxoutWypIscwt/vdGyke1XifcGw9xa UYUxYrwzS9/yQ8LUHC07byjnNZfe4H8RvYobI1xIbB3mpcLhSF9gc27iebVX1rq+NNSXUPj32Nd 6XjOrtuRzErZ0RNkAu+hYtcAEJV4eN0m8JKjhMnv/7YrP6kdOsaK2zCe3w1aSgSYzk2xn6TAt+V h1gzCJAIR/P9EzGlMVEFPwMMJfBf1cYRNX6QDIksKATKZN4gZeWIF X-Google-Smtp-Source: AGHT+IFKBO01QSsPJmGFPI6hp9qf4npZLHfLYe4dXDFxd5CVvvKIooEMSseNUlwPPfwkk9z9pzwLvw== X-Received: by 2002:a05:6870:b027:b0:307:b2c9:9f99 with SMTP id 586e51a60fabf-30b679b882fmr2247296fac.39.1754177835233; Sat, 02 Aug 2025 16:37:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v2 53/85] target/arm: Split {arm,core}_user_mem_index Date: Sun, 3 Aug 2025 09:29:21 +1000 Message-ID: <20250802232953.413294-54-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=2607:f8b0:4864:20::c30; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc30.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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754178997665124100 Content-Type: text/plain; charset="utf-8" Separate current to unpriv and arm to core mmu conversions into two separate functions. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/tcg/translate-a64.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 34d22cac8a..eaeafdf138 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -93,7 +93,7 @@ void a64_translate_init(void) } =20 /* - * Return the core mmu_idx to use for A64 load/store insns which + * Return the full arm mmu_idx to use for A64 load/store insns which * have a "unprivileged load/store" variant. Those insns access * EL0 if executed from an EL which has control over EL0 (usually * EL1) but behave like normal loads and stores if executed from @@ -103,7 +103,7 @@ void a64_translate_init(void) * normal encoding (in which case we will return the same * thing as get_mem_index(). */ -static int get_a64_user_mem_index(DisasContext *s, bool unpriv) +static ARMMMUIdx arm_user_mem_index(DisasContext *s, bool unpriv) { /* * If AccType_UNPRIV is not used, the insn uses AccType_NORMAL, @@ -130,7 +130,13 @@ static int get_a64_user_mem_index(DisasContext *s, boo= l unpriv) g_assert_not_reached(); } } - return arm_to_core_mmu_idx(useridx); + return useridx; +} + +/* Return the core mmu_idx per above. */ +static int core_user_mem_index(DisasContext *s, bool unpriv) +{ + return arm_to_core_mmu_idx(arm_user_mem_index(s, unpriv)); } =20 static void set_btype_raw(int val) @@ -3539,7 +3545,7 @@ static void op_addr_ldst_imm_pre(DisasContext *s, arg= _ldst_imm *a, if (!a->p) { tcg_gen_addi_i64(*dirty_addr, *dirty_addr, offset); } - memidx =3D get_a64_user_mem_index(s, a->unpriv); + memidx =3D core_user_mem_index(s, a->unpriv); *clean_addr =3D gen_mte_check1_mmuidx(s, *dirty_addr, is_store, a->w || a->rn !=3D 31, mop, a->unpriv, memidx); @@ -3560,7 +3566,7 @@ static bool trans_STR_i(DisasContext *s, arg_ldst_imm= *a) { bool iss_sf, iss_valid =3D !a->w; TCGv_i64 clean_addr, dirty_addr, tcg_rt; - int memidx =3D get_a64_user_mem_index(s, a->unpriv); + int memidx =3D core_user_mem_index(s, a->unpriv); MemOp mop =3D finalize_memop(s, a->sz + a->sign * MO_SIGN); =20 op_addr_ldst_imm_pre(s, a, &clean_addr, &dirty_addr, a->imm, true, mop= ); @@ -3578,7 +3584,7 @@ static bool trans_LDR_i(DisasContext *s, arg_ldst_imm= *a) { bool iss_sf, iss_valid =3D !a->w; TCGv_i64 clean_addr, dirty_addr, tcg_rt; - int memidx =3D get_a64_user_mem_index(s, a->unpriv); + int memidx =3D core_user_mem_index(s, a->unpriv); MemOp mop =3D finalize_memop(s, a->sz + a->sign * MO_SIGN); =20 op_addr_ldst_imm_pre(s, a, &clean_addr, &dirty_addr, a->imm, false, mo= p); @@ -4427,7 +4433,7 @@ static bool do_SET(DisasContext *s, arg_set *a, bool = is_epilogue, return false; } =20 - memidx =3D get_a64_user_mem_index(s, a->unpriv); + memidx =3D core_user_mem_index(s, a->unpriv); =20 /* * We pass option_a =3D=3D true, matching our implementation; @@ -4481,8 +4487,8 @@ static bool do_CPY(DisasContext *s, arg_cpy *a, bool = is_epilogue, CpyFn fn) return false; } =20 - rmemidx =3D get_a64_user_mem_index(s, runpriv); - wmemidx =3D get_a64_user_mem_index(s, wunpriv); + rmemidx =3D core_user_mem_index(s, runpriv); + wmemidx =3D core_user_mem_index(s, wunpriv); =20 /* * We pass option_a =3D=3D true, matching our implementation; --=20 2.43.0