diff options
| author | Dunrong Huang <huangdr@cloud-times.com> | 2013-03-31 09:35:53 +0800 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-31 18:26:31 +0000 |
| commit | 5357406415571b3f03d05b60a143afdea2b9b1b9 (patch) | |
| tree | 20761639777b4ade7f1470a4cb39195bae4ad0f2 | |
| parent | 5e3a0f418c4d57399778cee0b55aebfb663b6425 (diff) | |
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: Dunrong Huang <huangdr@cloud-times.com>
Signed-of-by: Anthony Green <green@moxielogic.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | target-moxie/cpu.c | 1 | ||||
| -rw-r--r-- | target-moxie/cpu.h | 2 | ||||
| -rw-r--r-- | target-moxie/helper.c | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c index c17d3f0bb..c0855f057 100644 --- a/target-moxie/cpu.c +++ b/target-moxie/cpu.c @@ -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) diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h index b96236f76..988729a06 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -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); diff --git a/target-moxie/helper.c b/target-moxie/helper.c index 8604ce844..6e0ac2aa2 100644 --- a/target-moxie/helper.c +++ b/target-moxie/helper.c @@ -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; |