From nobody Sun Dec 14 06:30:02 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=1753604184; cv=none; d=zohomail.com; s=zohoarc; b=fUAsv59km52lxNZ8nWrgEcobdTOsgfOT7VLuiiLEl5fmC8OfycKdlrVX7HcrjVQr3U+DLCP5LJaGxPpVA/qbQ4oWD1h3CBm68I+rHFvjLXB9DZkwm0iUYUk9E4ModdBU1d7JfcfohAJjTee4ncYgcWODWblr/nGECOBV4+DfGyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753604184; 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=M7NeX1QToJsoLekcDUKBPtv0jG80+JImaIT9zuG4ofk=; b=cODsuxXhaKGmEL2C1PD6ClO5qFqxE9N4FKPNwEAbSiB8lKbIa309Fqq199qv0IoVV7pO7AGeh+FB991GeLaezPex04XZkI1JFtloQWt+eb1/a0IYnbj6lvyTgwsBxp+4wnWqZf3+KpQM9vkZIBV9bxoOAQ5W5copI4g65yF/r4Y= 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 1753604184049462.78341824790937; Sun, 27 Jul 2025 01:16:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufwP9-00082d-A3; Sun, 27 Jul 2025 04:06:47 -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 1ufwM5-0006O2-FY for qemu-devel@nongnu.org; Sun, 27 Jul 2025 04:03:40 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufwM2-0004B9-Em for qemu-devel@nongnu.org; Sun, 27 Jul 2025 04:03:37 -0400 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-b3bdab4bf19so2937929a12.2 for ; Sun, 27 Jul 2025 01:03:33 -0700 (PDT) Received: from localhost.localdomain (syn-098-150-199-049.res.spectrum.com. [98.150.199.49]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23fbe333efesm30016415ad.65.2025.07.27.01.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jul 2025 01:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753603413; x=1754208213; 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=M7NeX1QToJsoLekcDUKBPtv0jG80+JImaIT9zuG4ofk=; b=cyTC33CK2X+jBNLIFXmXeMZqyu6T6q44t+mb22sbzkuHiL9x/e1xszSMFvDaI8Cx/1 kaq3exvSwHpkZr2PHsYwi1HNQNKKWxRKGt5TCYDCZcqI+5+3vMLo2ua2MxQGscGNnArr JnodSJdIYwpEdYutZ2jjhmReoQnRK10DOqxI50AOJZ5aAvtmo/kycW8Z1MQgBqnqu206 rH7yyPKki59exbhJFDpV/NW7kLi0AvW7nca2ZSVJ1/OUsxtMW1pTlcR72G+UBHJhUV0R faMQB4eIAFrcEueDxSMhHhRkUTw42EadPGH+4kFc/p/1nTw2NET5rySglWAQwFxrOubd +XUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753603413; x=1754208213; 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=M7NeX1QToJsoLekcDUKBPtv0jG80+JImaIT9zuG4ofk=; b=LSk+sTPxL9Ku/qVH9pUNc5hHAwEbwxpCkqkdYZwuEr2LmnGeN5s6rZJzKO3Ro8YmUb MlQraCzytcimgxK9uF+MlBuUaD78q8EhM959RKC52pd4q9Oabl65LtikA2TBCrdXxzLW Dw5XKtybypdznJNZkZYyDwYghQOfuRys+nGj+BUguSnniIV3k4KVfdxZ8OaJyd7s8Prr 3DyUzu0lrkiSTwBz5xmO/eS0TANFfqvEkVsGvPkNZlsPyX9RezjseIkWnYB9p0EoPPV8 p81dbguxAxaf8kP9j3alBiQdLZaZWsVeRZVbacPs4691mrTRc+VMIuOUBwhG2mmRY3YV bejQ== X-Gm-Message-State: AOJu0YzTy+fuEm7vEP1isoTfMH8+cebx8h0X//Xfop66A5CUOCIgUSJi I+fKywuUjifJ/SK0VKWvg4PAniuImImY+30Toom3ygwczN7aFaNXeJV6MfM6UP8hgV6EbPF/mL6 NAfe/ X-Gm-Gg: ASbGnctd0mJe72bze/BmfPO0pUPvjx+N8CpDgWw1l9fxaqIwU30DARIiWIw7sacvJ6y B64dk09gLaSGqllxiDaJEbRSNpwMsk2zldyffjhpMpQLmEWGfxvv98iaX9OzYOiIPvtoXNUOwVy 0AkR7TunbbZLVQTwU6C321pzaA/VACQcRp50rCH6l48NxJtEub9Evj3P1rcvCh7q6xZMIZYw2kc SOAJlsMkwrZKljthwmQ2KsSeUQu6T3y64T0bj2f5HOD5pAdZ+f7FNBRyAuFabScMu0fp0/0MQPG HfWVQqcb/D//MLfspR/7Ok+Ce6vxBuTeKt0iPcBZsdHOw/OBHPzP0/LVTdj4ZBJW/J7bFOjwZf9 TO1WzVOTGikXBRyiedjNpHvObw5y7Xl4LTcpefO9EzqKcKrlybFoX0Ubolrdpdhl/3/XBLKgKdl advRMisQA0d+ndFeXtFUsZ X-Google-Smtp-Source: AGHT+IGlcKzfKAiQrqsWsTl2NS9J+91egh6o7Js+rMydJxytkz5g6cSoBduFp+udUm6onUOgvZdgZQ== X-Received: by 2002:a17:903:22cf:b0:23f:f707:f97e with SMTP id d9443c01a7336-23ff707feaemr36925425ad.17.1753603412820; Sun, 27 Jul 2025 01:03:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 30/82] target/arm: Convert arm_mmu_idx_to_el from switch to table Date: Sat, 26 Jul 2025 22:02:02 -1000 Message-ID: <20250727080254.83840-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250727080254.83840-1-richard.henderson@linaro.org> References: <20250727080254.83840-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::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.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: 1753604185695116600 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- target/arm/internals.h | 3 +-- target/arm/mmuidx-internal.h | 27 ++++++++++++++++++++++++ target/arm/helper.c | 27 ------------------------ target/arm/mmuidx.c | 41 ++++++++++++++++++++++++++++++++++++ target/arm/meson.build | 7 +++++- 5 files changed, 75 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 b6499683cc..2dc82330ec 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 @@ -986,8 +987,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 0000000000..35d41495cd --- /dev/null +++ b/target/arm/mmuidx-internal.h @@ -0,0 +1,27 @@ +/* + * 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]; + +/* Return the exception level associated with this mmu index. */ +static inline int arm_mmu_idx_to_el(ARMMMUIdx idx) +{ + tcg_debug_assert((unsigned)idx < ARRAY_SIZE(arm_mmuidx_table)); + 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 154bda3cd4..a97838a04e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9895,33 +9895,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 0000000000..309b1d68df --- /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 07d9271aa4..91630a1f72 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