[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/25] target/arm: Move arm_cpu_*_finalize to internals.h
From: |
Peter Maydell |
Subject: |
[PULL 18/25] target/arm: Move arm_cpu_*_finalize to internals.h |
Date: |
Mon, 27 Jun 2022 11:22:29 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
Drop the aa32-only inline fallbacks,
and just use a couple of ifdefs.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220620175235.60881-16-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/cpu.h | 6 ------
target/arm/internals.h | 3 +++
target/arm/cpu.c | 2 ++
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 2ce47f8d29f..675c49f93e0 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -205,14 +205,8 @@ typedef struct {
#ifdef TARGET_AARCH64
# define ARM_MAX_VQ 16
-void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp);
-void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp);
-void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp);
#else
# define ARM_MAX_VQ 1
-static inline void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) { }
-static inline void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) { }
-static inline void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) { }
#endif
typedef struct ARMVectorReg {
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 6f94f3019db..aef568adf75 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -1288,6 +1288,9 @@ int arm_gdb_get_svereg(CPUARMState *env, GByteArray *buf,
int reg);
int arm_gdb_set_svereg(CPUARMState *env, uint8_t *buf, int reg);
int aarch64_fpu_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg);
int aarch64_fpu_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg);
+void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp);
+void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp);
+void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp);
#endif
#ifdef CONFIG_USER_ONLY
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index d9c4a9f56d2..660fd8b8b90 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1422,6 +1422,7 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)
{
Error *local_err = NULL;
+#ifdef TARGET_AARCH64
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
arm_cpu_sve_finalize(cpu, &local_err);
if (local_err != NULL) {
@@ -1441,6 +1442,7 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)
return;
}
}
+#endif
if (kvm_enabled()) {
kvm_arm_steal_time_finalize(cpu, &local_err);
--
2.25.1
- [PULL 06/25] target/arm: Add syn_smetrap, (continued)
- [PULL 06/25] target/arm: Add syn_smetrap, Peter Maydell, 2022/06/27
- [PULL 11/25] target/arm: Add PSTATE.{SM,ZA} to TB flags, Peter Maydell, 2022/06/27
- [PULL 12/25] target/arm: Add the SME ZA storage to CPUARMState, Peter Maydell, 2022/06/27
- [PULL 16/25] target/arm: Generalize cpu_arm_{get,set}_vq, Peter Maydell, 2022/06/27
- [PULL 15/25] target/arm: Create ARMVQMap, Peter Maydell, 2022/06/27
- [PULL 05/25] target/arm: Add SMEEXC_EL to TB flags, Peter Maydell, 2022/06/27
- [PULL 09/25] target/arm: Add SMCR_ELx, Peter Maydell, 2022/06/27
- [PULL 13/25] target/arm: Implement SMSTART, SMSTOP, Peter Maydell, 2022/06/27
- [PULL 17/25] target/arm: Generalize cpu_arm_{get, set}_default_vec_len, Peter Maydell, 2022/06/27
- [PULL 01/25] sphinx: change default language to 'en', Peter Maydell, 2022/06/27
- [PULL 18/25] target/arm: Move arm_cpu_*_finalize to internals.h,
Peter Maydell <=
- [PULL 19/25] target/arm: Unexport aarch64_add_*_properties, Peter Maydell, 2022/06/27
- [PULL 21/25] target/arm: Introduce sve_vqm1_for_el_sm, Peter Maydell, 2022/06/27
- [PULL 20/25] target/arm: Add cpu properties for SME, Peter Maydell, 2022/06/27
- [PULL 23/25] target/arm: Move pred_{full, gvec}_reg_{offset, size} to translate-a64.h, Peter Maydell, 2022/06/27
- [PULL 25/25] target/arm: Check V7VE as well as LPAE in arm_pamax, Peter Maydell, 2022/06/27
- [PULL 03/25] target/arm: Catch invalid kvm state also for hvf, Peter Maydell, 2022/06/27
- [PULL 08/25] target/arm: Add SVCR, Peter Maydell, 2022/06/27
- [PULL 22/25] target/arm: Add SVL to TB flags, Peter Maydell, 2022/06/27
- [PULL 14/25] target/arm: Move error for sve%d property to arm_cpu_sve_finalize, Peter Maydell, 2022/06/27
- [PULL 24/25] target/arm: Extend arm_pamax to more than aarch64, Peter Maydell, 2022/06/27