Patchwork TCG: Revert ppc64 tcg_out_movi32 change

login
register
mail settings
Submitter Andreas Färber
Date Aug. 14, 2010, 8:52 p.m.
Message ID <1281819176-14147-1-git-send-email-andreas.faerber@web.de>
Download mbox | patch
Permalink /patch/61737/
State New
Headers show

Comments

Andreas Färber - Aug. 14, 2010, 8:52 p.m.
3b6dac34161bc0a342336072643c2f6d17e0ec45 apparently broke the ppc64 TCG target
compilation in the code path without guest base.

Reverting this line fixes the build.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: malc <av1474@comtv.ru>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Richard Henderson <rth@twiddle.net>
---
 tcg/ppc64/tcg-target.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
malc - Aug. 14, 2010, 8:58 p.m.
On Sat, 14 Aug 2010, Andreas F?rber wrote:

> 3b6dac34161bc0a342336072643c2f6d17e0ec45 apparently broke the ppc64 TCG target
> compilation in the code path without guest base.

Thanks. Applied.

> 
> Reverting this line fixes the build.
> 
> Signed-off-by: Andreas F?rber <andreas.faerber@web.de>
> Cc: malc <av1474@comtv.ru>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Richard Henderson <rth@twiddle.net>
> ---
>  tcg/ppc64/tcg-target.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
> index 5ba5d05..ebbee34 100644
> --- a/tcg/ppc64/tcg-target.c
> +++ b/tcg/ppc64/tcg-target.c
> @@ -746,7 +746,7 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)
>          else tcg_out32 (s, LDX | TAB (data_reg, rbase, r0));
>  #else
>          if (bswap) {
> -            tcg_out_movi32 (s, TCG_TYPE_I64, 0, 4);
> +            tcg_out_movi32 (s, 0, 4);
>              tcg_out32 (s, LWBRX | RT (data_reg) | RB (r0));
>              tcg_out32 (s, LWBRX | RT (      r1) | RA (r0));
>              tcg_out_rld (s, RLDIMI, data_reg, r1, 32, 0);
>

Patch

diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index 5ba5d05..ebbee34 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -746,7 +746,7 @@  static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)
         else tcg_out32 (s, LDX | TAB (data_reg, rbase, r0));
 #else
         if (bswap) {
-            tcg_out_movi32 (s, TCG_TYPE_I64, 0, 4);
+            tcg_out_movi32 (s, 0, 4);
             tcg_out32 (s, LWBRX | RT (data_reg) | RB (r0));
             tcg_out32 (s, LWBRX | RT (      r1) | RA (r0));
             tcg_out_rld (s, RLDIMI, data_reg, r1, 32, 0);