Commit 1d197417 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

lm32: replace cpu_lm32_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>
Acked-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-22-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent a7a1c09b

hw/lm32/lm32_boards.c

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void lm32_evr_init(MachineState *machine) 
    if (cpu_model == NULL) {

        cpu_model = "lm32-full";

    }

    cpu = cpu_lm32_init(cpu_model);

    cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));

    if (cpu == NULL) {

        fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);

        exit(1);
@@ -205,7 +205,7 @@ static void lm32_uclinux_init(MachineState *machine) 
    if (cpu_model == NULL) {

        cpu_model = "lm32-full";

    }

    cpu = cpu_lm32_init(cpu_model);

    cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));

    if (cpu == NULL) {

        fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);

        exit(1);

hw/lm32/milkymist.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ milkymist_init(MachineState *machine) 
    if (cpu_model == NULL) {

        cpu_model = "lm32-full";

    }

    cpu = cpu_lm32_init(cpu_model);

    cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));

    if (cpu == NULL) {

        fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);

        exit(1);

target/lm32/cpu.h

+1 −2
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ static inline lm32_wp_t lm32_wp_type(uint32_t dc, int idx) 
    return (dc >> (idx+1)*2) & 0x3;

}



LM32CPU *cpu_lm32_init(const char *cpu_model);

/* you can call this signal handler from your SIGBUS and SIGSEGV

   signal handlers to inform the virtual CPU of exceptions. non zero

   is returned if the signal was handled by the virtual CPU.  */
@@ -256,7 +255,7 @@ void lm32_watchpoint_insert(CPULM32State *env, int index, target_ulong address, 
void lm32_watchpoint_remove(CPULM32State *env, int index);

bool lm32_cpu_do_semihosting(CPUState *cs);



#define cpu_init(cpu_model) CPU(cpu_lm32_init(cpu_model))

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



#define cpu_list lm32_cpu_list

#define cpu_signal_handler cpu_lm32_signal_handler

target/lm32/helper.c

+0 −5
Original line number Diff line number Diff line
@@ -219,11 +219,6 @@ bool lm32_cpu_exec_interrupt(CPUState *cs, int interrupt_request) 
    return false;

}



LM32CPU *cpu_lm32_init(const char *cpu_model)

{

    return LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));

}



/* Some soc ignores the MSB on the address bus. Thus creating a shadow memory

 * area. As a general rule, 0x00000000-0x7fffffff is cached, whereas

 * 0x80000000-0xffffffff is not cached and used to access IO devices. */