Patchwork [v2,06/27] tcg-ppc64: Introduce and use tcg_out_shri64

login
register
mail settings
Submitter Richard Henderson
Date March 5, 2013, 12:32 a.m.
Message ID <1362443590-28191-7-git-send-email-rth@twiddle.net>
Download mbox | patch
Permalink /patch/224884/
State New
Headers show

Comments

Richard Henderson - March 5, 2013, 12:32 a.m.
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/ppc64/tcg-target.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Aurelien Jarno - April 1, 2013, 2:52 p.m.
On Mon, Mar 04, 2013 at 04:32:49PM -0800, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
>  tcg/ppc64/tcg-target.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
> index 9199ac4..82e1da7 100644
> --- a/tcg/ppc64/tcg-target.c
> +++ b/tcg/ppc64/tcg-target.c
> @@ -461,6 +461,11 @@ static inline void tcg_out_shli64(TCGContext *s, TCGReg dst, TCGReg src, int c)
>      tcg_out_rld(s, RLDICR, dst, src, c, 63 - c);
>  }
>  
> +static inline void tcg_out_shri64(TCGContext *s, TCGReg dst, TCGReg src, int c)
> +{
> +    tcg_out_rld(s, RLDICL, dst, src, 64 - c, c);
> +}
> +
>  static void tcg_out_movi32(TCGContext *s, TCGReg ret, int32_t arg)
>  {
>      if (arg == (int16_t) arg)
> @@ -864,7 +869,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc)
>          if (bswap) {
>              tcg_out32 (s, STWBRX | SAB (data_reg, rbase, r0));
>              tcg_out32 (s, ADDI | RT (r1) | RA (r0) | 4);
> -            tcg_out_rld (s, RLDICL, 0, data_reg, 32, 0);
> +            tcg_out_shri64(s, 0, data_reg, 32);
>              tcg_out32 (s, STWBRX | SAB (0, rbase, r1));
>          }
>          else tcg_out32 (s, STDX | SAB (data_reg, rbase, r0));
> @@ -1455,7 +1460,7 @@ static void tcg_out_op (TCGContext *s, TCGOpcode opc, const TCGArg *args,
>          break;
>      case INDEX_op_shr_i64:
>          if (const_args[2])
> -            tcg_out_rld (s, RLDICL, args[0], args[1], 64 - args[2], args[2]);
> +            tcg_out_shri64(s, args[0], args[1], args[2]);
>          else
>              tcg_out32 (s, SRD | SAB (args[1], args[0], args[2]));
>          break;

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>

Patch

diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index 9199ac4..82e1da7 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -461,6 +461,11 @@  static inline void tcg_out_shli64(TCGContext *s, TCGReg dst, TCGReg src, int c)
     tcg_out_rld(s, RLDICR, dst, src, c, 63 - c);
 }
 
+static inline void tcg_out_shri64(TCGContext *s, TCGReg dst, TCGReg src, int c)
+{
+    tcg_out_rld(s, RLDICL, dst, src, 64 - c, c);
+}
+
 static void tcg_out_movi32(TCGContext *s, TCGReg ret, int32_t arg)
 {
     if (arg == (int16_t) arg)
@@ -864,7 +869,7 @@  static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc)
         if (bswap) {
             tcg_out32 (s, STWBRX | SAB (data_reg, rbase, r0));
             tcg_out32 (s, ADDI | RT (r1) | RA (r0) | 4);
-            tcg_out_rld (s, RLDICL, 0, data_reg, 32, 0);
+            tcg_out_shri64(s, 0, data_reg, 32);
             tcg_out32 (s, STWBRX | SAB (0, rbase, r1));
         }
         else tcg_out32 (s, STDX | SAB (data_reg, rbase, r0));
@@ -1455,7 +1460,7 @@  static void tcg_out_op (TCGContext *s, TCGOpcode opc, const TCGArg *args,
         break;
     case INDEX_op_shr_i64:
         if (const_args[2])
-            tcg_out_rld (s, RLDICL, args[0], args[1], 64 - args[2], args[2]);
+            tcg_out_shri64(s, args[0], args[1], args[2]);
         else
             tcg_out32 (s, SRD | SAB (args[1], args[0], args[2]));
         break;