From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KhZuP-0000dm-0Z
	for qemu-devel@nongnu.org; Sun, 21 Sep 2008 21:08:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KhZuM-0000da-HJ
	for qemu-devel@nongnu.org; Sun, 21 Sep 2008 21:08:11 -0400
Received: from [199.232.76.173] (port=45873 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KhZuM-0000dX-Az
	for qemu-devel@nongnu.org; Sun, 21 Sep 2008 21:08:10 -0400
Received: from savannah.gnu.org ([199.232.41.3]:53229 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 1KhZuM-0000e9-0F
	for qemu-devel@nongnu.org; Sun, 21 Sep 2008 21:08:10 -0400
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 1KhZuL-0001cY-JU
	for qemu-devel@nongnu.org; Mon, 22 Sep 2008 01:08:09 +0000
Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <malc@savannah.gnu.org>) id 1KhZuL-0001cU-AU
	for qemu-devel@nongnu.org; Mon, 22 Sep 2008 01:08:09 +0000
MIME-Version: 1.0
Errors-To: malc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: malc <av1474@comtv.ru>
Message-Id: <E1KhZuL-0001cU-AU@cvs.savannah.gnu.org>
Date: Mon, 22 Sep 2008 01:08:09 +0000
Subject: [Qemu-devel] [5287] Avoid clobbering input register in
	qemu_ld64+bswap+useronly case
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: 5287
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5287
Author:   malc
Date:     2008-09-22 01:08:08 +0000 (Mon, 22 Sep 2008)

Log Message:
-----------
Avoid clobbering input register in qemu_ld64+bswap+useronly case

Modified Paths:
--------------
    trunk/tcg/ppc/tcg-target.c

Modified: trunk/tcg/ppc/tcg-target.c
===================================================================
--- trunk/tcg/ppc/tcg-target.c	2008-09-22 00:52:42 UTC (rev 5286)
+++ trunk/tcg/ppc/tcg-target.c	2008-09-22 01:08:08 UTC (rev 5287)
@@ -474,9 +474,9 @@
 
 static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)
 {
-    int addr_reg, data_reg, data_reg2, r0, mem_index, s_bits, bswap;
+    int addr_reg, data_reg, data_reg2, r0, r1, mem_index, s_bits, bswap;
 #ifdef CONFIG_SOFTMMU
-    int r1, r2;
+    int r2;
     void *label1_ptr, *label2_ptr;
 #endif
 #if TARGET_LONG_BITS == 64
@@ -599,6 +599,7 @@
 
 #else  /* !CONFIG_SOFTMMU */
     r0 = addr_reg;
+    r1 = 3;
 #endif
 
 #ifdef TARGET_WORDS_BIGENDIAN
@@ -632,17 +633,9 @@
         break;
     case 3:
         if (bswap) {
-            if (r0 == data_reg) {
-                tcg_out32 (s, LWBRX | RT (0) | RB (r0));
-                tcg_out32 (s, ADDI | RT (r0) | RA (r0) |  4);
-                tcg_out32 (s, LWBRX | RT (data_reg2) | RB (r0));
-                tcg_out_mov (s, data_reg, 0);
-            }
-            else {
-                tcg_out32 (s, LWBRX | RT (data_reg) | RB (r0));
-                tcg_out32 (s, ADDI | RT (r0) | RA (r0) |  4);
-                tcg_out32 (s, LWBRX | RT (data_reg2) | RB (r0));
-            }
+            tcg_out32 (s, ADDI | RT (r1) | RA (r0) |  4);
+            tcg_out32 (s, LWBRX | RT (data_reg) | RB (r0));
+            tcg_out32 (s, LWBRX | RT (data_reg2) | RB (r1));
         }
         else {
             if (r0 == data_reg2) {