On 15/3/24 14:08, Philippe Mathieu-Daudé wrote:
> "target/foo/cpu-qom.h" can not use any target specific definitions.
>
> Currently "target/mips/cpu-qom.h" defines TYPE_MIPS_CPU depending
> on the mips(32)/mips64 build type. This doesn't scale in a
> heterogeneous context where we need to access both types concurrently.
>
> In order to do that, introduce the new MIPS32_CPU / MIPS64_CPU types,
> both inheriting a common TYPE_MIPS_CPU base type.
>
> Keep the current CPU types registered in mips_register_cpudef_type()
> as 32 or 64-bit, but instead of depending on the binary built being
> targeting 32/64-bit, check whether the CPU is 64-bit by looking at
> the CPU_MIPS64 bit.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> target/mips/cpu-qom.h | 13 +++++++------
> target/mips/cpu.c | 11 ++++++++++-
> target/mips/sysemu/mips-qmp-cmds.c | 26 ++------------------------
> 3 files changed, 19 insertions(+), 31 deletions(-)
>
> diff --git a/target/mips/cpu-qom.h b/target/mips/cpu-qom.h
> index 0eea2a2598..bf464f16b6 100644
> --- a/target/mips/cpu-qom.h
> +++ b/target/mips/cpu-qom.h
> @@ -1,5 +1,5 @@
> /*
> - * QEMU MIPS CPU
> + * QEMU MIPS CPU QOM header (target agnostic)
> *
> * Copyright (c) 2012 SUSE LINUX Products GmbH
> *
> @@ -22,14 +22,15 @@
>
> #include "hw/core/cpu.h"
>
> -#ifdef TARGET_MIPS64
> -#define TYPE_MIPS_CPU "mips64-cpu"
> -#else
> -#define TYPE_MIPS_CPU "mips-cpu"
> -#endif
> +#define TYPE_MIPS_CPU "mips-cpu"
> +#define TYPE_MIPS32_CPU "mips32-cpu"
> +#define TYPE_MIPS64_CPU "mips64-cpu"
>
> OBJECT_DECLARE_CPU_TYPE(MIPSCPU, MIPSCPUClass, MIPS_CPU)
>
> +OBJECT_DECLARE_CPU_TYPE(MIPS32CPU, MIPSCPUClass, MIPS32_CPU)
> +OBJECT_DECLARE_CPU_TYPE(MIPS64CPU, MIPSCPUClass, MIPS64_CPU)
> +
> #define MIPS_CPU_TYPE_SUFFIX "-" TYPE_MIPS_CPU
> #define MIPS_CPU_TYPE_NAME(model) model MIPS_CPU_TYPE_SUFFIX
>
> diff --git a/target/mips/cpu.c b/target/mips/cpu.c
> index c096d97fe3..f3ea6175f2 100644
> --- a/target/mips/cpu.c
> +++ b/target/mips/cpu.c
> @@ -604,6 +604,14 @@ static const TypeInfo mips_cpu_types[] = {
> .abstract = true,
> .class_size = sizeof(MIPSCPUClass),
> .class_init = mips_cpu_class_init,
> + }, {
> + .name = TYPE_MIPS32_CPU,
> + .parent = TYPE_MIPS_CPU,
> + .abstract = true,
> + }, {
> + .name = TYPE_MIPS64_CPU,
> + .parent = TYPE_MIPS_CPU,
> + .abstract = true,
> }
> };
>
> @@ -620,7 +628,8 @@ static void mips_register_cpudef_type(const struct mips_def_t *def)
> char *typename = mips_cpu_type_name(def->name);
> TypeInfo ti = {
> .name = typename,
> - .parent = TYPE_MIPS_CPU,
> + .parent = def->insn_flags & CPU_MIPS64
> + ? TYPE_MIPS64_CPU : TYPE_MIPS32_CPU,
> .class_init = mips_cpu_cpudef_class_init,
> .class_data = (void *)def,
> };
Oops, I got 2 commits squashed by mistake here...
> diff --git a/target/mips/sysemu/mips-qmp-cmds.c b/target/mips/sysemu/mips-qmp-cmds.c
> index 7340ac70ba..329db3a028 100644
> --- a/target/mips/sysemu/mips-qmp-cmds.c
> +++ b/target/mips/sysemu/mips-qmp-cmds.c
> @@ -8,31 +8,9 @@
>
> #include "qemu/osdep.h"
> #include "qapi/qapi-commands-machine-target.h"
> -#include "cpu.h"
> -
> -static void mips_cpu_add_definition(gpointer data, gpointer user_data)
> -{
> - ObjectClass *oc = data;
> - CpuDefinitionInfoList **cpu_list = user_data;
> - CpuDefinitionInfo *info;
> - const char *typename;
> -
> - typename = object_class_get_name(oc);
> - info = g_malloc0(sizeof(*info));
> - info->name = cpu_model_from_type(typename);
> - info->q_typename = g_strdup(typename);
> -
> - QAPI_LIST_PREPEND(*cpu_list, info);
> -}
> +#include "qapi/commands-target-compat.h"
>
> CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
> {
> - CpuDefinitionInfoList *cpu_list = NULL;
> - GSList *list;
> -
> - list = object_class_get_list(TYPE_MIPS_CPU, false);
> - g_slist_foreach(list, mips_cpu_add_definition, &cpu_list);
> - g_slist_free(list);
> -
> - return cpu_list;
> + return generic_query_cpu_definitions(errp);
> }