From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L9KEM-0004Qq-OS
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 09:03:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L9KEL-0004PZ-Vg
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 09:03:30 -0500
Received: from [199.232.76.173] (port=53946 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L9KEL-0004PP-NU
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 09:03:29 -0500
Received: from savannah.gnu.org ([199.232.41.3]:55861 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 <INVALID.NOREPLY@gnu.org>)
	id 1L9KEL-00065B-5D
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 09:03:29 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L9KEK-0000NT-FW
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 14:03:28 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1L9KEK-0000NO-4o
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 14:03:28 +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: <E1L9KEK-0000NO-4o@cvs.savannah.gnu.org>
Date: Sun, 07 Dec 2008 14:03:28 +0000
Subject: [Qemu-devel] [5912] ARM: fix usad8 and usada8 usage of registers
	(Mans Rullgard).
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: 5912
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5912
Author:   balrog
Date:     2008-12-07 14:03:27 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
ARM: fix usad8 and usada8 usage of registers (Mans Rullgard).

This fixes the destination and accumulator registers for the usad8
and usada8 instructions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>

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

Modified: trunk/target-arm/translate.c
===================================================================
--- trunk/target-arm/translate.c	2008-12-07 13:40:38 UTC (rev 5911)
+++ trunk/target-arm/translate.c	2008-12-07 14:03:27 UTC (rev 5912)
@@ -6556,12 +6556,12 @@
                         tmp2 = load_reg(s, rs);
                         gen_helper_usad8(tmp, tmp, tmp2);
                         dead_tmp(tmp2);
-                        if (rn != 15) {
-                            tmp2 = load_reg(s, rn);
+                        if (rd != 15) {
+                            tmp2 = load_reg(s, rd);
                             tcg_gen_add_i32(tmp, tmp, tmp2);
                             dead_tmp(tmp2);
                         }
-                        store_reg(s, rd, tmp);
+                        store_reg(s, rn, tmp);
                         break;
                     case 0x20: case 0x24: case 0x28: case 0x2c:
                         /* Bitfield insert/clear.  */