ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/cpu: Call object_class_is_abstract() once in cpu_class_by_name() 

Let CPUClass::class_by_name() handlers to return abstract classes,
and filter them once in the public cpu_class_by_name() method.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230908112235.75914-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-09-08 10:09:23 +02:00
parent 55f2cd7737
commit 3a9d0d7b64
15 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/core/cpu-common.c
View File

@ -146,10 +146,18 @@ static bool cpu_common_has_work(CPUState *cs)
ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model)
{ {
CPUClass *cc = CPU_CLASS(object_class_by_name(typename)); ObjectClass *oc;
CPUClass *cc;
assert(cpu_model && cc->class_by_name); oc = object_class_by_name(typename);
return cc->class_by_name(cpu_model); cc = CPU_CLASS(oc);
assert(cc->class_by_name);
assert(cpu_model);
oc = cc->class_by_name(cpu_model);
if (oc == NULL || object_class_is_abstract(oc)) {
return NULL;
}
return oc;
} }
static void cpu_common_parse_features(const char *typename, char *features, static void cpu_common_parse_features(const char *typename, char *features,

7
include/hw/core/cpu.h
View File

@ -102,7 +102,7 @@ struct SysemuCPUOps;
/** /**
* CPUClass: * CPUClass:
* @class_by_name: Callback to map -cpu command line model name to an * @class_by_name: Callback to map -cpu command line model name to an
* instantiatable CPU type. * instantiatable CPU type.
* @parse_features: Callback to parse command line arguments. * @parse_features: Callback to parse command line arguments.
* @reset_dump_flags: #CPUDumpFlags to use for reset logging. * @reset_dump_flags: #CPUDumpFlags to use for reset logging.
* @has_work: Callback for checking if there is work to do. * @has_work: Callback for checking if there is work to do.
@ -772,9 +772,10 @@ void cpu_reset(CPUState *cpu);
* @typename: The CPU base type. * @typename: The CPU base type.
* @cpu_model: The model string without any parameters. * @cpu_model: The model string without any parameters.
* *
* Looks up a CPU #ObjectClass matching name @cpu_model. * Looks up a concrete CPU #ObjectClass matching name @cpu_model.
* *
* Returns: A #CPUClass or %NULL if not matching class is found. * Returns: A concrete #CPUClass or %NULL if no matching class is found
* or if the matching class is abstract.
*/ */
ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model); ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model);

3
target/alpha/cpu.c
View File

@ -126,8 +126,7 @@ static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model)
int i; int i;
oc = object_class_by_name(cpu_model); oc = object_class_by_name(cpu_model);
if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL && if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL) {
!object_class_is_abstract(oc)) {
return oc; return oc;
} }

3
target/arm/cpu.c
View File

@ -2401,8 +2401,7 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_strfreev(cpuname); g_strfreev(cpuname);
g_free(typename); g_free(typename);
if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) || if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU)) {
object_class_is_abstract(oc)) {
return NULL; return NULL;
} }
return oc; return oc;

3
target/avr/cpu.c
View File

@ -157,8 +157,7 @@ static ObjectClass *avr_cpu_class_by_name(const char *cpu_model)
ObjectClass *oc; ObjectClass *oc;
oc = object_class_by_name(cpu_model); oc = object_class_by_name(cpu_model);
if (object_class_dynamic_cast(oc, TYPE_AVR_CPU) == NULL || if (object_class_dynamic_cast(oc, TYPE_AVR_CPU) == NULL) {
object_class_is_abstract(oc)) {
oc = NULL; oc = NULL;
} }
return oc; return oc;

3
target/cris/cpu.c
View File

@ -95,8 +95,7 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model)
typename = g_strdup_printf(CRIS_CPU_TYPE_NAME("%s"), cpu_model); typename = g_strdup_printf(CRIS_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_free(typename); g_free(typename);
if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_CRIS_CPU) || if (oc != NULL && !object_class_dynamic_cast(oc, TYPE_CRIS_CPU)) {
object_class_is_abstract(oc))) {
oc = NULL; oc = NULL;
} }
return oc; return oc;

3
target/hexagon/cpu.c
View File

