From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L9KSX-0002Yw-Pw
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 09:18:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L9KSW-0002YH-1R
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 09:18:08 -0500
Received: from [199.232.76.173] (port=37125 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L9KSU-0002Y0-VW
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 09:18:07 -0500
Received: from savannah.gnu.org ([199.232.41.3]:35608 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 1L9KSU-00082X-Nr
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 09:18:06 -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 1L9KST-00017d-3R
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 14:18:05 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1L9KSS-00017W-4p
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 14:18:04 +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: <E1L9KSS-00017W-4p@cvs.savannah.gnu.org>
Date: Sun, 07 Dec 2008 14:18:04 +0000
Subject: [Qemu-devel] [5913] ARM: fix smmul and smmla/smmls 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: 5913
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5913
Author:   balrog
Date:     2008-12-07 14:18:02 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
ARM: fix smmul and smmla/smmls usage of registers (Mans Rullgard).

This fixes the destination and accumulator registers for the smmul
and smmla instructions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Acked-by: Laurent Desnogues <laurent.desnogues@gmail.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 14:03:27 UTC (rev 5912)
+++ trunk/target-arm/translate.c	2008-12-07 14:18:02 UTC (rev 5913)
@@ -6507,8 +6507,8 @@
                         tcg_gen_shri_i64(tmp64, tmp64, 32);
                         tmp = new_tmp();
                         tcg_gen_trunc_i64_i32(tmp, tmp64);
-                        if (rn != 15) {
-                            tmp2 = load_reg(s, rn);
+                        if (rd != 15) {
+                            tmp2 = load_reg(s, rd);
                             if (insn & (1 << 6)) {
                                 tcg_gen_sub_i32(tmp, tmp, tmp2);
                             } else {
@@ -6516,7 +6516,7 @@
                             }
                             dead_tmp(tmp2);
                         }
-                        store_reg(s, rd, tmp);
+                        store_reg(s, rn, tmp);
                     } else {
                         if (insn & (1 << 5))
                             gen_swap_half(tmp2);