commit fb9fb692312a84ebc6e9c10da6f374c5871ff7b0
author Edgar E. Iglesias <edgar.iglesias@gmail.com> Mon Feb 15 11:17:33 2010 +0100
committer Edgar E. Iglesias <edgar.iglesias@gmail.com> Mon Feb 15 11:17:33 2010 +0100
tree 58df9453e9d63464976dcfc6890bcc211619af06
parent 204ff57128532207893f170dab4db158f2ca7024

cris: Prepare for CRISv10.

* Add prefix flag and special reg.
* Add interrupt lockout.
* Add CC_OP_MSTEP.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index 0256edf..6a290fd 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -497,7 +497,8 @@
                     }
 #elif defined(TARGET_CRIS)
                     if (interrupt_request & CPU_INTERRUPT_HARD
-                        && (env->pregs[PR_CCS] & I_FLAG)) {
+                        && (env->pregs[PR_CCS] & I_FLAG)
+                        && !env->locked_irq) {
                         env->exception_index = EXCP_IRQ;
                         do_interrupt(env);
                         next_tb = 0;