Commit 13b884e1 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

unicore32: replace uc32_cpu_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-25-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent f6f8b260

hw/unicore32/puv3.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void puv3_init(MachineState *machine) 
        cpu_model = "UniCore-II";

    }



    cpu = uc32_cpu_init(cpu_model);

    cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));

    if (!cpu) {

        error_report("Unable to find CPU definition");

        exit(1);

target/unicore32/cpu.h

+1 −3
Original line number Diff line number Diff line
@@ -165,9 +165,7 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch) 


#include "exec/cpu-all.h"



UniCore32CPU *uc32_cpu_init(const char *cpu_model);



#define cpu_init(cpu_model) CPU(uc32_cpu_init(cpu_model))

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



static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong *pc,

                                        target_ulong *cs_base, uint32_t *flags)

target/unicore32/helper.c

+0 −5
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ 
#define DPRINTF(fmt, ...) do {} while (0)

#endif



UniCore32CPU *uc32_cpu_init(const char *cpu_model)

{

    return UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));

}



#ifndef CONFIG_USER_ONLY

void helper_cp0_set(CPUUniCore32State *env, uint32_t val, uint32_t creg,

        uint32_t cop)