aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2011-11-01 15:06:42 -0700
committermalc <av1474@comtv.ru>2011-11-02 02:12:27 +0400
commit2f98c9db0b657e198ab106139654bd408f59636c (patch)
tree2113700295d6ef8e9cfa3a3840f9414f7ee95439
parent2ff6458116546ced7ce00cc39423ee30b1477e67 (diff)
downloadqemu-2f98c9db0b657e198ab106139654bd408f59636c.zip
qemu-2f98c9db0b657e198ab106139654bd408f59636c.tar.gz
qemu-2f98c9db0b657e198ab106139654bd408f59636c.tar.bz2
tcg: Fix regression in tcg_gen_deposit_i64.
The error being caused by the failure to copy the other half of the input to the output after having narrowed the deposit operation. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: malc <av1474@comtv.ru>
-rw-r--r--tcg/tcg-op.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
index 24ec7fc..8637fe8 100644
--- a/tcg/tcg-op.h
+++ b/tcg/tcg-op.h
@@ -2090,6 +2090,7 @@ static inline void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1,
#if TCG_TARGET_REG_BITS == 32
if (ofs >= 32) {
+ tcg_gen_mov_i32(TCGV_LOW(ret), TCGV_LOW(arg1));
tcg_gen_deposit_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1),
TCGV_LOW(arg2), ofs - 32, len);
return;
@@ -2097,6 +2098,7 @@ static inline void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1,
if (ofs + len <= 32) {
tcg_gen_deposit_i32(TCGV_LOW(ret), TCGV_LOW(arg1),
TCGV_LOW(arg2), ofs, len);
+ tcg_gen_mov_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1));
return;
}
#endif