| Message ID | 20190903154810.27365-2-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Make it possible to compile with CONFIG_ARM_V7M=n | expand |
On 9/3/19 8:48 AM, Thomas Huth wrote: > Move the common set_feature() and unset_feature() functions from cpu.c and > cpu64.c to cpu.h, and make cpu_register() (renamed to arm_cpu_register()) > available from there, too, so we can register CPUs also from other files > in the future. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > target/arm/cpu.c | 20 ++------------------ > target/arm/cpu.h | 18 ++++++++++++++++++ > target/arm/cpu64.c | 16 ---------------- > 3 files changed, 20 insertions(+), 34 deletions(-) internals.h would be better, since presumably the uses will not leave target/arm/. Otherwise, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On Tue, 3 Sep 2019 at 16:54, Thomas Huth <thuth@redhat.com> wrote: > > Move the common set_feature() and unset_feature() functions from cpu.c and > cpu64.c to cpu.h, and make cpu_register() (renamed to arm_cpu_register()) > available from there, too, so we can register CPUs also from other files > in the future. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > target/arm/cpu.c | 20 ++------------------ > target/arm/cpu.h | 18 ++++++++++++++++++ > target/arm/cpu64.c | 16 ---------------- > 3 files changed, 20 insertions(+), 34 deletions(-) > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index 0981303170..c5007edf1f 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -3600,4 +3600,22 @@ static inline bool isar_feature_aa64_bti(const ARMISARegisters *id) > #define cpu_isar_feature(name, cpu) \ > ({ ARMCPU *cpu_ = (cpu); isar_feature_##name(&cpu_->isar); }) > > +static inline void set_feature(CPUARMState *env, int feature) > +{ > + env->features |= 1ULL << feature; > +} > + > +static inline void unset_feature(CPUARMState *env, int feature) > +{ > + env->features &= ~(1ULL << feature); > +} I think these function names are too generic to have in a header like cpu.h which is used all across the codebase. (For instance target/arm/kvm64.c now has both a local set_feature() function and this one from the header.) Can they go in target/arm/internals.h instead? The set of code that should be caring about setting feature bits should be pretty small. Maybe also they should be renamed. thanks -- PMM
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 2399c14471..f1f9eecdc8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -614,16 +614,6 @@ static bool arm_cpu_virtio_is_big_endian(CPUState *cs) #endif -static inline void set_feature(CPUARMState *env, int feature) -{ - env->features |= 1ULL << feature; -} - -static inline void unset_feature(CPUARMState *env, int feature) -{ - env->features &= ~(1ULL << feature); -} - static int print_insn_thumb1(bfd_vma pc, disassemble_info *info) { @@ -2515,12 +2505,6 @@ static void arm_max_initfn(Object *obj) #endif /* !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) */ -struct ARMCPUInfo { - const char *name; - void (*initfn)(Object *obj); - void (*class_init)(ObjectClass *oc, void *data); -}; - static const ARMCPUInfo arm_cpus[] = { #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) { .name = "arm926", .initfn = arm926_initfn }, @@ -2681,7 +2665,7 @@ static void cpu_register_class_init(ObjectClass *oc, void *data) acc->info = data; } -static void cpu_register(const ARMCPUInfo *info) +void arm_cpu_register(const ARMCPUInfo *info) { TypeInfo type_info = { .parent = TYPE_ARM_CPU, @@ -2722,7 +2706,7 @@ static void arm_cpu_register_types(void) type_register_static(&idau_interface_type_info); while (info->name) { - cpu_register(info); + arm_cpu_register(info); info++; } diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 0981303170..c5007edf1f 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3600,4 +3600,22 @@ static inline bool isar_feature_aa64_bti(const ARMISARegisters *id) #define cpu_isar_feature(name, cpu) \ ({ ARMCPU *cpu_ = (cpu); isar_feature_##name(&cpu_->isar); }) +static inline void set_feature(CPUARMState *env, int feature) +{ + env->features |= 1ULL << feature; +} + +static inline void unset_feature(CPUARMState *env, int feature) +{ + env->features &= ~(1ULL << feature); +} + +struct ARMCPUInfo { + const char *name; + void (*initfn)(Object *obj); + void (*class_init)(ObjectClass *oc, void *data); +}; + +void arm_cpu_register(const ARMCPUInfo *info); + #endif diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index d7f5bf610a..869cec13ca 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -29,16 +29,6 @@ #include "kvm_arm.h" #include "qapi/visitor.h" -static inline void set_feature(CPUARMState *env, int feature) -{ - env->features |= 1ULL << feature; -} - -static inline void unset_feature(CPUARMState *env, int feature) -{ - env->features &= ~(1ULL << feature); -} - #ifndef CONFIG_USER_ONLY static uint64_t a57_a53_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri) { @@ -396,12 +386,6 @@ static void aarch64_max_initfn(Object *obj) } } -struct ARMCPUInfo { - const char *name; - void (*initfn)(Object *obj); - void (*class_init)(ObjectClass *oc, void *data); -}; - static const ARMCPUInfo aarch64_cpus[] = { { .name = "cortex-a57", .initfn = aarch64_a57_initfn }, { .name = "cortex-a53", .initfn = aarch64_a53_initfn },
Move the common set_feature() and unset_feature() functions from cpu.c and cpu64.c to cpu.h, and make cpu_register() (renamed to arm_cpu_register()) available from there, too, so we can register CPUs also from other files in the future. Signed-off-by: Thomas Huth <thuth@redhat.com> --- target/arm/cpu.c | 20 ++------------------ target/arm/cpu.h | 18 ++++++++++++++++++ target/arm/cpu64.c | 16 ---------------- 3 files changed, 20 insertions(+), 34 deletions(-)