@ -63,8 +63,7 @@ static ObjectClass *hexagon_cpu_class_by_name(const char *cpu_model)
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_strfreev(cpuname); g_strfreev(cpuname);
g_free(typename); g_free(typename);
if (!oc || !object_class_dynamic_cast(oc, TYPE_HEXAGON_CPU) || if (!oc || !object_class_dynamic_cast(oc, TYPE_HEXAGON_CPU)) {
object_class_is_abstract(oc)) {
return NULL; return NULL;
} }
return oc; return oc;

3
target/loongarch/cpu.c
View File

@ -721,8 +721,7 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model)
} }
} }
if (object_class_dynamic_cast(oc, TYPE_LOONGARCH_CPU) if (object_class_dynamic_cast(oc, TYPE_LOONGARCH_CPU)) {
&& !object_class_is_abstract(oc)) {
return oc; return oc;
} }
return NULL; return NULL;

3
target/m68k/cpu.c
View File

@ -111,8 +111,7 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model)
typename = g_strdup_printf(M68K_CPU_TYPE_NAME("%s"), cpu_model); typename = g_strdup_printf(M68K_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_free(typename); g_free(typename);
if (oc != NULL && (object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL || if (oc != NULL && object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL) {
object_class_is_abstract(oc))) {
return NULL; return NULL;
} }
return oc; return oc;

3
target/openrisc/cpu.c
View File

@ -164,8 +164,7 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model)
typename = g_strdup_printf(OPENRISC_CPU_TYPE_NAME("%s"), cpu_model); typename = g_strdup_printf(OPENRISC_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_free(typename); g_free(typename);
if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) || if (oc != NULL && !object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU)) {
object_class_is_abstract(oc))) {
return NULL; return NULL;
} }
return oc; return oc;

3
target/riscv/cpu.c
View File

@ -646,8 +646,7 @@ static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model)
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_strfreev(cpuname); g_strfreev(cpuname);
g_free(typename); g_free(typename);
if (!oc || !object_class_dynamic_cast(oc, TYPE_RISCV_CPU) || if (!oc || !object_class_dynamic_cast(oc, TYPE_RISCV_CPU)) {
object_class_is_abstract(oc)) {
return NULL; return NULL;
} }
return oc; return oc;

6
target/rx/cpu.c
View File

@ -111,16 +111,12 @@ static ObjectClass *rx_cpu_class_by_name(const char *cpu_model)
char *typename; char *typename;
oc = object_class_by_name(cpu_model); oc = object_class_by_name(cpu_model);
if (oc != NULL && object_class_dynamic_cast(oc, TYPE_RX_CPU) != NULL && if (oc != NULL && object_class_dynamic_cast(oc, TYPE_RX_CPU) != NULL) {
!object_class_is_abstract(oc)) {
return oc; return oc;
} }
typename = g_strdup_printf(RX_CPU_TYPE_NAME("%s"), cpu_model); typename = g_strdup_printf(RX_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_free(typename); g_free(typename);
if (oc != NULL && object_class_is_abstract(oc)) {
oc = NULL;
}
return oc; return oc;
} }

3
target/sh4/cpu.c
View File

@ -152,9 +152,6 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)
typename = g_strdup_printf(SUPERH_CPU_TYPE_NAME("%s"), s); typename = g_strdup_printf(SUPERH_CPU_TYPE_NAME("%s"), s);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
if (oc != NULL && object_class_is_abstract(oc)) {
oc = NULL;
}
out: out:
g_free(s); g_free(s);

3
target/tricore/cpu.c
View File

@ -132,8 +132,7 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model)
typename = g_strdup_printf(TRICORE_CPU_TYPE_NAME("%s"), cpu_model); typename = g_strdup_printf(TRICORE_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_free(typename); g_free(typename);
if (!oc || !object_class_dynamic_cast(oc, TYPE_TRICORE_CPU) || if (!oc || !object_class_dynamic_cast(oc, TYPE_TRICORE_CPU)) {
object_class_is_abstract(oc)) {
return NULL; return NULL;
} }
return oc; return oc;

3
target/xtensa/cpu.c
View File

@ -141,8 +141,7 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model)
typename = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"), cpu_model); typename = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_free(typename); g_free(typename);
if (oc == NULL || !object_class_dynamic_cast(oc, TYPE_XTENSA_CPU) || if (oc == NULL || !object_class_dynamic_cast(oc, TYPE_XTENSA_CPU)) {
object_class_is_abstract(oc)) {
return NULL; return NULL;
} }
return oc; return oc;