From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui5cf-0006sb-U4 for qemu-devel@nongnu.org; Thu, 30 May 2013 12:22:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ui5ca-0008Gm-Ts for qemu-devel@nongnu.org; Thu, 30 May 2013 12:22:41 -0400 Received: from mel.act-europe.fr ([194.98.77.210]:52762 helo=smtp.eu.adacore.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui5ca-0008Ea-MY for qemu-devel@nongnu.org; Thu, 30 May 2013 12:22:36 -0400 From: Fabien Chouteau Date: Thu, 30 May 2013 18:22:30 +0200 Message-Id: <1369930950-18564-1-git-send-email-chouteau@adacore.com> Subject: [Qemu-devel] [PATCH] ARM: Fix disable interrupt for M profile List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net I'm not sure this was expected or not, but it looks like the "||" should be a "&&". Otherwise it's not possible to disable interrupt. Signed-off-by: Fabien Chouteau --- cpu-exec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 31c089d..079b6f0 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -462,8 +462,8 @@ int cpu_exec(CPUArchState *env) We avoid this by disabling interrupts when pc contains a magic address. */ if (interrupt_request & CPU_INTERRUPT_HARD - && ((IS_M(env) && env->regs[15] < 0xfffffff0) - || !(env->uncached_cpsr & CPSR_I))) { + && (IS_M(env) && env->regs[15] < 0xfffffff0) + && !(env->uncached_cpsr & CPSR_I)) { env->exception_index = EXCP_IRQ; cc->do_interrupt(cpu); next_tb = 0; -- 1.7.9.5