diff options
| author |   Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-02-06 23:34:53 +0100 |
|---|---|---|
| committer |   Peter Maydell <peter.maydell@linaro.org> | 2023-02-16 16:00:46 +0000 |
| commit | 1eb13a0947e9ef1b2ca2a3396eb661a3b22b45d1 (patch) | |
| tree | 8cfc59e5bfa0cf4fdba18dbc5115270ff0e8cd10 | |
| parent | hw/intc/armv7m_nvic: Use OBJECT_DECLARE_SIMPLE_TYPE() macro (diff) | |
| download | qemu-1eb13a0947e9ef1b2ca2a3396eb661a3b22b45d1.tar.xz qemu-1eb13a0947e9ef1b2ca2a3396eb661a3b22b45d1.zip | |
target/arm: Simplify arm_v7m_mmu_idx_for_secstate() for user emulation
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230206223502.25122-3-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/arm/m_helper.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c index e7e746ea18..76239c9abe 100644 --- a/target/arm/m_helper.c +++ b/target/arm/m_helper.c @@ -150,7 +150,12 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) return 0; } -#else +ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) +{ + return ARMMMUIdx_MUser; +} + +#else /* !CONFIG_USER_ONLY */ /* * What kind of stack write are we doing? This affects how exceptions @@ -2854,8 +2859,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 +2895,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 */ |