From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2e9V-0000uB-3t for qemu-devel@nongnu.org; Fri, 04 Nov 2016 09:03:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c2e9U-0007Vw-4y for qemu-devel@nongnu.org; Fri, 04 Nov 2016 09:03:25 -0400 Received: from mail-ua0-x236.google.com ([2607:f8b0:400c:c08::236]:33535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c2e9T-0007Lq-Ux for qemu-devel@nongnu.org; Fri, 04 Nov 2016 09:03:24 -0400 Received: by mail-ua0-x236.google.com with SMTP id 20so65399663uak.0 for ; Fri, 04 Nov 2016 06:03:23 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1478208419-39125-1-git-send-email-julian@codesourcery.com> References: <1478194258-75276-1-git-send-email-julian@codesourcery.com> <1478208419-39125-1-git-send-email-julian@codesourcery.com> From: Peter Maydell Date: Fri, 4 Nov 2016 13:02:53 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH 5/5] Fix typo in arm_cpu_do_interrupt_aarch32. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Julian Brown Cc: QEMU Developers On 3 November 2016 at 21:26, Julian Brown wrote: > This appears to be a typo in arm_cpu_do_interrupt_aarch32 (OR'ing with ~CPSR_E > instead of CPSR_E). > > Signed-off-by: Julian Brown > --- > target-arm/helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target-arm/helper.c b/target-arm/helper.c > index 25b15dc..b5b65ca 100644 > --- a/target-arm/helper.c > +++ b/target-arm/helper.c > @@ -6438,7 +6438,7 @@ static void arm_cpu_do_interrupt_aarch32(CPUState *cs) > /* Set new mode endianness */ > env->uncached_cpsr &= ~CPSR_E; > if (env->cp15.sctlr_el[arm_current_el(env)] & SCTLR_EE) { > - env->uncached_cpsr |= ~CPSR_E; > + env->uncached_cpsr |= CPSR_E; > } > env->daif |= mask; > /* this is a lie, as the was no c1_sys on V4T/V5, but who cares > -- > 1.9.1 This is an obvious bugfix so I've applied it to target-arm.next for 2.8. I tweaked the commit message a bit to say what the effects of the bug were. thanks -- PMM