aboutsummaryrefslogtreecommitdiff
path: root/tcg
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2013-04-21 00:42:56 +0200
committerAurelien Jarno <aurelien@aurel32.net>2013-04-27 01:10:18 +0200
commited605126a8d826e60587cc21d9e7b95e8c49b6f6 (patch)
treeb92dba459de831df8b2e950e178ee70f6d080bf8 /tcg
parent909eedb74f88d1d6d9e6bbdc34875772e7a8a5ab (diff)
downloadqemu-ed605126a8d826e60587cc21d9e7b95e8c49b6f6.zip
qemu-ed605126a8d826e60587cc21d9e7b95e8c49b6f6.tar.gz
qemu-ed605126a8d826e60587cc21d9e7b95e8c49b6f6.tar.bz2
tcg: fix deposit_i64 op on 32-bit targets
On 32-bit TCG targets, when emulating deposit_i64 with a mov_i32 + deposit_i32, care should be taken to not overwrite the low part of the second argument before the deposit when it is the same the destination. This fixes the shld instruction in qemu-system-x86_64, which in turns fixes booting "system rescue CD version 2.8.0" on this target. Reported-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'tcg')
-rw-r--r--tcg/tcg-op.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
index d70b2eb..94f6043 100644
--- a/tcg/tcg-op.h
+++ b/tcg/tcg-op.h
@@ -2188,9 +2188,9 @@ 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);
+ tcg_gen_mov_i32(TCGV_LOW(ret), TCGV_LOW(arg1));
return;
}
if (ofs + len <= 32) {