[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/39] openrisc: cleanup cpu type name composition
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 14/39] openrisc: cleanup cpu type name composition |
Date: |
Thu, 26 Oct 2017 16:03:39 +0200 |
From: Igor Mammedov <address@hidden>
use new OPENRISC_CPU_TYPE_NAME to compose CPU type name and get
rid of intermediate OpenRISCCPUInfo/openrisc_cpu_register_types()
which is replaced by static TypeInfo array.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Acked-by: Stafford Horne <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/openrisc/cpu.h | 3 +++
target/openrisc/cpu.c | 69 +++++++++++++++++----------------------------------
2 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h
index 892dc4210f..cc22dc8871 100644
--- a/target/openrisc/cpu.h
+++ b/target/openrisc/cpu.h
@@ -392,6 +392,9 @@ int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu,
#define cpu_init(cpu_model) cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model)
+#define OPENRISC_CPU_TYPE_SUFFIX "-" TYPE_OPENRISC_CPU
+#define OPENRISC_CPU_TYPE_NAME(model) model OPENRISC_CPU_TYPE_SUFFIX
+
#include "exec/cpu-all.h"
#define TB_FLAGS_DFLAG 1
diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c
index a8db869e50..e0394b8b06 100644
--- a/target/openrisc/cpu.c
+++ b/target/openrisc/cpu.c
@@ -101,7 +101,7 @@ static ObjectClass *openrisc_cpu_class_by_name(const char
*cpu_model)
ObjectClass *oc;
char *typename;
- typename = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, cpu_model);
+ typename = g_strdup_printf(OPENRISC_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename);
g_free(typename);
if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) ||
@@ -126,16 +126,6 @@ static void openrisc_any_initfn(Object *obj)
cpu->env.cpucfgr = CPUCFGR_NSGF | CPUCFGR_OB32S | CPUCFGR_EVBARP;
}
-typedef struct OpenRISCCPUInfo {
- const char *name;
- void (*initfn)(Object *obj);
-} OpenRISCCPUInfo;
-
-static const OpenRISCCPUInfo openrisc_cpus[] = {
- { .name = "or1200", .initfn = or1200_initfn },
- { .name = "any", .initfn = openrisc_any_initfn },
-};
-
static void openrisc_cpu_class_init(ObjectClass *oc, void *data)
{
OpenRISCCPUClass *occ = OPENRISC_CPU_CLASS(oc);
@@ -166,40 +156,6 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void
*data)
cc->tcg_initialize = openrisc_translate_init;
}
-static void cpu_register(const OpenRISCCPUInfo *info)
-{
- TypeInfo type_info = {
- .parent = TYPE_OPENRISC_CPU,
- .instance_size = sizeof(OpenRISCCPU),
- .instance_init = info->initfn,
- .class_size = sizeof(OpenRISCCPUClass),
- };
-
- type_info.name = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, info->name);
- type_register(&type_info);
- g_free((void *)type_info.name);
-}
-
-static const TypeInfo openrisc_cpu_type_info = {
- .name = TYPE_OPENRISC_CPU,
- .parent = TYPE_CPU,
- .instance_size = sizeof(OpenRISCCPU),
- .instance_init = openrisc_cpu_initfn,
- .abstract = true,
- .class_size = sizeof(OpenRISCCPUClass),
- .class_init = openrisc_cpu_class_init,
-};
-
-static void openrisc_cpu_register_types(void)
-{
- int i;
-
- type_register_static(&openrisc_cpu_type_info);
- for (i = 0; i < ARRAY_SIZE(openrisc_cpus); i++) {
- cpu_register(&openrisc_cpus[i]);
- }
-}
-
/* Sort alphabetically by type name, except for "any". */
static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)
{
@@ -248,4 +204,25 @@ void cpu_openrisc_list(FILE *f, fprintf_function
cpu_fprintf)
g_slist_free(list);
}
-type_init(openrisc_cpu_register_types)
+#define DEFINE_OPENRISC_CPU_TYPE(cpu_model, initfn) \
+ { \
+ .parent = TYPE_OPENRISC_CPU, \
+ .instance_init = initfn, \
+ .name = OPENRISC_CPU_TYPE_NAME(cpu_model), \
+ }
+
+static const TypeInfo openrisc_cpus_type_infos[] = {
+ { /* base class should be registered first */
+ .name = TYPE_OPENRISC_CPU,
+ .parent = TYPE_CPU,
+ .instance_size = sizeof(OpenRISCCPU),
+ .instance_init = openrisc_cpu_initfn,
+ .abstract = true,
+ .class_size = sizeof(OpenRISCCPUClass),
+ .class_init = openrisc_cpu_class_init,
+ },
+ DEFINE_OPENRISC_CPU_TYPE("or1200", or1200_initfn),
+ DEFINE_OPENRISC_CPU_TYPE("any", openrisc_any_initfn),
+};
+
+DEFINE_TYPES(openrisc_cpus_type_infos)
--
2.13.6
- [Qemu-devel] [PULL 06/39] lm32: milkymist: use generic cpu_model parsing, (continued)
- [Qemu-devel] [PULL 06/39] lm32: milkymist: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 05/39] lm32: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 07/39] lm32: lm32_boards: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 08/39] m68k: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 09/39] m68k: an5206: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 10/39] m68k: mcf5208: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 11/39] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite", Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 12/39] moxie: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 13/39] moxie: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 15/39] openrisc: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 14/39] openrisc: cleanup cpu type name composition,
Eduardo Habkost <=
- [Qemu-devel] [PULL 17/39] sh4: shix: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 16/39] sh4: r2d: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 18/39] sh4: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 19/39] sh4: simplify superh_cpu_class_by_name(), Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 20/39] sh4: remove SuperHCPUClass::name field, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 21/39] xtensa: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 22/39] xtensa: sim: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 23/39] xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 24/39] unicore32: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 25/39] unicore32: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26