From: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Date: Sat, 18 Jan 2014 04:07:48 +0000 (+0000)
Subject: cris: Abort when a v10 takes interrupts while in a delayslot
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d66433ffdced6537ab7e6c423a8f14091c51e3e2;p=qemu.git

cris: Abort when a v10 takes interrupts while in a delayslot

This is an internal error as the CRISv10 should mask interrupts
while executing delay slots. Bail out sooner rather than later.

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

diff --git a/target-cris/helper.c b/target-cris/helper.c
index d274b388b8..c940582132 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -126,6 +126,11 @@ void crisv10_cpu_do_interrupt(CPUState *cs)
           env->exception_index,
           cs->interrupt_request);
 
+    if (env->dslot) {
+        /* CRISv10 never takes interrupts while in a delay-slot.  */
+        cpu_abort(env, "CRIS: Interrupt on delay-slot\n");
+    }
+
     assert(!(env->pregs[PR_CCS] & PFIX_FLAG));
     switch (env->exception_index) {
     case EXCP_BREAK: