On 3/26/21 1:37 PM, Claudio Fontana wrote: > +#ifdef CONFIG_TCG > if (arm_feature(env, ARM_FEATURE_M)) { > return arm_v7m_mmu_idx_for_secstate(env, env->v7m.secure); > } > +#endif /* CONFIG_TCG */ Better done with tcg_enabled. r~
diff --git a/target/arm/cpu-mmu.c b/target/arm/cpu-mmu.c index c6ac90a61e..9969bc9d30 100644 --- a/target/arm/cpu-mmu.c +++ b/target/arm/cpu-mmu.c @@ -155,21 +155,16 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) } } -#ifndef CONFIG_TCG -ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) -{ - g_assert_not_reached(); -} -#endif - ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el) { ARMMMUIdx idx; uint64_t hcr; +#ifdef CONFIG_TCG if (arm_feature(env, ARM_FEATURE_M)) { return arm_v7m_mmu_idx_for_secstate(env, env->v7m.secure); } +#endif /* CONFIG_TCG */ /* See ARM pseudo-function ELIsInHost. */ switch (el) {
it is needed just once, so just move the CONFIG_TCG check in place. Signed-off-by: Claudio Fontana <cfontana@suse.de> --- target/arm/cpu-mmu.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)