| Message ID | 20231102002500.1750692-4-gshan@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v4,01/33] target/alpha: Tidy up alpha_cpu_class_by_name() | expand |
On Thu, 2 Nov 2023 10:24:30 +1000 Gavin Shan <gshan@redhat.com> wrote: > From: Philippe Mathieu-Daudé <philmd@linaro.org> > > For all targets, the CPU class returned from CPUClass::class_by_name() > and object_class_dynamic_cast(oc, CPU_RESOLVING_TYPE) need to be > compatible. Lets apply the check in cpu_class_by_name() for once, > instead of having the check in CPUClass::class_by_name() for individual > target. In order to make CPU_RESOLVING_TYPE visible to cpu_class_by_name(), > the helper has to be moved to cpu-target.c > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > cpu-target.c | 15 +++++++++++++++ > hw/core/cpu-common.c | 14 -------------- > target/arm/cpu.c | 4 +--- > target/avr/cpu.c | 8 +------- > target/cris/cpu.c | 4 +--- > target/hexagon/cpu.c | 4 +--- > target/loongarch/cpu.c | 8 +------- > target/m68k/cpu.c | 4 +--- > target/openrisc/cpu.c | 4 +--- > target/riscv/cpu.c | 4 +--- > target/tricore/cpu.c | 4 +--- > target/xtensa/cpu.c | 4 +--- > 12 files changed, 25 insertions(+), 52 deletions(-) > > diff --git a/cpu-target.c b/cpu-target.c > index 79363ae370..876b498233 100644 > --- a/cpu-target.c > +++ b/cpu-target.c > @@ -250,6 +250,21 @@ void cpu_exec_initfn(CPUState *cpu) > #endif > } > > +ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) > +{ > + CPUClass *cc = CPU_CLASS(object_class_by_name(typename)); > + ObjectClass *oc; > + > + assert(cpu_model && cc->class_by_name); > + oc = cc->class_by_name(cpu_model); > + if (oc && !object_class_is_abstract(oc) && > + object_class_dynamic_cast(oc, CPU_RESOLVING_TYPE)) { > + return oc; > + } > + > + return NULL; > +} > + > const char *parse_cpu_option(const char *cpu_option) > { > ObjectClass *oc; > diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c > index bca0323e9f..1024de53bb 100644 > --- a/hw/core/cpu-common.c > +++ b/hw/core/cpu-common.c > @@ -147,20 +147,6 @@ static bool cpu_common_has_work(CPUState *cs) > return false; > } > > -ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) > -{ > - CPUClass *cc = CPU_CLASS(object_class_by_name(typename)); > - ObjectClass *oc; > - > - assert(cpu_model && cc->class_by_name); > - oc = cc->class_by_name(cpu_model); > - if (oc && !object_class_is_abstract(oc)) { > - return oc; > - } > - > - return NULL; > -} > - > static void cpu_common_parse_features(const char *typename, char *features, > Error **errp) > { > diff --git a/target/arm/cpu.c b/target/arm/cpu.c > index 8c622d6b59..4942239b34 100644 > --- a/target/arm/cpu.c > +++ b/target/arm/cpu.c > @@ -2399,9 +2399,7 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) > oc = object_class_by_name(typename); > g_strfreev(cpuname); > g_free(typename); > - if (!object_class_dynamic_cast(oc, TYPE_ARM_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/avr/cpu.c b/target/avr/cpu.c > index 113d522f75..a36cc48aae 100644 > --- a/target/avr/cpu.c > +++ b/target/avr/cpu.c > @@ -154,13 +154,7 @@ static void avr_cpu_initfn(Object *obj) > > static ObjectClass *avr_cpu_class_by_name(const char *cpu_model) > { > - ObjectClass *oc; > - > - oc = object_class_by_name(cpu_model); > - if (!object_class_dynamic_cast(oc, TYPE_AVR_CPU)) { > - oc = NULL; > - } > - return oc; > + return object_class_by_name(cpu_model); > } > > static void avr_cpu_dump_state(CPUState *cs, FILE *f, int flags) > diff --git a/target/cris/cpu.c b/target/cris/cpu.c > index 1cb431cd46..a5083a0077 100644 > --- a/target/cris/cpu.c > +++ b/target/cris/cpu.c > @@ -95,9 +95,7 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(CRIS_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (!object_class_dynamic_cast(oc, TYPE_CRIS_CPU)) { > - oc = NULL; > - } > + > return oc; > } > > diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c > index bd5adb7acd..aa48f5fe89 100644 > --- a/target/hexagon/cpu.c > +++ b/target/hexagon/cpu.c > @@ -63,9 +63,7 @@ static ObjectClass *hexagon_cpu_class_by_name(const char *cpu_model) > oc = object_class_by_name(typename); > g_strfreev(cpuname); > g_free(typename); > - if (!object_class_dynamic_cast(oc, TYPE_HEXAGON_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c > index 06d1b9bb95..c6712e13f9 100644 > --- a/target/loongarch/cpu.c > +++ b/target/loongarch/cpu.c > @@ -643,15 +643,9 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model) > g_autofree char *typename > = g_strdup_printf(LOONGARCH_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > - if (!oc) { > - return NULL; > - } > } > > - if (object_class_dynamic_cast(oc, TYPE_LOONGARCH_CPU)) { > - return oc; > - } > - return NULL; > + return oc; > } > > void loongarch_cpu_dump_state(CPUState *cs, FILE *f, int flags) > diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c > index fe381cc5d3..6cd5b56d6f 100644 > --- a/target/m68k/cpu.c > +++ b/target/m68k/cpu.c > @@ -111,9 +111,7 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(M68K_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (!object_class_dynamic_cast(oc, TYPE_M68K_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c > index cc94f37e77..f7d53c592a 100644 > --- a/target/openrisc/cpu.c > +++ b/target/openrisc/cpu.c > @@ -164,9 +164,7 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(OPENRISC_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 018bad6f82..8b4024338c 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -636,9 +636,7 @@ static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model) > oc = object_class_by_name(typename); > g_strfreev(cpuname); > g_free(typename); > - if (!object_class_dynamic_cast(oc, TYPE_RISCV_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c > index 47e1c272cf..8acacdf0c0 100644 > --- a/target/tricore/cpu.c > +++ b/target/tricore/cpu.c > @@ -132,9 +132,7 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(TRICORE_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (!object_class_dynamic_cast(oc, TYPE_TRICORE_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c > index 5d1c090467..93e782a6e0 100644 > --- a/target/xtensa/cpu.c > +++ b/target/xtensa/cpu.c > @@ -141,9 +141,7 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (!object_class_dynamic_cast(oc, TYPE_XTENSA_CPU)) { > - return NULL; > - } > + > return oc; > } >
diff --git a/cpu-target.c b/cpu-target.c index 79363ae370..876b498233 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -250,6 +250,21 @@ void cpu_exec_initfn(CPUState *cpu) #endif } +ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) +{ + CPUClass *cc = CPU_CLASS(object_class_by_name(typename)); + ObjectClass *oc; + + assert(cpu_model && cc->class_by_name); + oc = cc->class_by_name(cpu_model); + if (oc && !object_class_is_abstract(oc) && + object_class_dynamic_cast(oc, CPU_RESOLVING_TYPE)) { + return oc; + } + + return NULL; +} + const char *parse_cpu_option(const char *cpu_option) { ObjectClass *oc; diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index bca0323e9f..1024de53bb 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -147,20 +147,6 @@ static bool cpu_common_has_work(CPUState *cs) return false; } -ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) -{ - CPUClass *cc = CPU_CLASS(object_class_by_name(typename)); - ObjectClass *oc; - - assert(cpu_model && cc->class_by_name); - oc = cc->class_by_name(cpu_model); - if (oc && !object_class_is_abstract(oc)) { - return oc; - } - - return NULL; -} - static void cpu_common_parse_features(const char *typename, char *features, Error **errp) { diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 8c622d6b59..4942239b34 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2399,9 +2399,7 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) oc = object_class_by_name(typename); g_strfreev(cpuname); g_free(typename); - if (!object_class_dynamic_cast(oc, TYPE_ARM_CPU)) { - return NULL; - } + return oc; } diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 113d522f75..a36cc48aae 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -154,13 +154,7 @@ static void avr_cpu_initfn(Object *obj) static ObjectClass *avr_cpu_class_by_name(const char *cpu_model) { - ObjectClass *oc; - - oc = object_class_by_name(cpu_model); - if (!object_class_dynamic_cast(oc, TYPE_AVR_CPU)) { - oc = NULL; - } - return oc; + return object_class_by_name(cpu_model); } static void avr_cpu_dump_state(CPUState *cs, FILE *f, int flags) diff --git a/target/cris/cpu.c b/target/cris/cpu.c index 1cb431cd46..a5083a0077 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -95,9 +95,7 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(CRIS_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (!object_class_dynamic_cast(oc, TYPE_CRIS_CPU)) { - oc = NULL; - } + return oc; } diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index bd5adb7acd..aa48f5fe89 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -63,9 +63,7 @@ static ObjectClass *hexagon_cpu_class_by_name(const char *cpu_model) oc = object_class_by_name(typename); g_strfreev(cpuname); g_free(typename); - if (!object_class_dynamic_cast(oc, TYPE_HEXAGON_CPU)) { - return NULL; - } + return oc; } diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 06d1b9bb95..c6712e13f9 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -643,15 +643,9 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model) g_autofree char *typename = g_strdup_printf(LOONGARCH_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); - if (!oc) { - return NULL; - } } - if (object_class_dynamic_cast(oc, TYPE_LOONGARCH_CPU)) { - return oc; - } - return NULL; + return oc; } void loongarch_cpu_dump_state(CPUState *cs, FILE *f, int flags) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index fe381cc5d3..6cd5b56d6f 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -111,9 +111,7 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(M68K_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (!object_class_dynamic_cast(oc, TYPE_M68K_CPU)) { - return NULL; - } + return oc; } diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index cc94f37e77..f7d53c592a 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -164,9 +164,7 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(OPENRISC_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU)) { - return NULL; - } + return oc; } diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 018bad6f82..8b4024338c 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -636,9 +636,7 @@ static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model) oc = object_class_by_name(typename); g_strfreev(cpuname); g_free(typename); - if (!object_class_dynamic_cast(oc, TYPE_RISCV_CPU)) { - return NULL; - } + return oc; } diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 47e1c272cf..8acacdf0c0 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -132,9 +132,7 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(TRICORE_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (!object_class_dynamic_cast(oc, TYPE_TRICORE_CPU)) { - return NULL; - } + return oc; } diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index 5d1c090467..93e782a6e0 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -141,9 +141,7 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (!object_class_dynamic_cast(oc, TYPE_XTENSA_CPU)) { - return NULL; - } + return oc; }