From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KebPS-0001R5-Rw
	for qemu-devel@nongnu.org; Sat, 13 Sep 2008 16:07:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KebPR-0001PL-01
	for qemu-devel@nongnu.org; Sat, 13 Sep 2008 16:07:57 -0400
Received: from [199.232.76.173] (port=49144 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KebPQ-0001P2-Nu
	for qemu-devel@nongnu.org; Sat, 13 Sep 2008 16:07:56 -0400
Received: from savannah.gnu.org ([199.232.41.3]:52137 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 1KebPO-00038C-Se
	for qemu-devel@nongnu.org; Sat, 13 Sep 2008 16:07:55 -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 1KebPN-0004YX-O0
	for qemu-devel@nongnu.org; Sat, 13 Sep 2008 20:07:53 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1KebPN-0004YT-IP
	for qemu-devel@nongnu.org; Sat, 13 Sep 2008 20:07:53 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1KebPN-0004YT-IP@cvs.savannah.gnu.org>
Date: Sat, 13 Sep 2008 20:07:53 +0000
Subject: [Qemu-devel] [5203] Use 64 bit loads for tlb addend only if addend
	size is 64 bits
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: 5203
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5203
Author:   blueswir1
Date:     2008-09-13 20:07:53 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
Use 64 bit loads for tlb addend only if addend size is 64 bits

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

Modified: trunk/tcg/sparc/tcg-target.c
===================================================================
--- trunk/tcg/sparc/tcg-target.c	2008-09-13 20:05:32 UTC (rev 5202)
+++ trunk/tcg/sparc/tcg-target.c	2008-09-13 20:07:53 UTC (rev 5203)
@@ -496,6 +496,12 @@
 #define TARGET_LD_OP LDX
 #endif
 
+#if TARGET_PHYS_ADDR_BITS == 32
+#define TARGET_ADDEND_LD_OP LDUW
+#else
+#define TARGET_ADDEND_LD_OP LDX
+#endif
+
 #ifdef __arch64__
 #define HOST_LD_OP LDX
 #define HOST_ST_OP STX
@@ -623,7 +629,7 @@
 
     /* ld [arg1 + x], arg1 */
     tcg_out_ldst(s, arg1, arg1, offsetof(CPUTLBEntry, addend) -
-                 offsetof(CPUTLBEntry, addr_read), HOST_LD_OP);
+                 offsetof(CPUTLBEntry, addr_read), TARGET_ADDEND_LD_OP);
 
 #if TARGET_LONG_BITS == 32
     /* and addr_reg, x, arg0 */
@@ -792,7 +798,7 @@
 
     /* ld [arg1 + x], arg1 */
     tcg_out_ldst(s, arg1, arg1, offsetof(CPUTLBEntry, addend) -
-                 offsetof(CPUTLBEntry, addr_write), HOST_LD_OP);
+                 offsetof(CPUTLBEntry, addr_write), TARGET_ADDEND_LD_OP);
 
 #if TARGET_LONG_BITS == 32
     /* and addr_reg, x, arg0 */