Patchwork tcg-hppa: Support deposit opcode.

login
register
mail settings
Submitter Richard Henderson
Date June 20, 2011, 10:10 p.m.
Message ID <1308607849-20754-1-git-send-email-rth@twiddle.net>
Download mbox | patch
Permalink /patch/101217/
State New
Headers show

Comments

Richard Henderson - June 20, 2011, 10:10 p.m.
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/hppa/tcg-target.c |   24 ++++++++++++++++++++----
 tcg/hppa/tcg-target.h |    1 +
 2 files changed, 21 insertions(+), 4 deletions(-)
Blue Swirl - July 1, 2011, 9:10 p.m.
Thanks, applied.

On Tue, Jun 21, 2011 at 1:10 AM, Richard Henderson <rth@twiddle.net> wrote:
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
>  tcg/hppa/tcg-target.c |   24 ++++++++++++++++++++----
>  tcg/hppa/tcg-target.h |    1 +
>  2 files changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c
> index 95f3316..16423aa 100644
> --- a/tcg/hppa/tcg-target.c
> +++ b/tcg/hppa/tcg-target.c
> @@ -467,6 +467,14 @@ static inline void tcg_out_dep(TCGContext *s, int ret, int arg,
>               | INSN_SHDEP_CP(31 - ofs) | INSN_DEP_LEN(len));
>  }
>
> +static inline void tcg_out_depi(TCGContext *s, int ret, int arg,
> +                                unsigned ofs, unsigned len)
> +{
> +    assert(ofs < 32 && len <= 32 - ofs);
> +    tcg_out32(s, INSN_DEPI | INSN_R2(ret) | INSN_IM5(arg)
> +              | INSN_SHDEP_CP(31 - ofs) | INSN_DEP_LEN(len));
> +}
> +
>  static inline void tcg_out_shd(TCGContext *s, int ret, int hi, int lo,
>                                unsigned count)
>  {
> @@ -499,8 +507,7 @@ static void tcg_out_ori(TCGContext *s, int ret, int arg, tcg_target_ulong m)
>     assert(bs1 == 32 || (1ul << bs1) > m);
>
>     tcg_out_mov(s, TCG_TYPE_I32, ret, arg);
> -    tcg_out32(s, INSN_DEPI | INSN_R2(ret) | INSN_IM5(-1)
> -              | INSN_SHDEP_CP(31 - bs0) | INSN_DEP_LEN(bs1 - bs0));
> +    tcg_out_depi(s, ret, -1, bs0, bs1 - bs0);
>  }
>
>  static void tcg_out_andi(TCGContext *s, int ret, int arg, tcg_target_ulong m)
> @@ -529,8 +536,7 @@ static void tcg_out_andi(TCGContext *s, int ret, int arg, tcg_target_ulong m)
>         tcg_out_extr(s, ret, arg, 0, ls0, 0);
>     } else {
>         tcg_out_mov(s, TCG_TYPE_I32, ret, arg);
> -        tcg_out32(s, INSN_DEPI | INSN_R2(ret) | INSN_IM5(0)
> -                  | INSN_SHDEP_CP(31 - ls0) | INSN_DEP_LEN(ls1 - ls0));
> +        tcg_out_depi(s, ret, 0, ls0, ls1 - ls0);
>     }
>  }
>
> @@ -1459,6 +1465,14 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
>                      args[4], args[5], const_args[2], const_args[4]);
>         break;
>
> +    case INDEX_op_deposit_i32:
> +        if (const_args[2]) {
> +            tcg_out_depi(s, args[0], args[2], args[3], args[4]);
> +        } else {
> +            tcg_out_dep(s, args[0], args[2], args[3], args[4]);
> +        }
> +        break;
> +
>     case INDEX_op_qemu_ld8u:
>         tcg_out_qemu_ld(s, args, 0);
>         break;
> @@ -1552,6 +1566,8 @@ static const TCGTargetOpDef hppa_op_defs[] = {
>     { INDEX_op_add2_i32, { "r", "r", "rZ", "rZ", "rI", "rZ" } },
>     { INDEX_op_sub2_i32, { "r", "r", "rI", "rZ", "rK", "rZ" } },
>
> +    { INDEX_op_deposit_i32, { "r", "0", "rJ" } },
> +
>  #if TARGET_LONG_BITS == 32
>     { INDEX_op_qemu_ld8u, { "r", "L" } },
>     { INDEX_op_qemu_ld8s, { "r", "L" } },
> diff --git a/tcg/hppa/tcg-target.h b/tcg/hppa/tcg-target.h
> index a5cc440..f7919ce 100644
> --- a/tcg/hppa/tcg-target.h
> +++ b/tcg/hppa/tcg-target.h
> @@ -94,6 +94,7 @@ enum {
>  #define TCG_TARGET_HAS_not_i32
>  #define TCG_TARGET_HAS_andc_i32
>  // #define TCG_TARGET_HAS_orc_i32
> +#define TCG_TARGET_HAS_deposit_i32
>
>  /* optional instructions automatically implemented */
>  #undef TCG_TARGET_HAS_neg_i32           /* sub rd, 0, rs */
> --
> 1.5.6.5

Patch

diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c
index 95f3316..16423aa 100644
--- a/tcg/hppa/tcg-target.c
+++ b/tcg/hppa/tcg-target.c
@@ -467,6 +467,14 @@  static inline void tcg_out_dep(TCGContext *s, int ret, int arg,
               | INSN_SHDEP_CP(31 - ofs) | INSN_DEP_LEN(len));
 }
 
+static inline void tcg_out_depi(TCGContext *s, int ret, int arg,
+                                unsigned ofs, unsigned len)
+{
+    assert(ofs < 32 && len <= 32 - ofs);
+    tcg_out32(s, INSN_DEPI | INSN_R2(ret) | INSN_IM5(arg)
+              | INSN_SHDEP_CP(31 - ofs) | INSN_DEP_LEN(len));
+}
+
 static inline void tcg_out_shd(TCGContext *s, int ret, int hi, int lo,
                                unsigned count)
 {
@@ -499,8 +507,7 @@  static void tcg_out_ori(TCGContext *s, int ret, int arg, tcg_target_ulong m)
     assert(bs1 == 32 || (1ul << bs1) > m);
 
     tcg_out_mov(s, TCG_TYPE_I32, ret, arg);
-    tcg_out32(s, INSN_DEPI | INSN_R2(ret) | INSN_IM5(-1)
-              | INSN_SHDEP_CP(31 - bs0) | INSN_DEP_LEN(bs1 - bs0));
+    tcg_out_depi(s, ret, -1, bs0, bs1 - bs0);
 }
 
 static void tcg_out_andi(TCGContext *s, int ret, int arg, tcg_target_ulong m)
@@ -529,8 +536,7 @@  static void tcg_out_andi(TCGContext *s, int ret, int arg, tcg_target_ulong m)
         tcg_out_extr(s, ret, arg, 0, ls0, 0);
     } else {
         tcg_out_mov(s, TCG_TYPE_I32, ret, arg);
-        tcg_out32(s, INSN_DEPI | INSN_R2(ret) | INSN_IM5(0)
-                  | INSN_SHDEP_CP(31 - ls0) | INSN_DEP_LEN(ls1 - ls0));
+        tcg_out_depi(s, ret, 0, ls0, ls1 - ls0);
     }
 }
 
