[Qemu-devel] [5203] Use 64 bit loads for tlb addend only if addend size is 64 bits

[Blue Swirl]

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 */