[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v11 23/55] target/arm: move arm_sctlr away from tcg helpers
From: |
Claudio Fontana |
Subject: |
[RFC v11 23/55] target/arm: move arm_sctlr away from tcg helpers |
Date: |
Tue, 23 Mar 2021 16:46:07 +0100 |
this function is used for kvm too, add it to the
cpu-common module.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
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 540793e4c0..dc7a5049a7 100644
--- a/target/arm/cpu-common.c
+++ b/target/arm/cpu-common.c
@@ -274,3 +274,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 ec0b812f96..a44b01a712 100644
--- a/target/arm/tcg/helper.c
+++ b/target/arm/tcg/helper.c
@@ -1743,17 +1743,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.26.2
- [RFC v11 18/55] target/arm: move cpsr_read, cpsr_write to cpu_common, (continued)
- [RFC v11 18/55] target/arm: move cpsr_read, cpsr_write to cpu_common, Claudio Fontana, 2021/03/23
- [RFC v11 13/55] target/arm: split cpregs from tcg/helper.c, Claudio Fontana, 2021/03/23
- [RFC v11 19/55] target/arm: add temporary stub for arm_rebuild_hflags, Claudio Fontana, 2021/03/23
- [RFC v11 20/55] target/arm: split vfp state setting from tcg helpers, Claudio Fontana, 2021/03/23
- [RFC v11 21/55] target/arm: move arm_mmu_idx* to cpu-mmu, Claudio Fontana, 2021/03/23
- [RFC v11 23/55] target/arm: move arm_sctlr away from tcg helpers,
Claudio Fontana <=
- [RFC v11 24/55] target/arm: move arm_cpu_list to common_cpu, Claudio Fontana, 2021/03/23
- [RFC v11 22/55] target/arm: move sve_zcr_len_for_el to common_cpu, Claudio Fontana, 2021/03/23
- [RFC v11 25/55] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, Claudio Fontana, 2021/03/23
- [RFC v11 26/55] target/arm: split a15 cpu model and 32bit class functions to cpu32.c, Claudio Fontana, 2021/03/23