Richard Henderson <richard.hender...@linaro.org> writes:
> Fix this name vs our coding style.
>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> tcg/optimize.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index effb47eefd..b86bf3d707 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -35,20 +35,20 @@
> glue(glue(case INDEX_op_, x), _i64): \
> glue(glue(case INDEX_op_, x), _vec)
>
> -struct tcg_temp_info {
> +typedef struct TempOptInfo {
> bool is_const;
> TCGTemp *prev_copy;
> TCGTemp *next_copy;
> tcg_target_ulong val;
> tcg_target_ulong mask;
> -};
> +} TempOptInfo;
>
> -static inline struct tcg_temp_info *ts_info(TCGTemp *ts)
> +static inline TempOptInfo *ts_info(TCGTemp *ts)
> {
> return ts->state_ptr;
> }
>
> -static inline struct tcg_temp_info *arg_info(TCGArg arg)
> +static inline TempOptInfo *arg_info(TCGArg arg)
> {
> return ts_info(arg_temp(arg));
> }
> @@ -71,9 +71,9 @@ static inline bool ts_is_copy(TCGTemp *ts)
> /* Reset TEMP's state, possibly removing the temp for the list of copies. */
> static void reset_ts(TCGTemp *ts)
> {
> - struct tcg_temp_info *ti = ts_info(ts);
> - struct tcg_temp_info *pi = ts_info(ti->prev_copy);
> - struct tcg_temp_info *ni = ts_info(ti->next_copy);
> + TempOptInfo *ti = ts_info(ts);
> + TempOptInfo *pi = ts_info(ti->prev_copy);
> + TempOptInfo *ni = ts_info(ti->next_copy);
>
> ni->prev_copy = ti->prev_copy;
> pi->next_copy = ti->next_copy;
> @@ -89,12 +89,12 @@ static void reset_temp(TCGArg arg)
> }
>
> /* Initialize and activate a temporary. */
> -static void init_ts_info(struct tcg_temp_info *infos,
> +static void init_ts_info(TempOptInfo *infos,
> TCGTempSet *temps_used, TCGTemp *ts)
> {
> size_t idx = temp_idx(ts);
> if (!test_bit(idx, temps_used->l)) {
> - struct tcg_temp_info *ti = &infos[idx];
> + TempOptInfo *ti = &infos[idx];
>
> ts->state_ptr = ti;
> ti->next_copy = ts;
> @@ -114,7 +114,7 @@ static void init_ts_info(struct tcg_temp_info *infos,
> }
> }
>
> -static void init_arg_info(struct tcg_temp_info *infos,
> +static void init_arg_info(TempOptInfo *infos,
> TCGTempSet *temps_used, TCGArg arg)
> {
> init_ts_info(infos, temps_used, arg_temp(arg));
> @@ -177,7 +177,7 @@ static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op,
> TCGArg dst, TCGArg val)
> const TCGOpDef *def;
> TCGOpcode new_op;
> tcg_target_ulong mask;
> - struct tcg_temp_info *di = arg_info(dst);
> + TempOptInfo *di = arg_info(dst);
>
> def = &tcg_op_defs[op->opc];
> if (def->flags & TCG_OPF_VECTOR) {
> @@ -208,8 +208,8 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op,
> TCGArg dst, TCGArg src)
> TCGTemp *dst_ts = arg_temp(dst);
> TCGTemp *src_ts = arg_temp(src);
> const TCGOpDef *def;
> - struct tcg_temp_info *di;
> - struct tcg_temp_info *si;
> + TempOptInfo *di;
> + TempOptInfo *si;
> tcg_target_ulong mask;
> TCGOpcode new_op;
>
> @@ -242,7 +242,7 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op,
> TCGArg dst, TCGArg src)
> di->mask = mask;
>
> if (src_ts->type == dst_ts->type) {
> - struct tcg_temp_info *ni = ts_info(si->next_copy);
> + TempOptInfo *ni = ts_info(si->next_copy);
>
> di->next_copy = si->next_copy;
> di->prev_copy = src_ts;
> @@ -605,7 +605,7 @@ void tcg_optimize(TCGContext *s)
> {
> int nb_temps, nb_globals;
> TCGOp *op, *op_next, *prev_mb = NULL;
> - struct tcg_temp_info *infos;
> + TempOptInfo *infos;
> TCGTempSet temps_used;
>
> /* Array VALS has an element for each temp.
> @@ -616,7 +616,7 @@ void tcg_optimize(TCGContext *s)
> nb_temps = s->nb_temps;
> nb_globals = s->nb_globals;
> bitmap_zero(temps_used.l, nb_temps);
> - infos = tcg_malloc(sizeof(struct tcg_temp_info) * nb_temps);
> + infos = tcg_malloc(sizeof(TempOptInfo) * nb_temps);
>
> QTAILQ_FOREACH_SAFE(op, &s->ops, link, op_next) {
> tcg_target_ulong mask, partmask, affected;
--
Alex Bennée
