[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v8 18/44] target/arm: move sve_zcr_len_for_el to common_cpu
From: |
Claudio Fontana |
Subject: |
[RFC v8 18/44] target/arm: move sve_zcr_len_for_el to common_cpu |
Date: |
Tue, 16 Mar 2021 19:36:36 +0100 |
it is required by arch-dump.c and cpu.c, so apparently
we need this for KVM too
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
target/arm/cpu-common.c | 43 +++++++++++++++++++++++++++++++++++++++++
target/arm/tcg/helper.c | 33 -------------------------------
2 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/target/arm/cpu-common.c b/target/arm/cpu-common.c
index 694e5d73f3..540793e4c0 100644
--- a/target/arm/cpu-common.c
+++ b/target/arm/cpu-common.c
@@ -231,3 +231,46 @@ void cpsr_write(CPUARMState *env, uint32_t val, uint32_t
mask,
mask &= ~CACHED_CPSR_BITS;
env->uncached_cpsr = (env->uncached_cpsr & ~mask) | (val & mask);
}
+
+/*
+ * these are AARCH64-only, but due to the chain of dependencies,
+ * between HELPER prototypes, hflags, cpreg definitions and functions in
+ * tcg/ etc, it becomes incredibly messy to add what should be here:
+ *
+ * #ifdef TARGET_AARCH64
+ */
+
+static uint32_t sve_zcr_get_valid_len(ARMCPU *cpu, uint32_t start_len)
+{
+ uint32_t end_len;
+
+ end_len = start_len &= 0xf;
+ if (!test_bit(start_len, cpu->sve_vq_map)) {
+ end_len = find_last_bit(cpu->sve_vq_map, start_len);
+ assert(end_len < start_len);
+ }
+ return end_len;
+}
+
+/*
+ * Given that SVE is enabled, return the vector length for EL.
+ */
+uint32_t sve_zcr_len_for_el(CPUARMState *env, int el)
+{
+ ARMCPU *cpu = env_archcpu(env);
+ uint32_t zcr_len = cpu->sve_max_vq - 1;
+
+ if (el <= 1) {
+ zcr_len = MIN(zcr_len, 0xf & (uint32_t)env->vfp.zcr_el[1]);
+ }
+ if (el <= 2 && arm_feature(env, ARM_FEATURE_EL2)) {
+ zcr_len = MIN(zcr_len, 0xf & (uint32_t)env->vfp.zcr_el[2]);
+ }
+ if (arm_feature(env, ARM_FEATURE_EL3)) {
+ zcr_len = MIN(zcr_len, 0xf & (uint32_t)env->vfp.zcr_el[3]);
+ }
+
+ return sve_zcr_get_valid_len(cpu, zcr_len);
+}
+
+/* #endif TARGET_AARCH64 , see matching comment above */
diff --git a/target/arm/tcg/helper.c b/target/arm/tcg/helper.c
index beaf252ca5..ec0b812f96 100644
--- a/target/arm/tcg/helper.c
+++ b/target/arm/tcg/helper.c
@@ -390,39 +390,6 @@ int sve_exception_el(CPUARMState *env, int el)
return 0;
}
-static uint32_t sve_zcr_get_valid_len(ARMCPU *cpu, uint32_t start_len)
-{
- uint32_t end_len;
-
- end_len = start_len &= 0xf;
- if (!test_bit(start_len, cpu->sve_vq_map)) {
- end_len = find_last_bit(cpu->sve_vq_map, start_len);
- assert(end_len < start_len);
- }
- return end_len;
-}
-
-/*
- * Given that SVE is enabled, return the vector length for EL.
- */
-uint32_t sve_zcr_len_for_el(CPUARMState *env, int el)
-{
- ARMCPU *cpu = env_archcpu(env);
- uint32_t zcr_len = cpu->sve_max_vq - 1;
-
- if (el <= 1) {
- zcr_len = MIN(zcr_len, 0xf & (uint32_t)env->vfp.zcr_el[1]);
- }
- if (el <= 2 && arm_feature(env, ARM_FEATURE_EL2)) {
- zcr_len = MIN(zcr_len, 0xf & (uint32_t)env->vfp.zcr_el[2]);
- }
- if (arm_feature(env, ARM_FEATURE_EL3)) {
- zcr_len = MIN(zcr_len, 0xf & (uint32_t)env->vfp.zcr_el[3]);
- }
-
- return sve_zcr_get_valid_len(cpu, zcr_len);
-}
-
void hw_watchpoint_update(ARMCPU *cpu, int n)
{
CPUARMState *env = &cpu->env;
--
2.26.2
- [RFC v8 11/44] target/arm: move cpu definitions to common cpu module, (continued)
- [RFC v8 11/44] target/arm: move cpu definitions to common cpu module, Claudio Fontana, 2021/03/16
- [RFC v8 17/44] target/arm: move arm_mmu_idx* to cpu-mmu, Claudio Fontana, 2021/03/16
- [RFC v8 14/44] target/arm: move cpsr_read, cpsr_write to cpu_common, Claudio Fontana, 2021/03/16
- [RFC v8 13/44] target/arm: kvm: add stubs for some helpers, Claudio Fontana, 2021/03/16
- [RFC v8 15/44] target/arm: add temporary stub for arm_rebuild_hflags, Claudio Fontana, 2021/03/16
- [RFC v8 19/44] target/arm: move arm_sctlr away from tcg helpers, Claudio Fontana, 2021/03/16
- [RFC v8 16/44] target/arm: split vfp state setting from tcg helpers, Claudio Fontana, 2021/03/16
- [RFC v8 24/44] target/arm: refactor exception and cpu code, Claudio Fontana, 2021/03/16
- [RFC v8 20/44] target/arm: move arm_cpu_list to common_cpu, Claudio Fontana, 2021/03/16
- [RFC v8 25/44] target/arm: cpu: fix style, Claudio Fontana, 2021/03/16
- [RFC v8 18/44] target/arm: move sve_zcr_len_for_el to common_cpu,
Claudio Fontana <=
- [RFC v8 09/44] target/arm: split cpregs from tcg/helper.c, Claudio Fontana, 2021/03/16
- [RFC v8 28/44] target/arm: move kvm-const.h, kvm.c, kvm64.c, kvm_arm.h to kvm/, Claudio Fontana, 2021/03/16
- [RFC v8 31/44] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM, Claudio Fontana, 2021/03/16
- [RFC v8 22/44] target/arm: split a15 cpu model and 32bit class functions to cpu32.c, Claudio Fontana, 2021/03/16
- [RFC v8 21/44] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, Claudio Fontana, 2021/03/16
- [RFC v8 23/44] target/arm: move sve_exception_el out of TCG helpers, Claudio Fontana, 2021/03/16
- [RFC v8 32/44] tests: restrict TCG-only arm-cpu-features tests to TCG builds, Claudio Fontana, 2021/03/16
- [RFC v8 26/44] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled(), Claudio Fontana, 2021/03/16
- [RFC v8 29/44] target/arm: cleanup cpu includes, Claudio Fontana, 2021/03/16
- [RFC v8 33/44] tests: do not run test-hmp on all machines for ARM KVM-only, Claudio Fontana, 2021/03/16