[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v7 19/42] target/arm: move arm_sctlr away from tcg helpers
From: |
Claudio Fontana |
Subject: |
[RFC v7 19/42] target/arm: move arm_sctlr away from tcg helpers |
Date: |
Fri, 12 Mar 2021 18:22:20 +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 5c5c916279..5878a0515c 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 v7 18/42] target/arm: move sve_zcr_len_for_el to common_cpu, (continued)
- [RFC v7 18/42] target/arm: move sve_zcr_len_for_el to common_cpu, Claudio Fontana, 2021/03/12
- [RFC v7 20/42] target/arm: move arm_cpu_list to common_cpu, Claudio Fontana, 2021/03/12
- [RFC v7 23/42] target/arm: move sve_exception_el out of TCG helpers, Claudio Fontana, 2021/03/12
- [RFC v7 26/42] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled(), Claudio Fontana, 2021/03/12
- [RFC v7 22/42] target/arm: split a15 cpu model and 32bit class functions to cpu32.c, Claudio Fontana, 2021/03/12
- [RFC v7 27/42] target/arm: remove kvm include file for PSCI and arm-powerctl, Claudio Fontana, 2021/03/12
- [RFC v7 28/42] target/arm: move kvm-const.h, kvm.c, kvm64.c, kvm_arm.h to kvm/, Claudio Fontana, 2021/03/12
- [RFC v7 29/42] target/arm: cleanup cpu includes, Claudio Fontana, 2021/03/12
- [RFC v7 31/42] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM, Claudio Fontana, 2021/03/12
- [RFC v7 15/42] target/arm: add temporary stub for arm_rebuild_hflags, Claudio Fontana, 2021/03/12
- [RFC v7 19/42] target/arm: move arm_sctlr away from tcg helpers,
Claudio Fontana <=
- [RFC v7 25/42] target/arm: cpu: fix style, Claudio Fontana, 2021/03/12
- [RFC v7 24/42] target/arm: refactor exception and cpu code, Claudio Fontana, 2021/03/12
- [RFC v7 21/42] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, Claudio Fontana, 2021/03/12
- [RFC v7 30/42] target/arm: remove broad "else" statements when checking accels, Claudio Fontana, 2021/03/12
- [RFC v7 40/42] accel: add double dispatch mechanism for class initialization, Claudio Fontana, 2021/03/12
- [RFC v7 37/42] target/arm: create kvm cpu accel class, Claudio Fontana, 2021/03/12
- [RFC v7 41/42] target/arm: add tcg cpu accel class, Claudio Fontana, 2021/03/12
- [RFC v7 34/42] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/03/12
- [RFC v7 35/42] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/03/12