Commit 673a11ca authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

cris: replace cpu_cris_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-20-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 701e3c78

hw/cris/axis_dev88.c

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

        cpu_model = "crisv32";

    }

    cpu = cpu_cris_init(cpu_model);

    cpu = CRIS_CPU(cpu_generic_init(TYPE_CRIS_CPU, cpu_model));

    env = &cpu->env;



    /* allocate RAM */

target/cris/cpu.c

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

}



CRISCPU *cpu_cris_init(const char *cpu_model)

{

    return CRIS_CPU(cpu_generic_init(TYPE_CRIS_CPU, cpu_model));

}



/* Sort alphabetically by VR. */

static gint cris_cpu_list_compare(gconstpointer a, gconstpointer b)

{

target/cris/cpu.h

+1 −2
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ int crisv10_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); 
int cris_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);

int cris_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);



CRISCPU *cpu_cris_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.  */
@@ -268,7 +267,7 @@ enum { 
#define TARGET_PHYS_ADDR_SPACE_BITS 32

#define TARGET_VIRT_ADDR_SPACE_BITS 32



#define cpu_init(cpu_model) CPU(cpu_cris_init(cpu_model))

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



#define cpu_signal_handler cpu_cris_signal_handler