diff options
author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-24 18:03:20 +0000 |
---|---|---|
committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-24 18:03:20 +0000 |
commit | 6a4955a813467089549f865600284e6be0d018fc (patch) | |
tree | c5fdcc2861b662217e47f9271b6bf15103e2b793 /target-mips | |
parent | e5d355d12ed417fbde1c707121ec8fb4070d7667 (diff) | |
download | qemu-6a4955a813467089549f865600284e6be0d018fc.zip qemu-6a4955a813467089549f865600284e6be0d018fc.tar.gz qemu-6a4955a813467089549f865600284e6be0d018fc.tar.bz2 |
qemu: per-arch cpu_has_work (Marcelo Tosatti)
Blue Swirl: fix Sparc32 breakage
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7238 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-mips')
-rw-r--r-- | target-mips/exec.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/target-mips/exec.h b/target-mips/exec.h index 18765f9..8a118bb 100644 --- a/target-mips/exec.h +++ b/target-mips/exec.h @@ -33,12 +33,18 @@ static inline void regs_to_env(void) { } +static inline int cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & + (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER)); +} + + static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - if (env->interrupt_request & - (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } |