From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue, 23 Sep 2008 22:31:10 +0000 (+0000)
Subject: Fix tcg_gen_concat32_i64 on 64-bit hosts.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=88422e2ebdcdb5bf877ed0084086180570b4b52f;p=qemu.git

Fix tcg_gen_concat32_i64 on 64-bit hosts.

Signed-off-by: Paul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5306 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
index acb0dffed6..8acb003d53 100644
--- a/tcg/tcg-op.h
+++ b/tcg/tcg-op.h
@@ -1418,8 +1418,9 @@ static inline void tcg_gen_concat32_i64(TCGv dest, TCGv low, TCGv high)
     tcg_gen_concat_i32_i64(dest, low, high);
 #else
     TCGv tmp = tcg_temp_new(TCG_TYPE_I64);
+    tcg_gen_ext32u_i64(dest, low);
     tcg_gen_shli_i64(tmp, high, 32);
-    tcg_gen_or_i64(dest, low, tmp);
+    tcg_gen_or_i64(dest, dest, tmp);
     tcg_temp_free(tmp);
 #endif
 }