[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] tcg-sparc: Fix qemu_st for 32-bit
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 04/12] tcg-sparc: Fix qemu_st for 32-bit |
Date: |
Wed, 26 Sep 2012 18:55:34 -0700 |
The datalo variable is still live in the miss path. Use another
when reconstructing the full data value.
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/sparc/tcg-target.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
index 9d4b11a..e55b792 100644
--- a/tcg/sparc/tcg-target.c
+++ b/tcg/sparc/tcg-target.c
@@ -985,7 +985,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg
*args, int sizeop)
{
int addrlo_idx = 1, datalo, datahi, addr_reg;
#if defined(CONFIG_SOFTMMU)
- int memi_idx, memi, n;
+ int memi_idx, memi, n, datafull;
uint32_t *label_ptr;
#endif
@@ -1002,12 +1002,13 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg
*args, int sizeop)
addr_reg = tcg_out_tlb_load(s, addrlo_idx, memi, sizeop, args,
offsetof(CPUTLBEntry, addr_write));
+ datafull = datalo;
if (TCG_TARGET_REG_BITS == 32 && sizeop == 3) {
/* Reconstruct the full 64-bit value. */
tcg_out_arithi(s, TCG_REG_T1, datalo, 0, SHIFT_SRL);
tcg_out_arithi(s, TCG_REG_O2, datahi, 32, SHIFT_SLLX);
tcg_out_arith(s, TCG_REG_O2, TCG_REG_T1, TCG_REG_O2, ARITH_OR);
- datalo = TCG_REG_O2;
+ datafull = TCG_REG_O2;
}
/* The fast path is exactly one insn. Thus we can perform the entire
@@ -1018,7 +1019,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg
*args, int sizeop)
| ((TARGET_LONG_BITS == 64) << 21)
| (1 << 29) | (1 << 19)));
/* delay slot */
- tcg_out_ldst_rr(s, datalo, addr_reg, TCG_REG_O1, qemu_st_opc[sizeop]);
+ tcg_out_ldst_rr(s, datafull, addr_reg, TCG_REG_O1, qemu_st_opc[sizeop]);
/* TLB Miss. */
--
1.7.11.4
- [Qemu-devel] [PATCH 00/12] tcg-sparc fixes and improvements, Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 01/12] tcg-sparc: Fix brcond2, Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 03/12] tcg-sparc: Fix setcond2, Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 02/12] tcg-sparc: Implement movcond., Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 04/12] tcg-sparc: Fix qemu_st for 32-bit,
Richard Henderson <=
- [Qemu-devel] [PATCH 06/12] tcg-sparc: Fix add2/sub2, Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 05/12] tcg-sparc: Fix setcond, Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 08/12] tcg-sparc: Optimize setcond2 equality compare with 0., Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 07/12] tcg-sparc: Use Z constraint for %g0, Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 11/12] tcg-sparc: Emit BPr insns for brcond_i64, Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 09/12] tcg-sparc: Drop use of Bicc in favor of BPcc, Richard Henderson, 2012/09/26
- [Qemu-devel] [PATCH 12/12] tcg-sparc: Emit MOVR insns for setcond_i64 and movcond_64, Richard Henderson, 2012/09/26