[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/39] tricore: cleanup cpu type name composition
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 26/39] tricore: cleanup cpu type name composition |
Date: |
Thu, 26 Oct 2017 16:03:51 +0200 |
From: Igor Mammedov <address@hidden>
introduce TRICORE_CPU_TYPE_NAME macro and use it to construct
cpu type names. While at it move cpu type_infos into one
array and register it directly with type_init_from_array()
instead of custom tricore_cpu_register_types()/cpu_register()
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/tricore/cpu.h | 2 ++
target/tricore/cpu.c | 68 ++++++++++++++++------------------------------------
2 files changed, 22 insertions(+), 48 deletions(-)
diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index bc53c40774..f41d2ceb69 100644
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -413,6 +413,8 @@ static inline void cpu_get_tb_cpu_state(CPUTriCoreState
*env, target_ulong *pc,
#define cpu_init(cpu_model) cpu_generic_init(TYPE_TRICORE_CPU, cpu_model)
+#define TRICORE_CPU_TYPE_SUFFIX "-" TYPE_TRICORE_CPU
+#define TRICORE_CPU_TYPE_NAME(model) model TRICORE_CPU_TYPE_SUFFIX
/* helpers.c */
int cpu_tricore_handle_mmu_fault(CPUState *cpu, target_ulong address,
diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c
index cd93806d47..179c997aa4 100644
--- a/target/tricore/cpu.c
+++ b/target/tricore/cpu.c
@@ -116,7 +116,7 @@ static ObjectClass *tricore_cpu_class_by_name(const char
*cpu_model)
ObjectClass *oc;
char *typename;
- typename = g_strdup_printf("%s-" TYPE_TRICORE_CPU, cpu_model);
+ typename = g_strdup_printf(TRICORE_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename);
g_free(typename);
if (!oc || !object_class_dynamic_cast(oc, TYPE_TRICORE_CPU) ||
@@ -147,19 +147,6 @@ static void tc27x_initfn(Object *obj)
set_feature(&cpu->env, TRICORE_FEATURE_161);
}
-typedef struct TriCoreCPUInfo {
- const char *name;
- void (*initfn)(Object *obj);
- void (*class_init)(ObjectClass *oc, void *data);
-} TriCoreCPUInfo;
-
-static const TriCoreCPUInfo tricore_cpus[] = {
- { .name = "tc1796", .initfn = tc1796_initfn },
- { .name = "tc1797", .initfn = tc1797_initfn },
- { .name = "tc27x", .initfn = tc27x_initfn },
- { .name = NULL }
-};
-
static void tricore_cpu_class_init(ObjectClass *c, void *data)
{
TriCoreCPUClass *mcc = TRICORE_CPU_CLASS(c);
@@ -181,41 +168,26 @@ static void tricore_cpu_class_init(ObjectClass *c, void
*data)
cc->tcg_initialize = tricore_tcg_init;
}
-static void cpu_register(const TriCoreCPUInfo *info)
-{
- TypeInfo type_info = {
- .parent = TYPE_TRICORE_CPU,
+#define DEFINE_TRICORE_CPU_TYPE(cpu_model, initfn) \
+ { \
+ .parent = TYPE_TRICORE_CPU, \
+ .instance_init = initfn, \
+ .name = TRICORE_CPU_TYPE_NAME(cpu_model), \
+ }
+
+static const TypeInfo tricore_cpu_type_infos[] = {
+ {
+ .name = TYPE_TRICORE_CPU,
+ .parent = TYPE_CPU,
.instance_size = sizeof(TriCoreCPU),
- .instance_init = info->initfn,
+ .instance_init = tricore_cpu_initfn,
+ .abstract = true,
.class_size = sizeof(TriCoreCPUClass),
- .class_init = info->class_init,
- };
-
- type_info.name = g_strdup_printf("%s-" TYPE_TRICORE_CPU, info->name);
- type_register(&type_info);
- g_free((void *)type_info.name);
-}
-
-static const TypeInfo tricore_cpu_type_info = {
- .name = TYPE_TRICORE_CPU,
- .parent = TYPE_CPU,
- .instance_size = sizeof(TriCoreCPU),
- .instance_init = tricore_cpu_initfn,
- .abstract = true,
- .class_size = sizeof(TriCoreCPUClass),
- .class_init = tricore_cpu_class_init,
+ .class_init = tricore_cpu_class_init,
+ },
+ DEFINE_TRICORE_CPU_TYPE("tc1796", tc1796_initfn),
+ DEFINE_TRICORE_CPU_TYPE("tc1797", tc1797_initfn),
+ DEFINE_TRICORE_CPU_TYPE("tc27x", tc27x_initfn),
};
-static void tricore_cpu_register_types(void)
-{
- const TriCoreCPUInfo *info = tricore_cpus;
-
- type_register_static(&tricore_cpu_type_info);
-
- while (info->name) {
- cpu_register(info);
- info++;
- }
-}
-
-type_init(tricore_cpu_register_types)
+DEFINE_TYPES(tricore_cpu_type_infos)
--
2.13.6
- [Qemu-devel] [PULL 17/39] sh4: shix: use generic cpu_model parsing, (continued)
- [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
- [Qemu-devel] [PULL 26/39] tricore: cleanup cpu type name composition,
Eduardo Habkost <=
- [Qemu-devel] [PULL 28/39] sparc: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 27/39] tricore: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 30/39] sparc: sparc: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 29/39] sparc: sun4u/sun4v/niagara: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 31/39] sparc: leon3: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 32/39] mips: use object_new() instead of gnew()+object_initialize(), Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 33/39] mips: malta/boston: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 34/39] mips: fulong2e: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 35/39] mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 37/39] mips: r4k: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/26