Commit 9b706039 authored by Andreas Färber's avatar Andreas Färber
Browse files

target-m68k: Start QOM'ifying CPU init 



Move model-independent code from cpu_m68k_init() into a QOM initfn.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Reviewed-by: default avatarLaurent Vivier <Laurent@Vivier.EU>
Tested-by: default avatarLaurent Vivier <Laurent@Vivier.EU>
parent 11c19868

target-m68k/cpu.c

+9 −0
Original line number Diff line number Diff line
@@ -48,6 +48,14 @@ static void m68k_cpu_reset(CPUState *s) 
    tlb_flush(env, 1);

}



static void m68k_cpu_initfn(Object *obj)

{

    M68kCPU *cpu = M68K_CPU(obj);

    CPUM68KState *env = &cpu->env;



    cpu_exec_init(env);

}



static void m68k_cpu_class_init(ObjectClass *c, void *data)

{

    M68kCPUClass *mcc = M68K_CPU_CLASS(c);
@@ -61,6 +69,7 @@ static const TypeInfo m68k_cpu_type_info = { 
    .name = TYPE_M68K_CPU,

    .parent = TYPE_CPU,

    .instance_size = sizeof(M68kCPU),

    .instance_init = m68k_cpu_initfn,

    .abstract = false,

    .class_size = sizeof(M68kCPUClass),

    .class_init = m68k_cpu_class_init,

target-m68k/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) 


    cpu = M68K_CPU(object_new(TYPE_M68K_CPU));

    env = &cpu->env;

    cpu_exec_init(env);



    if (!inited) {

        inited = 1;

        m68k_tcg_init();