Patchwork [v3,03/20] tcg-arm: Allow constant first argument to sub

login
register
mail settings
Submitter Richard Henderson
Date March 28, 2013, 3:32 p.m.
Message ID <1364484781-15561-4-git-send-email-rth@twiddle.net>
Download mbox | patch
Permalink /patch/232070/
State New
Headers show

Comments

Richard Henderson - March 28, 2013, 3:32 p.m.
This allows the generation of RSB instructions.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/arm/tcg-target.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
Aurelien Jarno - March 29, 2013, 4:58 p.m.
On Thu, Mar 28, 2013 at 08:32:44AM -0700, Richard Henderson wrote:
> This allows the generation of RSB instructions.
> 
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
>  tcg/arm/tcg-target.c | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
> index f470caa..7475142 100644
> --- a/tcg/arm/tcg-target.c
> +++ b/tcg/arm/tcg-target.c
> @@ -1665,8 +1665,17 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
>                          args[0], args[1], args[2], const_args[2]);
>          break;
>      case INDEX_op_sub_i32:
> -        tcg_out_dat_rIN(s, COND_AL, ARITH_SUB, ARITH_ADD,
> -                        args[0], args[1], args[2], const_args[2]);
> +        if (const_args[1]) {
> +            if (const_args[2]) {
> +                tcg_out_movi32(s, COND_AL, args[0], args[1] - args[2]);
> +            } else {
> +                tcg_out_dat_rI(s, COND_AL, ARITH_RSB,
> +                               args[0], args[2], args[1], 1);
> +            }
> +        } else {
> +            tcg_out_dat_rIN(s, COND_AL, ARITH_SUB, ARITH_ADD,
> +                            args[0], args[1], args[2], const_args[2]);
> +        }
>          break;
>      case INDEX_op_and_i32:
>          tcg_out_dat_rIK(s, COND_AL, ARITH_AND, ARITH_BIC,
> @@ -1859,7 +1868,7 @@ static const TCGTargetOpDef arm_op_defs[] = {
>  
>      /* TODO: "r", "r", "ri" */
>      { INDEX_op_add_i32, { "r", "r", "rIN" } },
> -    { INDEX_op_sub_i32, { "r", "r", "rIN" } },
> +    { INDEX_op_sub_i32, { "r", "rI", "rIN" } },
>      { INDEX_op_mul_i32, { "r", "r", "r" } },
>      { INDEX_op_mulu2_i32, { "r", "r", "r", "r" } },
>      { INDEX_op_muls2_i32, { "r", "r", "r", "r" } },

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

Patch

diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
index f470caa..7475142 100644
--- a/tcg/arm/tcg-target.c
+++ b/tcg/arm/tcg-target.c
@@ -1665,8 +1665,17 @@  static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
                         args[0], args[1], args[2], const_args[2]);
         break;
     case INDEX_op_sub_i32:
-        tcg_out_dat_rIN(s, COND_AL, ARITH_SUB, ARITH_ADD,
-                        args[0], args[1], args[2], const_args[2]);
+        if (const_args[1]) {
+            if (const_args[2]) {
+                tcg_out_movi32(s, COND_AL, args[0], args[1] - args[2]);
+            } else {
+                tcg_out_dat_rI(s, COND_AL, ARITH_RSB,
+                               args[0], args[2], args[1], 1);
+            }
+        } else {
+            tcg_out_dat_rIN(s, COND_AL, ARITH_SUB, ARITH_ADD,
+                            args[0], args[1], args[2], const_args[2]);
+        }
         break;
     case INDEX_op_and_i32:
         tcg_out_dat_rIK(s, COND_AL, ARITH_AND, ARITH_BIC,
@@ -1859,7 +1868,7 @@  static const TCGTargetOpDef arm_op_defs[] = {
 
     /* TODO: "r", "r", "ri" */
     { INDEX_op_add_i32, { "r", "r", "rIN" } },
-    { INDEX_op_sub_i32, { "r", "r", "rIN" } },
+    { INDEX_op_sub_i32, { "r", "rI", "rIN" } },
     { INDEX_op_mul_i32, { "r", "r", "r" } },
     { INDEX_op_mulu2_i32, { "r", "r", "r", "r" } },
     { INDEX_op_muls2_i32, { "r", "r", "r", "r" } },