Commit 66b79775 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

sh4: replace cpu_sh4_init() with cpu_generic_init() 



it's just a wrapper, drop it and use cpu_generic_init() directly

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-18-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent a6977312

hw/sh4/r2d.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void r2d_init(MachineState *machine) 
        cpu_model = "SH7751R";

    }



    cpu = cpu_sh4_init(cpu_model);

    cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));

    if (cpu == NULL) {

        fprintf(stderr, "Unable to find CPU definition\n");

        exit(1);

hw/sh4/shix.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void shix_init(MachineState *machine) 
    if (!cpu_model)

        cpu_model = "any";



    cpu = cpu_sh4_init(cpu_model);

    cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));

    if (cpu == NULL) {

        fprintf(stderr, "Unable to find CPU definition\n");

        exit(1);

target/sh4/cpu.c

+0 −5
Original line number Diff line number Diff line
@@ -156,11 +156,6 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model) 
    return oc;

}



SuperHCPU *cpu_sh4_init(const char *cpu_model)

{

    return SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));

}



static void sh7750r_cpu_initfn(Object *obj)

{

    SuperHCPU *cpu = SUPERH_CPU(obj);

target/sh4/cpu.h

+1 −2
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ void superh_cpu_do_unaligned_access(CPUState *cpu, vaddr addr, 
                                    int mmu_idx, uintptr_t retaddr);



void sh4_translate_init(void);

SuperHCPU *cpu_sh4_init(const char *cpu_model);

int cpu_sh4_signal_handler(int host_signum, void *pinfo,

                           void *puc);

int superh_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw,
@@ -269,7 +268,7 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong addr); 


void cpu_load_tlb(CPUSH4State * env);



#define cpu_init(cpu_model) CPU(cpu_sh4_init(cpu_model))

#define cpu_init(cpu_model) cpu_generic_init(TYPE_SUPERH_CPU, cpu_model)



#define cpu_signal_handler cpu_sh4_signal_handler

#define cpu_list sh4_cpu_list