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 acb0dffed6244c715bb24551595779d48fd86d0f..8acb003d53d52ffad01f5236e8c8b9a85e2172eb 100644 (file)
--- 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
 }