[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v16 92/99] target/arm: remove v7m stub function for !CONFIG_TCG
From: |
Alex Bennée |
Subject: |
[PATCH v16 92/99] target/arm: remove v7m stub function for !CONFIG_TCG |
Date: |
Fri, 4 Jun 2021 16:53:05 +0100 |
From: Claudio Fontana <cfontana@suse.de>
it is needed just once, so just move the CONFIG_TCG check in place.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
target/arm/cpu-mmu.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/target/arm/cpu-mmu.c b/target/arm/cpu-mmu.c
index c6ac90a61e..e1bebbf73e 100644
--- a/target/arm/cpu-mmu.c
+++ b/target/arm/cpu-mmu.c
@@ -19,6 +19,7 @@
*/
#include "qemu/osdep.h"
+#include "sysemu/tcg.h"
#include "cpu-mmu.h"
int aa64_va_parameter_tbi(uint64_t tcr, ARMMMUIdx mmu_idx)
@@ -155,20 +156,15 @@ 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;
- if (arm_feature(env, ARM_FEATURE_M)) {
- return arm_v7m_mmu_idx_for_secstate(env, env->v7m.secure);
+ if (tcg_enabled()) {
+ if (arm_feature(env, ARM_FEATURE_M)) {
+ return arm_v7m_mmu_idx_for_secstate(env, env->v7m.secure);
+ }
}
/* See ARM pseudo-function ELIsInHost. */
--
2.20.1
- [PATCH v16 69/99] target/arm: add tcg cpu accel class, (continued)
- [PATCH v16 69/99] target/arm: add tcg cpu accel class, Alex Bennée, 2021/06/04
- [PATCH v16 25/99] target/arm: tcg: fix comment style before move to cpu-mmu, Alex Bennée, 2021/06/04
- [PATCH v16 24/99] target/arm: split off cpu-sysemu.c, Alex Bennée, 2021/06/04
- [PATCH v16 59/99] MAINTAINERS: update arm kvm maintained files to all in target/arm/kvm/, Alex Bennée, 2021/06/04
- [PATCH v16 76/99] target/arm: restrict rebuild_hflags_a64 to TARGET_AARCH64, Alex Bennée, 2021/06/04
- [PATCH v16 83/99] cpu-sve: rename sve_zcr_len_for_el to cpu_sve_get_zcr_len_for_el, Alex Bennée, 2021/06/04
- [PATCH v16 92/99] target/arm: remove v7m stub function for !CONFIG_TCG,
Alex Bennée <=
- [PATCH v16 16/99] target/arm: move helpers to tcg/, Alex Bennée, 2021/06/04
- [PATCH v16 41/99] target/arm: new cpu32 ARM 32 bit CPU Class, Alex Bennée, 2021/06/04
- [PATCH v16 33/99] target/arm: add temporary stub for arm_rebuild_hflags, Alex Bennée, 2021/06/04
- [PATCH v16 82/99] target/arm: move sve_zcr_len_for_el to TARGET_AARCH64-only cpu-sve, Alex Bennée, 2021/06/04
- [PATCH v16 51/99] target/arm: move exception code out of tcg/helper.c, Alex Bennée, 2021/06/04