From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6BA70CCA471 for ; Fri, 3 Oct 2025 17:12:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v4jHR-0001p9-Ru; Fri, 03 Oct 2025 13:09:17 -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 1v4jHQ-0001oX-Fd for qemu-devel@nongnu.org; Fri, 03 Oct 2025 13:09:16 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v4jGW-0006Gw-Ph for qemu-devel@nongnu.org; Fri, 03 Oct 2025 13:09:16 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-b4ee87cc81eso2275992a12.1 for ; Fri, 03 Oct 2025 10:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759511297; x=1760116097; 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=Z3kQ1ndhoybCc4hWLaNf5yZfX4RnAVJHo8sJJiwM3a4=; b=Mo2TdFRWGOnMQEH1tkbuiT9+Ap1D3io3YCkBX+BFWFowjXA+ycrKxAZGpMQ+/KiXcY 70vAGFo1z86CokcK1noCDiCGPMgO/EYnjh+v/L3hPy6Jjvrgw12JpsDMc4dUSZgtGppp V+DYdw7iiMnm7sOgYR1xVDYR3eI47kU3BEW5mEGRfPppy5sM3vpFjGlnZo4ybPU3mCkD kUU+VKU/7CDlVa66KeK44RuUYmudZWaatRU2Ee1taTVg8GqkM0od1nEKbPo8oh3gHssl i7JQGX+5mB4jTjcFo96GvLdwzQdHN8/7mo+RypgorofY0MvYXWcBlFhz/YmPhgvDGjL0 rA3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759511297; x=1760116097; 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=Z3kQ1ndhoybCc4hWLaNf5yZfX4RnAVJHo8sJJiwM3a4=; b=fYqhoNPaGnK3uZbr7+JPGQP4Mnk//og4JizkLQT9xW48f/n/S3kJr5WBKlnZ0mATIY JVnVbr5kdIrqZs95OXB1XdvG8JLy/eSrTNuwz4Ga7K7iELdvB0ZWp3ux987ot8UMM3GZ 8sASxw5DP+Fo/sGu6aeS2wAm2JkYCmR8EQ8PAaJrvV9zPmugPmPYJZHUNHk2pj5mMqu7 us4e8QX1O6M56qPtIQ3sGf2dPYA5/mbfJPCm9OclK2SwoFBrJOYh/j1v3pjszmwOCpRo V5oX++bAfBXvy/XLUhdidbndlYKTBxbMqZOlws9kRMwYb6GxMG7gIln2Dz+PDYbtBXDg QwKg== X-Gm-Message-State: AOJu0YxMri0nXBMwCCh7axs5QudXcXKLIyeSSfsulieXLHbBD1pK9lSY mKO6ZgLUWftjN4hUVCKgqvn3McqzuAqypN3qQNnUcUU60S/2FmUtZMy8U7a3UesebKkZqzwiOaQ qRtcoYNs= X-Gm-Gg: ASbGncvXHsb1M31LYGNaOYZ1WUJJzGgQqLHu2zQEGG3ZXa30c9UHG20iML2KuZTe779 j/ctCYMLzzdSzXPqrRZi3P6+CIdDKgzzGn4HlxzEjlMortnE+H/QxYrLqjxXzbF8etnQxJg665p WSBEKnAk5E/PGOao0uT/hqU51fMK5OQtiBxzBZVpktYKjXTGnSCeqmowGPzVg0TKsh4YOQF9Phx 7WqDQPseJImN6iZiaRS/ZEZB0y6IsokVSS+KHOu5uQeTGkgS9rJN2oCsAR/qDxwNav7bOfD6NKI XFhiXY+y+EhImGYBntuOjiRcVq2o0HoaTu+twI0sSMjoI0sq2A8uucnyHSmn0Tl0LdeLUAkZy6u 5NIxrAZro2ypJi/VnoJcrJTXTpGnDehtBvD/OJYbcTrva8uvf+2x8PZmG X-Google-Smtp-Source: AGHT+IG7kOKbtPlHvHYgHYoW/Ipta3mhDS+8DCfeJQTkda2aa1x2NiQnPUwsq29V+ep8e/btvi9Dyw== X-Received: by 2002:a17:903:94b:b0:272:2bf1:6a21 with SMTP id d9443c01a7336-28e9a5e99b8mr47403865ad.14.1759511297310; Fri, 03 Oct 2025 10:08:17 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-28e8d110d86sm55327115ad.6.2025.10.03.10.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Oct 2025 10:08:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v6 17/73] target/arm: Convert arm_mmu_idx_to_el from switch to table Date: Fri, 3 Oct 2025 10:07:04 -0700 Message-ID: <20251003170800.997167-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251003170800.997167-1-richard.henderson@linaro.org> References: <20251003170800.997167-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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, T_SPF_TEMPERROR=0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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é Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- 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 69eb1df617..1a234d41c2 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" /* register banks for CPU modes */ #define BANK_USRSYS 0 @@ -984,8 +985,6 @@ static inline ARMMMUIdx core_to_aa64_mmu_idx(int mmu_idx) return mmu_idx | ARM_MMU_IDX_A; } -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); diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h new file mode 100644 index 0000000000..29bba4ecb5 --- /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_table)) + +/* 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 ed046c4421..d54b3e784d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9647,33 +9647,6 @@ int fp_exception_el(CPUARMState *env, int cur_el) return 0; } -/* 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] = { + /* + * A-profile. + */ + [ARMMMUIdx_E10_0] = EL(0), + [ARMMMUIdx_E10_1] = EL(1), + [ARMMMUIdx_E10_1_PAN] = EL(1), + + [ARMMMUIdx_E20_0] = EL(0), + [ARMMMUIdx_E20_2] = EL(2), + [ARMMMUIdx_E20_2_PAN] = EL(2), + + [ARMMMUIdx_E2] = EL(2), + + [ARMMMUIdx_E3] = EL(3), + [ARMMMUIdx_E30_0] = EL(0), + [ARMMMUIdx_E30_3_PAN] = EL(3), + + /* + * M-profile. + */ + [ARMMMUIdx_MUser] = EL(0), + [ARMMMUIdx_MPriv] = EL(1), + [ARMMMUIdx_MUserNegPri] = EL(0), + [ARMMMUIdx_MPrivNegPri] = EL(1), + [ARMMMUIdx_MSUser] = EL(0), + [ARMMMUIdx_MSPriv] = EL(1), + [ARMMMUIdx_MSUserNegPri] = EL(0), + [ARMMMUIdx_MSPrivNegPri] = EL(1), +}; diff --git a/target/arm/meson.build b/target/arm/meson.build index 638ee62525..f9f0beef05 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -6,7 +6,12 @@ arm_ss.add(files( arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', - 'gdbstub64.c')) + 'gdbstub64.c' +)) + +arm_common_ss.add(files( + 'mmuidx.c', +)) arm_system_ss = ss.source_set() arm_common_system_ss = ss.source_set() -- 2.43.0