From nobody Sat Sep 6 20:01:03 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=1756572498; cv=none; d=zohomail.com; s=zohoarc; b=ZmFCJsdWLZIv13hGM56DxLn7L03RdkNLxdYIHo0iT3g+I1iGm3F69kD5hrnYRDSBPYIOwA0pazVU2DYNUDiQMHBb0yU5f2YPHAjllmEyZ1Bqt7crsJjeK0FhyO+6QKLf7+mRLGnAvozY+KXP4wkVkSBNWx0EQLqZYPOqoQe3oZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756572498; 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=tND04gHlxT/Saa6xkuaW3esBeW0MvUTgZUHRhTgh8oU=; b=SMmHvZgQZLm3UiCtdRVwtW3ejCMu63ti6cuADei2fIbe2Uowfl8NY3lzmdZUioLdXVnL7oSdViKRsVrwE9seeMDZ+Zawy8lQard5ueCsZE35jNhPOzDVX/1V8IDME6ju6hfKxwuw9NiN32DSr52Ecz0DI92q5bnXeTl/OjRqcCs= 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 1756572498740808.8734932968094; Sat, 30 Aug 2025 09:48:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNwS-0000kO-RT; Sat, 30 Aug 2025 11:56:36 -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 1usEMt-0006F0-Cv for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:43:15 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1usEMr-0004La-ET for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:43:15 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-327771edfbbso2832667a91.0 for ; Fri, 29 Aug 2025 22:43:12 -0700 (PDT) Received: from stoup.. (122-150-204-48.dyn.ip.vocus.au. [122.150.204.48]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b4d96829a66sm2435905a12.6.2025.08.29.22.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 22:43:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756532592; x=1757137392; 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=tND04gHlxT/Saa6xkuaW3esBeW0MvUTgZUHRhTgh8oU=; b=HFueGpRPHwx2EPCCfjphNbWiA3DqdnN+MEjUW5YLTKNVzRnoiFKpb8mcUVOx7kBFrR F3wKVVWfMXr3vI5VMvZVoH3Mv+7no8m4Mc6fN5DHyew9rJL/O/h3blugymokJaWq0icN 0sq8ZimF/3YW28oLfittT8dnhQWoedYPExUVSbCEHgmSfGgFkhABBzQjXo/0KLUmgkLO K5Ez723kRUDAPzmJO+/rBMT6w1jn9u3kTQuyEinbD/f2aA2fqXdR2V/8tyDricYzcw6n Wt9aj7edeA8YsR6wdEOChNuiUG81hF/QZfifIJKoivMnOxJ5OvCXsMR66tF/mmn37v/9 zZCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756532592; x=1757137392; 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=tND04gHlxT/Saa6xkuaW3esBeW0MvUTgZUHRhTgh8oU=; b=KIyf663DWswokXnPn5jTeMhviLP+nbLmbl9X2uTr6LsvUfQPuyPNUrABjFmscFrDq3 aha01Xzox4by7OaYZt1/HPeUEzXnqPBCNEpThMYj8JF+99DNYeuYsR6cIugQNXQjLEmX aQ6aS1hEci5OVZc/QsO8bQn4JEFIT9IZO0sVlX9UJiM5Fq7HXQ0Mq7slRP89oIPJIp+o sGxmmjfINjpD1xnY7U4+DNzFZayCwH4bj6j2x5VgEp+hkp+G8Xta37ze/Cy8+XNtLice sJkB6i2p7E45w3oAjxQOj6Km5bp9b1+04JcdmHyHXPM5/9P5yexOeWcbfPVSjVRPiJRO FHrA== X-Gm-Message-State: AOJu0YxwPPNW1qxLc8WYASj3aHGE1fEXplLcDepkHSX/9SVZQaJB6Hk+ CU5E6LdWthgGahf3Lk73J5FFbvdQuoFn3wHty32Dmt2C3ASzFtoShNaDxaXR92F0TjqrGn9ZvSF YU/wFqrE= X-Gm-Gg: ASbGncv1R/GzP8R9j7iO0kzXQm3fsUg+ofAi9IIt2y07N1blRnKhu/Hxm3vLprqxEZy cXpkhuqU+nbJrfcYnnd3k1tNQR1sNcNFxLRFRw4MyW8eHIx2N7PBHEF1jBGwZl0EUujBIMQ81nj A1v+qDUDkVu/5trolDYvkW2C5zmaazT6TFXFEEEIfHkIUbYefdkEGXqJ+XSIuHVkIEu0o/tUeGc PyMmzKShSb7EJTRQxV7C2VTjAP5nJyW3Rs2RvqZYuBaMK2t/5ANFjP92zqrTSQaB7Ds6aYLv5DH LkQk5t7Jw4YtTwWuhnXWF4QkCJvQtzqk7Bzatx+XL0V777pjE6Fj0xU77D9Uk1YbdG+qS2OCscP S9pKNCxlx8tZLj4TBG/4JMd4x551lvOgH1f0YqQRsL+vdkYVr5yarbkLed1/UVCXqTZkLnT0= X-Google-Smtp-Source: AGHT+IEmER0XiOIqOYx8NWXBqu0JvBnoNml+sLqpR1FnwB9udbkInmg1YR/0KYbiDqahpSpu/tWfnw== X-Received: by 2002:a17:90b:184d:b0:327:e2aa:9b34 with SMTP id 98e67ed59e1d1-32815437407mr1307836a91.13.1756532591822; Fri, 29 Aug 2025 22:43:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v4 35/84] target/arm: Convert regime_el from switch to table Date: Sat, 30 Aug 2025 15:40:39 +1000 Message-ID: <20250830054128.448363-36-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250830054128.448363-1-richard.henderson@linaro.org> References: <20250830054128.448363-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::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.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: 1756572499141116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/internals.h | 35 ---------------------------- target/arm/mmuidx-internal.h | 13 +++++++++++ target/arm/mmuidx.c | 44 +++++++++++++++++++++--------------- 3 files changed, 39 insertions(+), 53 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index c3bce6c09b..13fc5a2ca0 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1073,41 +1073,6 @@ static inline bool regime_is_stage2(ARMMMUIdx mmu_id= x) return mmu_idx =3D=3D ARMMMUIdx_Stage2 || mmu_idx =3D=3D ARMMMUIdx_Sta= ge2_S; } =20 -/* Return the exception level which controls this address translation regi= me */ -static inline uint32_t regime_el(ARMMMUIdx mmu_idx) -{ - switch (mmu_idx) { - case ARMMMUIdx_E20_0: - case ARMMMUIdx_E20_2: - case ARMMMUIdx_E20_2_PAN: - case ARMMMUIdx_Stage2: - case ARMMMUIdx_Stage2_S: - case ARMMMUIdx_E2: - return 2; - case ARMMMUIdx_E3: - case ARMMMUIdx_E30_0: - case ARMMMUIdx_E30_3_PAN: - return 3; - case ARMMMUIdx_E10_0: - case ARMMMUIdx_Stage1_E0: - case ARMMMUIdx_Stage1_E1: - case ARMMMUIdx_Stage1_E1_PAN: - case ARMMMUIdx_E10_1: - case ARMMMUIdx_E10_1_PAN: - case ARMMMUIdx_MPrivNegPri: - case ARMMMUIdx_MUserNegPri: - case ARMMMUIdx_MPriv: - case ARMMMUIdx_MUser: - case ARMMMUIdx_MSPrivNegPri: - case ARMMMUIdx_MSUserNegPri: - case ARMMMUIdx_MSPriv: - case ARMMMUIdx_MSUser: - return 1; - default: - g_assert_not_reached(); - } -} - static inline bool regime_is_user(CPUARMState *env, ARMMMUIdx mmu_idx) { switch (mmu_idx) { diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h index 29bba4ecb5..d8d64a14d6 100644 --- a/target/arm/mmuidx-internal.h +++ b/target/arm/mmuidx-internal.h @@ -13,6 +13,8 @@ =20 FIELD(MMUIDXINFO, EL, 0, 2) FIELD(MMUIDXINFO, ELVALID, 2, 1) +FIELD(MMUIDXINFO, REL, 3, 2) +FIELD(MMUIDXINFO, RELVALID, 5, 1) =20 extern const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8]; =20 @@ -26,4 +28,15 @@ static inline int arm_mmu_idx_to_el(ARMMMUIdx idx) return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, EL); } =20 +/* + * Return the exception level for the address translation regime + * associated with this mmu index. + */ +static inline uint32_t regime_el(ARMMMUIdx idx) +{ + tcg_debug_assert(arm_mmuidx_is_valid(idx)); + tcg_debug_assert(FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, RELVALI= D)); + return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, REL); +} + #endif /* TARGET_ARM_MMUIDX_INTERNAL_H */ diff --git a/target/arm/mmuidx.c b/target/arm/mmuidx.c index 309b1d68df..6dfefa56c2 100644 --- a/target/arm/mmuidx.c +++ b/target/arm/mmuidx.c @@ -8,34 +8,42 @@ =20 =20 #define EL(X) ((X << R_MMUIDXINFO_EL_SHIFT) | R_MMUIDXINFO_ELVALID_MASK) +#define REL(X) ((X << R_MMUIDXINFO_REL_SHIFT) | R_MMUIDXINFO_RELVALID_MASK) =20 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_E10_0] =3D EL(0) | REL(1), + [ARMMMUIdx_E10_1] =3D EL(1) | REL(1), + [ARMMMUIdx_E10_1_PAN] =3D EL(1) | REL(1), =20 - [ARMMMUIdx_E20_0] =3D EL(0), - [ARMMMUIdx_E20_2] =3D EL(2), - [ARMMMUIdx_E20_2_PAN] =3D EL(2), + [ARMMMUIdx_E20_0] =3D EL(0) | REL(2), + [ARMMMUIdx_E20_2] =3D EL(2) | REL(2), + [ARMMMUIdx_E20_2_PAN] =3D EL(2) | REL(2), =20 - [ARMMMUIdx_E2] =3D EL(2), + [ARMMMUIdx_E2] =3D EL(2) | REL(2), =20 - [ARMMMUIdx_E3] =3D EL(3), - [ARMMMUIdx_E30_0] =3D EL(0), - [ARMMMUIdx_E30_3_PAN] =3D EL(3), + [ARMMMUIdx_E3] =3D EL(3) | REL(3), + [ARMMMUIdx_E30_0] =3D EL(0) | REL(3), + [ARMMMUIdx_E30_3_PAN] =3D EL(3) | REL(3), + + [ARMMMUIdx_Stage2_S] =3D REL(2), + [ARMMMUIdx_Stage2] =3D REL(2), + + [ARMMMUIdx_Stage1_E0] =3D REL(1), + [ARMMMUIdx_Stage1_E1] =3D REL(1), + [ARMMMUIdx_Stage1_E1_PAN] =3D REL(1), =20 /* * 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), + [ARMMMUIdx_MUser] =3D EL(0) | REL(1), + [ARMMMUIdx_MPriv] =3D EL(1) | REL(1), + [ARMMMUIdx_MUserNegPri] =3D EL(0) | REL(1), + [ARMMMUIdx_MPrivNegPri] =3D EL(1) | REL(1), + [ARMMMUIdx_MSUser] =3D EL(0) | REL(1), + [ARMMMUIdx_MSPriv] =3D EL(1) | REL(1), + [ARMMMUIdx_MSUserNegPri] =3D EL(0) | REL(1), + [ARMMMUIdx_MSPrivNegPri] =3D EL(1) | REL(1), }; --=20 2.43.0