From nobody Fri Nov 14 20:45:21 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=1760101672; cv=none; d=zohomail.com; s=zohoarc; b=OrbpkgUDAI4WmWS+gwWazy5I62eCCfC/22ginw6hPejGC2j5FBr/1YZM968DnmSAsG0+E8npVPIRRVcbm2hBhqiEC2QH/pVPXfVICnFsLGA/deRDcdXyUA9FI5dwns+TT2+d2YgbzI0qMAfM6NSREfjAd3nIosm72PUbDsAlAtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760101672; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=nc3FUyvFcnG+H77pArAXwBs9t6gjKqIi2V7SbkZILMg=; b=hBoURxReZVUSEHhF+jFuOOefdZ5Ya0OaTnUfHdvdf5QkFvM6UMW1IsPVIflbk2sR8unCn5BSP2Q5VtA2b/WZscwLaZhgKa+CFLV9IhxoeNNfBhGHlSFoo04dnDGOGP7a7znk2DOZQ0FB7icXy5dXi0goD94wi2RHOCPpXl+ofqM= 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 1760101672188389.8193672575512; Fri, 10 Oct 2025 06:07:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7CpN-0006Ld-2b; Fri, 10 Oct 2025 09:06:33 -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 1v7CpB-0006BH-BT for qemu-devel@nongnu.org; Fri, 10 Oct 2025 09:06:21 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7Col-0003rF-JX for qemu-devel@nongnu.org; Fri, 10 Oct 2025 09:06:18 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-46e33b260b9so18872985e9.2 for ; Fri, 10 Oct 2025 06:05:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce583316sm4221657f8f.20.2025.10.10.06.05.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 06:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760101550; x=1760706350; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nc3FUyvFcnG+H77pArAXwBs9t6gjKqIi2V7SbkZILMg=; b=hplZQGRp0CjbIHUnWXug92SZx8VkreOu2tFEcw3nQQmcOnJYCbFYUz/k20kZMtBEyv 9PtibtOwco94xA5PgdzneUmAZNodGgAeP8g8Xwif6r62FQEgZ604AMIYq001ddsL/gM+ Jlk8n83oI0Y5SVcPQBXTfdVtYHmz0K423X2sNAlId6qDVl43cQD2KXXHtbRpTu5VfoGE Vwj3/2rE/pCYUYKz8fexji3Xgl81cemhT5m317hv/SCNO830STSEJeU9XLSYSnWgWk7P UQAwNPHKged0RUlWA4/nuGy2sGChOYLJ0OKY6kgmUWaDvn+zv+oxyjSMVx9Y56q78rFV byvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760101550; x=1760706350; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nc3FUyvFcnG+H77pArAXwBs9t6gjKqIi2V7SbkZILMg=; b=AN+KoduhA46enqgUEJrw7cRe+gZArk0cO+2U91FhMBfESyuO8vE1N9gxCjzTGAbu33 ZtOTxSMNPWnZayk/5rErKVF7zuNZllI2qXN3Xr520tc5ozipcyXlQHjAGIKHZQZ3AbUC m1MXBBNraOCT8TX1wTdJhzjLJAFv+nBOJTpX1me/eY5Jp/XNwMpKb8eZP8KyvsriFqZO DGfoIbKxpSa8RV3OHYy/XLZ3bJGWQB3VDjf7eTEvMGzfbFzWatVu+tkBwQCZTFx5Avzr oLiyilPg/uV0XiwBR3IYn17ssQ5fT+dRr/bGTNHjP+SLg9Mj8Tdu06iSuXXXp7GxfRn8 0DQQ== X-Gm-Message-State: AOJu0YxkoOQBaipIQr8enhiGmOv+JR0xLkS1V/P41Vrk0BrA1lj+fSNK +c2+3jfnkXRV8kDrNmEx/PTuvTyKF954zs0YSV07ABNgBVf9zjExYv8BF4h17KjfAtYr8AHCimD TGPLF X-Gm-Gg: ASbGnctJjtC+/S8FAU9OhchOLb+FNqsVOQchv7sOhByNtW0LHyP7kvXEaLvv20RuQre riQB/3//CVsx+NtKCR2Gu43qRI/8809uPKVIwHPBlrXBxHndLeIsF3EEk+pnF11SvWg9/g3NENp jqkcyI6a5vLsMKWGC4CsI0pSIBuk25Q6MLsdtgVtBwxfJmiw1WCPiXgEMkFVBt8MhDguxS/D+ym 4W8goFE/cIbc6eYCfom0se1sQMfLou6/DT+IMg7EIUE+T4iKCPI4/2G5iIzQyPfx/J3jM5ju8mO mxBeo+TALdyWNYIgzyEEPbSivVMW1hkaZ7BO84nIZQ2PSrV+ue6ov2Mw5DEqz2xIaKfQQxSb9hZ 06dDiaJOEu5dFqAgIGsAX0izHmvIB/B1AETapYDc/PtjKI4EhfjY= X-Google-Smtp-Source: AGHT+IFB4IrQqAQy7J7ur3F6SZGT8c0MWJC+5ch2tbPvqZvkGA471GY3F9mqzZtUV8uNMPO5FakYsw== X-Received: by 2002:a5d:5d13:0:b0:425:7313:b561 with SMTP id ffacd0b85a97d-4266e8e5115mr7199828f8f.63.1760101550232; Fri, 10 Oct 2025 06:05:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/76] target/arm: Convert arm_mmu_idx_to_el from switch to table Date: Fri, 10 Oct 2025 14:04:28 +0100 Message-ID: <20251010130527.3921602-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010130527.3921602-1-peter.maydell@linaro.org> References: <20251010130527.3921602-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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: 1760101674711154100 From: Richard Henderson In an effort to keep all ARMMMUIdx data in one place, begin construction of an info table describing all of the properties of the mmu_idx. Begin with the access EL. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson Message-id: 20251008215613.300150-18-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 3 +-- target/arm/mmuidx-internal.h | 29 +++++++++++++++++++++++++ target/arm/helper.c | 27 ------------------------ target/arm/mmuidx.c | 41 ++++++++++++++++++++++++++++++++++++ target/arm/meson.build | 7 +++++- 5 files changed, 77 insertions(+), 30 deletions(-) create mode 100644 target/arm/mmuidx-internal.h create mode 100644 target/arm/mmuidx.c diff --git a/target/arm/internals.h b/target/arm/internals.h index 69eb1df6173..1a234d41c2d 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -34,6 +34,7 @@ #include "system/memory.h" #include "syndrome.h" #include "cpu-features.h" +#include "mmuidx-internal.h" =20 /* register banks for CPU modes */ #define BANK_USRSYS 0 @@ -984,8 +985,6 @@ static inline ARMMMUIdx core_to_aa64_mmu_idx(int mmu_id= x) return mmu_idx | ARM_MMU_IDX_A; } =20 -int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx); - /* Return the MMU index for a v7M CPU in the specified security state */ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate); =20 diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h new file mode 100644 index 00000000000..29bba4ecb54 --- /dev/null +++ b/target/arm/mmuidx-internal.h @@ -0,0 +1,29 @@ +/* + * QEMU Arm software mmu index internal definitions + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef TARGET_ARM_MMUIDX_INTERNAL_H +#define TARGET_ARM_MMUIDX_INTERNAL_H + +#include "mmuidx.h" +#include "tcg/debug-assert.h" +#include "hw/registerfields.h" + + +FIELD(MMUIDXINFO, EL, 0, 2) +FIELD(MMUIDXINFO, ELVALID, 2, 1) + +extern const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8]; + +#define arm_mmuidx_is_valid(x) ((unsigned)(x) < ARRAY_SIZE(arm_mmuidx_tab= le)) + +/* Return the exception level associated with this mmu index. */ +static inline int arm_mmu_idx_to_el(ARMMMUIdx idx) +{ + tcg_debug_assert(arm_mmuidx_is_valid(idx)); + tcg_debug_assert(FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, ELVALID= )); + return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, EL); +} + +#endif /* TARGET_ARM_MMUIDX_INTERNAL_H */ diff --git a/target/arm/helper.c b/target/arm/helper.c index bd5321348ac..b1d68da1333 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9653,33 +9653,6 @@ int fp_exception_el(CPUARMState *env, int cur_el) return 0; } =20 -/* Return the exception level we're running at if this is our mmu_idx */ -int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) -{ - if (mmu_idx & ARM_MMU_IDX_M) { - return mmu_idx & ARM_MMU_IDX_M_PRIV; - } - - switch (mmu_idx) { - case ARMMMUIdx_E10_0: - case ARMMMUIdx_E20_0: - case ARMMMUIdx_E30_0: - return 0; - case ARMMMUIdx_E10_1: - case ARMMMUIdx_E10_1_PAN: - return 1; - case ARMMMUIdx_E2: - case ARMMMUIdx_E20_2: - case ARMMMUIdx_E20_2_PAN: - return 2; - case ARMMMUIdx_E3: - case ARMMMUIdx_E30_3_PAN: - return 3; - default: - g_assert_not_reached(); - } -} - #ifndef CONFIG_TCG ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) { diff --git a/target/arm/mmuidx.c b/target/arm/mmuidx.c new file mode 100644 index 00000000000..309b1d68df5 --- /dev/null +++ b/target/arm/mmuidx.c @@ -0,0 +1,41 @@ +/* + * QEMU Arm software mmu index definitions + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "mmuidx-internal.h" + + +#define EL(X) ((X << R_MMUIDXINFO_EL_SHIFT) | R_MMUIDXINFO_ELVALID_MASK) + +const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8] =3D { + /* + * A-profile. + */ + [ARMMMUIdx_E10_0] =3D EL(0), + [ARMMMUIdx_E10_1] =3D EL(1), + [ARMMMUIdx_E10_1_PAN] =3D EL(1), + + [ARMMMUIdx_E20_0] =3D EL(0), + [ARMMMUIdx_E20_2] =3D EL(2), + [ARMMMUIdx_E20_2_PAN] =3D EL(2), + + [ARMMMUIdx_E2] =3D EL(2), + + [ARMMMUIdx_E3] =3D EL(3), + [ARMMMUIdx_E30_0] =3D EL(0), + [ARMMMUIdx_E30_3_PAN] =3D EL(3), + + /* + * M-profile. + */ + [ARMMMUIdx_MUser] =3D EL(0), + [ARMMMUIdx_MPriv] =3D EL(1), + [ARMMMUIdx_MUserNegPri] =3D EL(0), + [ARMMMUIdx_MPrivNegPri] =3D EL(1), + [ARMMMUIdx_MSUser] =3D EL(0), + [ARMMMUIdx_MSPriv] =3D EL(1), + [ARMMMUIdx_MSUserNegPri] =3D EL(0), + [ARMMMUIdx_MSPrivNegPri] =3D EL(1), +}; diff --git a/target/arm/meson.build b/target/arm/meson.build index 638ee62525f..f9f0beef05e 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -6,7 +6,12 @@ arm_ss.add(files( =20 arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', - 'gdbstub64.c')) + 'gdbstub64.c' +)) + +arm_common_ss.add(files( + 'mmuidx.c', +)) =20 arm_system_ss =3D ss.source_set() arm_common_system_ss =3D ss.source_set() --=20 2.43.0