gwj / at91sam9263 · Commits

Commit 69b5cae1c08dce6084d85bb407664c51920d0750

Authored by edgar_igl
1 parent 213fb478

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
Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
target-cris/exec.h
  View file @69b5cae
@@ -46,7 +46,10 @@ void helper_movec(CPUCRISState *env, int reg, uint32_t val); @@ -46,7 +46,10 @@ void helper_movec(CPUCRISState *env, int reg, uint32_t val);
46 static inline int cpu_halted(CPUState *env) { 46 static inline int cpu_halted(CPUState *env) {
47 if (!env->halted) 47 if (!env->halted)
48 return 0; 48 return 0;
49 - if (env->interrupt_request & CPU_INTERRUPT_HARD) { 49 +
  50 + /* IRQ, NMI and GURU execeptions wakes us up. */
  51 + if (env->interrupt_request
  52 + & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
50 env->halted = 0; 53 env->halted = 0;
51 return 0; 54 return 0;
52 } 55 }