Commit 53574064 authored by Dunrong Huang's avatar Dunrong Huang Committed by Blue Swirl
Browse files

target-moxie: set do_interrupt to a target-specific helper function 



The value of "do_interrupt" member of CPUClass shoule be set to a
target-specific function, or it will lead to a segfault like below:

$ moxie-softmmu/qemu-system-moxie -M moxiesim
Segmentation fault

Cc: Anthony Green <green@moxielogic.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Andreas Färber <afaerber@suse.de>
Signed-off-by: default avatarDunrong Huang <huangdr@cloud-times.com>
Signed-of-by: default avatarAnthony Green <green@moxielogic.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 5e3a0f41

target-moxie/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data) 
    cc->class_by_name = moxie_cpu_class_by_name;



    dc->vmsd = &vmstate_moxie_cpu;

    cc->do_interrupt = moxie_cpu_do_interrupt;

}



static void moxielite_initfn(Object *obj)

target-moxie/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static inline MoxieCPU *moxie_env_get_cpu(CPUMoxieState *env) 


MoxieCPU *cpu_moxie_init(const char *cpu_model);

int cpu_moxie_exec(CPUMoxieState *s);

void do_interrupt(CPUMoxieState *env);

void moxie_cpu_do_interrupt(CPUState *cs);

void moxie_translate_init(void);

int cpu_moxie_signal_handler(int host_signum, void *pinfo,

                             void *puc);

target-moxie/helper.c

+5 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void helper_debug(CPUMoxieState *env) 


#if defined(CONFIG_USER_ONLY)



void do_interrupt(CPUState *env)

void moxie_cpu_do_interrupt(CPUState *env)

{

    env->exception_index = -1;

}
@@ -147,8 +147,11 @@ int cpu_moxie_handle_mmu_fault(CPUMoxieState *env, target_ulong address, 
}





void do_interrupt(CPUMoxieState *env)

void moxie_cpu_do_interrupt(CPUState *cs)

{

    MoxieCPU *cpu = MOXIE_CPU(cs);

    CPUMoxieState *env = &cpu->env;



    switch (env->exception_index) {

    case MOXIE_EX_BREAK:

        break;