Current CPU model names are clarified, assuming 32-bit HPPA runs a PA-7300LC whereas 64-bit runs a PA-8700. Both CPU models are made into children of the now abstract TYPE_HPPA_CPU base class, simplifying the addition of other CPU models.
Signed-off-by: Anton Johansson <[email protected]> --- target/hppa/cpu-qom.h | 7 ++++++- hw/hppa/machine.c | 17 +++++++++++------ target/hppa/cpu.c | 19 ++++++++++++++----- tests/qtest/machine-none-test.c | 2 +- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/target/hppa/cpu-qom.h b/target/hppa/cpu-qom.h index 5c454bf543..c6b82dc09b 100644 --- a/target/hppa/cpu-qom.h +++ b/target/hppa/cpu-qom.h @@ -23,7 +23,12 @@ #include "hw/core/cpu.h" #define TYPE_HPPA_CPU "hppa-cpu" -#define TYPE_HPPA64_CPU "hppa64-cpu" + +#define HPPA_CPU_TYPE_SUFFIX "-" TYPE_HPPA_CPU +#define HPPA_CPU_TYPE_NAME(name) (name HPPA_CPU_TYPE_SUFFIX) + +#define TYPE_HPPA_CPU_PA_7300LC HPPA_CPU_TYPE_NAME("pa-7300lc") +#define TYPE_HPPA_CPU_PA_8700 HPPA_CPU_TYPE_NAME("pa-8700") OBJECT_DECLARE_CPU_TYPE(HPPACPU, HPPACPUClass, HPPA_CPU) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 472b90aab0..6a0487c362 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -791,13 +791,13 @@ static void hppa_machine_common_class_init(ObjectClass *oc, const void *data) static void HP_B160L_machine_init_class_init(ObjectClass *oc, const void *data) { static const char * const valid_cpu_types[] = { - TYPE_HPPA_CPU, + TYPE_HPPA_CPU_PA_7300LC, NULL }; MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "HP B160L workstation"; - mc->default_cpu_type = TYPE_HPPA_CPU; + mc->default_cpu_type = TYPE_HPPA_CPU_PA_7300LC; mc->valid_cpu_types = valid_cpu_types; mc->init = machine_HP_B160L_init; mc->is_default = true; @@ -807,13 +807,13 @@ static void HP_B160L_machine_init_class_init(ObjectClass *oc, const void *data) static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *data) { static const char * const valid_cpu_types[] = { - TYPE_HPPA64_CPU, + TYPE_HPPA_CPU_PA_8700, NULL }; MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "HP C3700 workstation"; - mc->default_cpu_type = TYPE_HPPA64_CPU; + mc->default_cpu_type = TYPE_HPPA_CPU_PA_8700; mc->valid_cpu_types = valid_cpu_types; mc->init = machine_HP_C3700_init; mc->max_cpus = HPPA_MAX_CPUS; @@ -823,13 +823,18 @@ static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *data) static void HP_715_machine_init_class_init(ObjectClass *oc, const void *data) { static const char * const valid_cpu_types[] = { - TYPE_HPPA_CPU, + TYPE_HPPA_CPU_PA_7300LC, NULL }; MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "HP 715/64 workstation"; - mc->default_cpu_type = TYPE_HPPA_CPU; + /* + * Although the 715 workstation should use a 7100LC, it can be safely + * modeled as a 7300LC as the difference is a moving of the L1 data cache + * to on-chip. + */ + mc->default_cpu_type = TYPE_HPPA_CPU_PA_7300LC; mc->valid_cpu_types = valid_cpu_types; mc->init = machine_HP_715_init; /* can only support up to max. 8 CPUs due inventory major numbers */ diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 714f3bbdaf..c8079016bf 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -207,7 +207,7 @@ static void hppa_cpu_initfn(Object *obj) { CPUHPPAState *env = cpu_env(CPU(obj)); - env->is_pa20 = !!object_dynamic_cast(obj, TYPE_HPPA64_CPU); + env->is_pa20 = !!object_dynamic_cast(obj, TYPE_HPPA64_CPU_PA_8700); } static void hppa_cpu_reset_hold(Object *obj, ResetType type) @@ -236,9 +236,14 @@ static void hppa_cpu_reset_hold(Object *obj, ResetType type) static ObjectClass *hppa_cpu_class_by_name(const char *cpu_model) { - g_autofree char *typename = g_strconcat(cpu_model, "-cpu", NULL); + ObjectClass *oc; + char *typename; - return object_class_by_name(typename); + typename = g_strdup_printf(HPPA_CPU_TYPE_NAME("%s"), cpu_model); + oc = object_class_by_name(typename); + g_free(typename); + + return oc; } #ifndef CONFIG_USER_ONLY @@ -314,12 +319,16 @@ static const TypeInfo hppa_cpu_type_infos[] = { .instance_size = sizeof(HPPACPU), .instance_align = __alignof(HPPACPU), .instance_init = hppa_cpu_initfn, - .abstract = false, + .abstract = true, .class_size = sizeof(HPPACPUClass), .class_init = hppa_cpu_class_init, }, { - .name = TYPE_HPPA64_CPU, + .name = TYPE_HPPA_CPU_PA_7300LC, + .parent = TYPE_HPPA_CPU, + }, + { + .name = TYPE_HPPA_CPU_PA_8700, .parent = TYPE_HPPA_CPU, }, }; diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c index b6a87d27ed..f871056fa4 100644 --- a/tests/qtest/machine-none-test.c +++ b/tests/qtest/machine-none-test.c @@ -48,7 +48,7 @@ static struct arch2cpu cpus_map[] = { { "tricore", "tc1796" }, { "xtensa", "dc233c" }, { "xtensaeb", "fsf" }, - { "hppa", "hppa" }, + { "hppa", "pa-7300lc" }, { "riscv64", "rv64" }, { "riscv32", "rv32" }, { "rx", "rx62n" }, -- 2.52.0
