From c0c1dc992584b8ccbae0e8f8b09124b76662633b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 8 Feb 2011 18:18:19 +0100 Subject: cris, microblaze: use cpu_has_work Signed-off-by: Paolo Bonzini Signed-off-by: Edgar E. Iglesias --- target-cris/exec.h | 4 +--- target-microblaze/exec.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/target-cris/exec.h b/target-cris/exec.h index 93ce768..34c0132 100644 --- a/target-cris/exec.h +++ b/target-cris/exec.h @@ -37,9 +37,7 @@ static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - /* IRQ, NMI and GURU execeptions wakes us up. */ - if (env->interrupt_request - & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } diff --git a/target-microblaze/exec.h b/target-microblaze/exec.h index 87b2494..ab19828 100644 --- a/target-microblaze/exec.h +++ b/target-microblaze/exec.h @@ -36,9 +36,7 @@ static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - /* IRQ, NMI and GURU execeptions wakes us up. */ - if (env->interrupt_request - & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } -- cgit v1.1