diff options
author | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2010-02-15 11:17:33 +0100 |
---|---|---|
committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2010-02-15 11:17:33 +0100 |
commit | fb9fb692312a84ebc6e9c10da6f374c5871ff7b0 (patch) | |
tree | 58df9453e9d63464976dcfc6890bcc211619af06 /cpu-exec.c | |
parent | 204ff57128532207893f170dab4db158f2ca7024 (diff) |
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>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r-- | cpu-exec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 0256edf1f3..6a290fd6cd 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -497,7 +497,8 @@ int cpu_exec(CPUState *env1) } #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; |