[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/9] target/arm: Restrict v7-M MMU helpers to sysemu TCG
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 1/9] target/arm: Restrict v7-M MMU helpers to sysemu TCG |
Date: |
Mon, 6 Feb 2023 13:17:06 +0100 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/arm/helper.c | 2 +-
target/arm/m_helper.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index c62ed05c12..5dbeade787 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -11774,7 +11774,7 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx)
}
}
-#ifndef CONFIG_TCG
+#if !defined(CONFIG_TCG) || defined(CONFIG_USER_ONLY)
ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate)
{
g_assert_not_reached();
diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c
index e7e746ea18..1e7e4e33bd 100644
--- a/target/arm/m_helper.c
+++ b/target/arm/m_helper.c
@@ -2854,8 +2854,6 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr,
uint32_t op)
return tt_resp;
}
-#endif /* !CONFIG_USER_ONLY */
-
ARMMMUIdx arm_v7m_mmu_idx_all(CPUARMState *env,
bool secstate, bool priv, bool negpri)
{
@@ -2892,3 +2890,5 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env,
bool secstate)
return arm_v7m_mmu_idx_for_secstate_and_priv(env, secstate, priv);
}
+
+#endif /* !CONFIG_USER_ONLY */
--
2.38.1
- [PATCH 0/9] target/arm: Housekeeping around NVIC, Philippe Mathieu-Daudé, 2023/02/06
- [PATCH 1/9] target/arm: Restrict v7-M MMU helpers to sysemu TCG,
Philippe Mathieu-Daudé <=
- [PATCH 2/9] target/arm: Constify ID_PFR1 on user emulation, Philippe Mathieu-Daudé, 2023/02/06
- [PATCH 4/9] target/arm: Restrict CPUARMState::arm_boot_info to sysemu, Philippe Mathieu-Daudé, 2023/02/06
- [PATCH 5/9] target/arm: Restrict CPUARMState::gicv3state to sysemu, Philippe Mathieu-Daudé, 2023/02/06
- [PATCH 3/9] target/arm: Avoid resetting CPUARMState::eabi field, Philippe Mathieu-Daudé, 2023/02/06
- [PATCH 6/9] target/arm: Restrict CPUARMState::nvic to sysemu and store as NVICState*, Philippe Mathieu-Daudé, 2023/02/06