Patchwork [v4,03/33] tcg-aarch64: Don't handle mov/movi in tcg_out_op

login
register
mail settings
Submitter Richard Henderson
Date Sept. 14, 2013, 9:54 p.m.
Message ID <1379195690-6509-4-git-send-email-rth@twiddle.net>
Download mbox | patch
Permalink /patch/274957/
State New
Headers show

Comments

Richard Henderson - Sept. 14, 2013, 9:54 p.m.
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/aarch64/tcg-target.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
Claudio Fontana - Sept. 16, 2013, 7:45 a.m.
On 14.09.2013 23:54, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
>  tcg/aarch64/tcg-target.c | 20 +++++++-------------
>  1 file changed, 7 insertions(+), 13 deletions(-)
> 
> diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
> index 983a74a..8f19b50 100644
> --- a/tcg/aarch64/tcg-target.c
> +++ b/tcg/aarch64/tcg-target.c
> @@ -1172,18 +1172,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
>                       args[0], args[1], args[2]);
>          break;
>  
> -    case INDEX_op_mov_i64:
> -    case INDEX_op_mov_i32:
> -        tcg_out_movr(s, ext, args[0], args[1]);
> -        break;
> -
> -    case INDEX_op_movi_i64:
> -        tcg_out_movi(s, TCG_TYPE_I64, args[0], args[1]);
> -        break;
> -    case INDEX_op_movi_i32:
> -        tcg_out_movi(s, TCG_TYPE_I32, args[0], args[1]);
> -        break;
> -
>      case INDEX_op_add_i64:
>      case INDEX_op_add_i32:
>          tcg_out_arith(s, ARITH_ADD, ext, args[0], args[1], args[2], 0);
> @@ -1347,8 +1335,14 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
>          tcg_out_movr(s, 0, args[0], args[1]);
>          break;
>  
> +    case INDEX_op_mov_i64:
> +    case INDEX_op_mov_i32:
> +    case INDEX_op_movi_i64:
> +    case INDEX_op_movi_i32:
> +        /* Always implemented with tcg_out_mov/i, never with tcg_out_op.  */

Ok (as in, "I am ok with moving these labels here").

>      default:
> -        tcg_abort(); /* opcode not implemented */
> +        /* Opcode not implemented.  */
> +        tcg_abort();
>      }
>  }

This change above seems unnecessary.

C.
Richard Henderson - Sept. 16, 2013, 3:07 p.m.
On 09/16/2013 12:45 AM, Claudio Fontana wrote:
>> >      default:
>> > -        tcg_abort(); /* opcode not implemented */
>> > +        /* Opcode not implemented.  */
>> > +        tcg_abort();
>> >      }
>> >  }
> This change above seems unnecessary.

Perhaps qemu doesn't have the same "comments are sentences" rule that gcc does,
but I still aim to follow it.


r~
Claudio Fontana - Sept. 17, 2013, 8:05 a.m.
On 16.09.2013 17:07, Richard Henderson wrote:
> On 09/16/2013 12:45 AM, Claudio Fontana wrote:
>>>>      default:
>>>> -        tcg_abort(); /* opcode not implemented */
>>>> +        /* Opcode not implemented.  */
>>>> +        tcg_abort();
>>>>      }
>>>>  }
>> This change above seems unnecessary.
> 
> Perhaps qemu doesn't have the same "comments are sentences" rule that gcc does,
> but I still aim to follow it.
> 

It is wasteful of y space for no reason. This comment is not a sentence, when you read the code as you would prose.
It is a comment _on_ tcg_abort() : tcg_abort(), because the opcode is not implemented.
In other cases, the comment alone on a line is a good idea, but not in this one.

C.

Patch

diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
index 983a74a..8f19b50 100644
--- a/tcg/aarch64/tcg-target.c
+++ b/tcg/aarch64/tcg-target.c
@@ -1172,18 +1172,6 @@  static void tcg_out_op(TCGContext *s, TCGOpcode opc,
                      args[0], args[1], args[2]);
         break;
 
-    case INDEX_op_mov_i64:
-    case INDEX_op_mov_i32:
-        tcg_out_movr(s, ext, args[0], args[1]);
-        break;
-
-    case INDEX_op_movi_i64:
-        tcg_out_movi(s, TCG_TYPE_I64, args[0], args[1]);
-        break;
-    case INDEX_op_movi_i32:
-        tcg_out_movi(s, TCG_TYPE_I32, args[0], args[1]);
-        break;
-
     case INDEX_op_add_i64:
     case INDEX_op_add_i32:
         tcg_out_arith(s, ARITH_ADD, ext, args[0], args[1], args[2], 0);
@@ -1347,8 +1335,14 @@  static void tcg_out_op(TCGContext *s, TCGOpcode opc,
         tcg_out_movr(s, 0, args[0], args[1]);
         break;
 
+    case INDEX_op_mov_i64:
+    case INDEX_op_mov_i32:
+    case INDEX_op_movi_i64:
+    case INDEX_op_movi_i32:
+        /* Always implemented with tcg_out_mov/i, never with tcg_out_op.  */
     default:
-        tcg_abort(); /* opcode not implemented */
+        /* Opcode not implemented.  */
+        tcg_abort();
     }
 }