diff options
| author | edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-07 12:36:06 +0000 |
|---|---|---|
| committer | edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-07 12:36:06 +0000 |
| commit | 69b5cae1c08dce6084d85bb407664c51920d0750 (patch) | |
| tree | 143a625d99df9751c3416d319d779a03807f674c /target-cris/exec.h | |
| parent | 213fb478f80a493f5f25b45d7a5763c8d81ca140 (diff) | |
CRIS: NMI wakes up the core.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6201 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-cris/exec.h')
| -rw-r--r-- | target-cris/exec.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/target-cris/exec.h b/target-cris/exec.h index d328bf60ab..cce87f6a08 100644 --- a/target-cris/exec.h +++ b/target-cris/exec.h @@ -46,7 +46,10 @@ void helper_movec(CPUCRISState *env, int reg, uint32_t val); static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - if (env->interrupt_request & CPU_INTERRUPT_HARD) { + + /* IRQ, NMI and GURU execeptions wakes us up. */ + if (env->interrupt_request + & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) { env->halted = 0; return 0; } |