From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JmGsH-0004BA-Ld
	for qemu-devel@nongnu.org; Wed, 16 Apr 2008 19:17:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JmGsG-0004Ac-Mp
	for qemu-devel@nongnu.org; Wed, 16 Apr 2008 19:17:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JmGsG-0004AW-Hf
	for qemu-devel@nongnu.org; Wed, 16 Apr 2008 19:17:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] 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 <balrogg@gmail.com>) id 1JmGsF-0002im-JV
	for qemu-devel@nongnu.org; Wed, 16 Apr 2008 19:17:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <balrogg@gmail.com>) id 1JmGsE-0004s0-GO
	for qemu-devel@nongnu.org; Wed, 16 Apr 2008 23:17:06 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1JmGsD-0004ru-56
	for qemu-devel@nongnu.org; Wed, 16 Apr 2008 23:17:05 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1JmGsD-0004ru-56@cvs.savannah.gnu.org>
Date: Wed, 16 Apr 2008 23:17:05 +0000
Subject: [Qemu-devel] [4217] Save the exact SWI return address in Thumb mode.
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: 4217
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4217
Author:   balrog
Date:     2008-04-16 23:17:02 +0000 (Wed, 16 Apr 2008)

Log Message:
-----------
Save the exact SWI return address in Thumb mode.

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

Modified: trunk/target-arm/translate.c
===================================================================
--- trunk/target-arm/translate.c	2008-04-16 23:07:32 UTC (rev 4216)
+++ trunk/target-arm/translate.c	2008-04-16 23:17:02 UTC (rev 4217)
@@ -8492,7 +8492,7 @@
         if (cond == 0xf) {
             /* swi */
             gen_set_condexec(s);
-            gen_set_pc_im(s->pc | 1);
+            gen_set_pc_im(s->pc);
             s->is_jmp = DISAS_SWI;
             break;
         }