From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KNptn-0006XL-Eb
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 10:09:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KNptm-0006X7-QH
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 10:09:59 -0400
Received: from [199.232.76.173] (port=55289 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KNptm-0006X4-N7
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 10:09:58 -0400
Received: from savannah.gnu.org ([199.232.41.3]:39158 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 1KNptm-0005rk-Bk
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 10:09:58 -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 1KNptl-0002Gc-T7
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 14:09:57 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1KNptl-0002GP-Ly
	for qemu-devel@nongnu.org; Tue, 29 Jul 2008 14:09:57 +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: <E1KNptl-0002GP-Ly@cvs.savannah.gnu.org>
Date: Tue, 29 Jul 2008 14:09:57 +0000
Subject: [Qemu-devel] [4967] Unswap qemu-arm data and prefetch abort
 addresses (Laurent Desnogues ).
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: 4967
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4967
Author:   balrog
Date:     2008-07-29 14:09:57 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
Unswap qemu-arm data and prefetch abort addresses (Laurent Desnogues).

Modified Paths:
--------------
    trunk/linux-user/main.c

Modified: trunk/linux-user/main.c
===================================================================
--- trunk/linux-user/main.c	2008-07-29 13:57:48 UTC (rev 4966)
+++ trunk/linux-user/main.c	2008-07-29 14:09:57 UTC (rev 4967)
@@ -709,10 +709,10 @@
             /* just indicate that signals should be handled asap */
             break;
         case EXCP_PREFETCH_ABORT:
-            addr = env->cp15.c6_data;
+            addr = env->cp15.c6_insn;
             goto do_segv;
         case EXCP_DATA_ABORT:
-            addr = env->cp15.c6_insn;
+            addr = env->cp15.c6_data;
             goto do_segv;
         do_segv:
             {