From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KE5RG-0006Of-UA
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 12:44:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KE5RF-0006OS-5t
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 12:44:13 -0400
Received: from [199.232.76.173] (port=34170 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KE5RE-0006ON-V3
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 12:44:12 -0400
Received: from savannah.gnu.org ([199.232.41.3]:48191 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <paul@nowt.org>) id 1KE5RE-0007zo-GJ
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 12:44:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63) (envelope-from <paul@nowt.org>)
	id 1KE5RC-0005Wr-C5
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 16:44:10 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <pbrook@savannah.gnu.org>) id 1KE5RC-0005Wf-3H
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 16:44:10 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1KE5RC-0005Wf-3H@cvs.savannah.gnu.org>
Date: Wed, 02 Jul 2008 16:44:10 +0000
Subject: [Qemu-devel] [4823] ARMv7-M interrupt stack alignment fix.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4823
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4823
Author:   pbrook
Date:     2008-07-02 16:44:09 +0000 (Wed, 02 Jul 2008)

Log Message:
-----------
ARMv7-M interrupt stack alignment fix.

Modified Paths:
--------------
    trunk/target-arm/helper.c

Modified: trunk/target-arm/helper.c
===================================================================
--- trunk/target-arm/helper.c	2008-07-02 15:17:21 UTC (rev 4822)
+++ trunk/target-arm/helper.c	2008-07-02 16:44:09 UTC (rev 4823)
@@ -674,7 +674,7 @@
     /* ??? Should only do this if Configuration Control Register
        STACKALIGN bit is set.  */
     if (env->regs[13] & 4) {
-        env->regs[13] += 4;
+        env->regs[13] -= 4;
         xpsr |= 0x200;
     }
     /* Switch to the handler mode.  */