summaryrefslogtreecommitdiffstats
path: root/tcg/sparc/tcg-target.c
diff options
context:
space:
mode:
authorblueswir12008-09-13 22:07:53 +0200
committerblueswir12008-09-13 22:07:53 +0200
commit9d0efc88e422d6c477e958254c3cc63ea8ca309e (patch)
treeebfae4674f38b3f5d3aa43922a443d915ca483fb /tcg/sparc/tcg-target.c
parentFix stack alignment on Sparc32 host (diff)
downloadqemu-9d0efc88e422d6c477e958254c3cc63ea8ca309e.tar.gz
qemu-9d0efc88e422d6c477e958254c3cc63ea8ca309e.tar.xz
qemu-9d0efc88e422d6c477e958254c3cc63ea8ca309e.zip
Use 64 bit loads for tlb addend only if addend size is 64 bits
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5203 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'tcg/sparc/tcg-target.c')
-rw-r--r--tcg/sparc/tcg-target.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
index 861ed8e3d3..f36796d3d8 100644
--- a/tcg/sparc/tcg-target.c
+++ b/tcg/sparc/tcg-target.c
@@ -496,6 +496,12 @@ static const void * const qemu_st_helpers[4] = {
#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 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,
/* 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 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,
/* 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 */