Re: [Qemu-devel] [PATCH 27/38] tricore: cleanup cpu type name composition

[Philippe Mathieu-Daudé]

On 10/02/2017 06:08 AM, Igor Mammedov wrote:
> 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>

> ---
> CC: 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 bc53c40..f41d2ce 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 871eb35..69d7720 100644
> --- a/target/tricore/cpu.c
> +++ b/target/tricore/cpu.c
> @@ -120,7 +120,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) ||
> @@ -151,19 +151,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);
> @@ -184,41 +171,26 @@ static void tricore_cpu_class_init(ObjectClass *c, void 
> *data)
>       cc->get_phys_page_attrs_debug = tricore_cpu_get_phys_page_attrs_debug;
>   }
>   
> -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)
> +type_init_from_array(tricore_cpu_type_infos)