@@ -1459,6 +1465,14 @@  static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
                      args[4], args[5], const_args[2], const_args[4]);
         break;
 
+    case INDEX_op_deposit_i32:
+        if (const_args[2]) {
+            tcg_out_depi(s, args[0], args[2], args[3], args[4]);
+        } else {
+            tcg_out_dep(s, args[0], args[2], args[3], args[4]);
+        }
+        break;
+
     case INDEX_op_qemu_ld8u:
         tcg_out_qemu_ld(s, args, 0);
         break;
@@ -1552,6 +1566,8 @@  static const TCGTargetOpDef hppa_op_defs[] = {
     { INDEX_op_add2_i32, { "r", "r", "rZ", "rZ", "rI", "rZ" } },
     { INDEX_op_sub2_i32, { "r", "r", "rI", "rZ", "rK", "rZ" } },
 
+    { INDEX_op_deposit_i32, { "r", "0", "rJ" } },
+
 #if TARGET_LONG_BITS == 32
     { INDEX_op_qemu_ld8u, { "r", "L" } },
     { INDEX_op_qemu_ld8s, { "r", "L" } },
diff --git a/tcg/hppa/tcg-target.h b/tcg/hppa/tcg-target.h
index a5cc440..f7919ce 100644
--- a/tcg/hppa/tcg-target.h
+++ b/tcg/hppa/tcg-target.h
@@ -94,6 +94,7 @@  enum {
 #define TCG_TARGET_HAS_not_i32
 #define TCG_TARGET_HAS_andc_i32
 // #define TCG_TARGET_HAS_orc_i32
+#define TCG_TARGET_HAS_deposit_i32
 
 /* optional instructions automatically implemented */
 #undef TCG_TARGET_HAS_neg_i32           /* sub rd, 0, rs */