From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfw-00074P-G3 for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xccfp-000840-Qc for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:16 -0400 Received: from mail-oi0-f48.google.com ([209.85.218.48]:34857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfp-00083o-NC for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:09 -0400 Received: by mail-oi0-f48.google.com with SMTP id g201so7087225oib.35 for ; Fri, 10 Oct 2014 09:04:09 -0700 (PDT) From: Greg Bellows Date: Fri, 10 Oct 2014 11:03:26 -0500 Message-Id: <1412957023-11105-16-git-send-email-greg.bellows@linaro.org> In-Reply-To: <1412957023-11105-1-git-send-email-greg.bellows@linaro.org> References: <1412957023-11105-1-git-send-email-greg.bellows@linaro.org> Subject: [Qemu-devel] [PATCH v6 15/32] target-arm: implement IRQ/FIQ routing to Monitor mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch From: Fabian Aggeler SCR.{IRQ/FIQ} bits allow to route IRQ/FIQ exceptions to monitor CPU mode. When taking IRQ exception to monitor mode FIQ exception is additionally masked. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows --- target-arm/helper.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index a831b40..760e3f9 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -4211,12 +4211,21 @@ void arm_cpu_do_interrupt(CPUState *cs) /* Disable IRQ and imprecise data aborts. */ mask = CPSR_A | CPSR_I; offset = 4; + if (env->cp15.scr_el3 & SCR_IRQ) { + /* IRQ routed to monitor mode */ + new_mode = ARM_CPU_MODE_MON; + mask |= CPSR_F; + } break; case EXCP_FIQ: new_mode = ARM_CPU_MODE_FIQ; addr = 0x1c; /* Disable FIQ, IRQ and imprecise data aborts. */ mask = CPSR_A | CPSR_I | CPSR_F; + if (env->cp15.scr_el3 & SCR_FIQ) { + /* FIQ routed to monitor mode */ + new_mode = ARM_CPU_MODE_MON; + } offset = 4; break; case EXCP_SMC: -- 1.8.3.2