[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v16 38/99] target/arm: move arm_sctlr away from tcg helpers
From: |
Alex Bennée |
Subject: |
[PATCH v16 38/99] target/arm: move arm_sctlr away from tcg helpers |
Date: |
Fri, 4 Jun 2021 16:52:11 +0100 |
From: Claudio Fontana <cfontana@suse.de>
this function is used for kvm too, add it to the
cpu-common module.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
target/arm/cpu-common.c | 11 +++++++++++
target/arm/tcg/helper.c | 11 -----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/target/arm/cpu-common.c b/target/arm/cpu-common.c
index a34f7f19d8..93aea216cc 100644
--- a/target/arm/cpu-common.c
+++ b/target/arm/cpu-common.c
@@ -342,3 +342,14 @@ uint32_t sve_zcr_len_for_el(CPUARMState *env, int el)
}
/* #endif TARGET_AARCH64 , see matching comment above */
+
+uint64_t arm_sctlr(CPUARMState *env, int el)
+{
+ /* Only EL0 needs to be adjusted for EL1&0 or EL2&0. */
+ if (el == 0) {
+ ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, 0);
+ el = (mmu_idx == ARMMMUIdx_E20_0 || mmu_idx == ARMMMUIdx_SE20_0)
+ ? 2 : 1;
+ }
+ return env->cp15.sctlr_el[el];
+}
diff --git a/target/arm/tcg/helper.c b/target/arm/tcg/helper.c
index 93fa3fa2a9..b9ea043f20 100644
--- a/target/arm/tcg/helper.c
+++ b/target/arm/tcg/helper.c
@@ -1675,17 +1675,6 @@ void arm_cpu_do_interrupt(CPUState *cs)
}
#endif /* !CONFIG_USER_ONLY */
-uint64_t arm_sctlr(CPUARMState *env, int el)
-{
- /* Only EL0 needs to be adjusted for EL1&0 or EL2&0. */
- if (el == 0) {
- ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, 0);
- el = (mmu_idx == ARMMMUIdx_E20_0 || mmu_idx == ARMMMUIdx_SE20_0)
- ? 2 : 1;
- }
- return env->cp15.sctlr_el[el];
-}
-
/* Returns true if the stage 1 translation regime is using LPAE format page
* tables. Used when raising alignment exceptions, whose FSR changes depending
* on whether the long or short descriptor format is in use. */
--
2.20.1
- [PATCH v16 40/99] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, (continued)
- [PATCH v16 40/99] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, Alex Bennée, 2021/06/04
- [PATCH v16 30/99] target/arm: only perform TCG cpu and machine inits if TCG enabled, Alex Bennée, 2021/06/04
- [PATCH v16 56/99] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled(), Alex Bennée, 2021/06/04
- [PATCH v16 47/99] target/arm: move fp_exception_el out of TCG helpers, Alex Bennée, 2021/06/04
- [PATCH v16 89/99] target/arm: cpu64: some final cleanup on aarch64_cpu_finalize_features, Alex Bennée, 2021/06/04
- [PATCH v16 73/99] target/arm: cpu-sve: split TCG and KVM functionality, Alex Bennée, 2021/06/04
- [PATCH v16 38/99] target/arm: move arm_sctlr away from tcg helpers,
Alex Bennée <=
- [PATCH v16 57/99] target/arm: remove kvm include file for PSCI and arm-powerctl, Alex Bennée, 2021/06/04
- [PATCH v16 27/99] target/arm: fix style in preparation of new cpregs module, Alex Bennée, 2021/06/04
- [PATCH v16 48/99] target/arm: remove now useless ifndef from fp_exception_el, Alex Bennée, 2021/06/04
- [PATCH v16 90/99] XXX target/arm: experiment refactoring cpu "max", Alex Bennée, 2021/06/04
- [PATCH v16 49/99] target/arm: make further preparation for the exception code to move, Alex Bennée, 2021/06/04
- [PATCH v16 98/99] configure: allow the overriding of default-config in the build, Alex Bennée, 2021/06/04