diff options
Diffstat (limited to 'target-ppc')
-rw-r--r-- | target-ppc/exec.h | 10 | ||||
-rw-r--r-- | target-ppc/op_helper.c | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/target-ppc/exec.h b/target-ppc/exec.h index 4f5abe906a..ee5183eb72 100644 --- a/target-ppc/exec.h +++ b/target-ppc/exec.h @@ -122,4 +122,14 @@ static inline void regs_to_env(void) int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw, int is_user, int is_softmmu); +static inline int cpu_halted(CPUState *env) { + if (!env->halted) + return 0; + if (env->msr[MSR_EE] && (env->interrupt_request & CPU_INTERRUPT_HARD)) { + env->halted = 0; + return 0; + } + return EXCP_HALTED; +} + #endif /* !defined (__PPC_H__) */ diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index ee46253c79..63180b61e1 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -40,10 +40,6 @@ /*****************************************************************************/ /* Exceptions processing helpers */ -void cpu_loop_exit (void) -{ - longjmp(env->jmp_env, 1); -} void do_raise_exception_err (uint32_t exception, int error_code) { |