Rename from aarch32_max_tcg_init and take an Object pointer, in preparation from being used with TypeInit.
Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Richard Henderson <[email protected]> --- target/arm/internals.h | 2 +- target/arm/cpu-max.c | 2 +- target/arm/tcg/cpu-max-v8.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index f6b4e173a54..fc7d5ad6f2c 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1838,7 +1838,7 @@ uint32_t *arm_v7m_get_sp_ptr(CPUARMState *env, bool secure, bool el_is_in_host(CPUARMState *env, int el); void aa32_max_features(ARMCPU *cpu); -void aarch32_max_tcg_init(ARMCPU *cpu); +void aarch32_max_v8_tcg_initfn(Object *obj); int exception_target_el(CPUARMState *env); bool arm_singlestep_active(CPUARMState *env); bool arm_generate_debug_exceptions(CPUARMState *env); diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c index 4df52bcb08e..9ed45c8764f 100644 --- a/target/arm/cpu-max.c +++ b/target/arm/cpu-max.c @@ -108,7 +108,7 @@ static void cpu_max_initfn(Object *obj) if (tcg_enabled()) { if (!aarch64_enabled) { - aarch32_max_tcg_init(cpu); + aarch32_max_v8_tcg_initfn(obj); } else { aarch64_max_tcg_initfn(obj); } diff --git a/target/arm/tcg/cpu-max-v8.c b/target/arm/tcg/cpu-max-v8.c index 5c0ba28edf8..5a9845d88f3 100644 --- a/target/arm/tcg/cpu-max-v8.c +++ b/target/arm/tcg/cpu-max-v8.c @@ -101,8 +101,10 @@ void aa32_max_features(ARMCPU *cpu) FIELD_DP32_IDREG(isar, ID_DFR1, HPMN0, 1); /* FEAT_HPMN0 */ } -void aarch32_max_tcg_init(ARMCPU *cpu) +void aarch32_max_v8_tcg_initfn(Object *obj) { + ARMCPU *cpu = ARM_CPU(obj); + aarch64_aa32_a57_init(cpu, false); aa32_max_features(cpu); #ifdef CONFIG_USER_ONLY -- 2.53.0
