Richard Henderson <r...@twiddle.net> writes:
> Signed-off-by: Richard Henderson <r...@twiddle.net>
> ---
> tcg/optimize.c | 4 ++--
> tcg/tcg.c | 51 +++++++++++++++++++++++++--------------------------
> tcg/tcg.h | 5 +++++
> 3 files changed, 32 insertions(+), 28 deletions(-)
This is a patch where having diff.orderFile put headers first would be
great ;-)
>
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index 1a1c6fb..d8c3a7e 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -133,7 +133,7 @@ static TCGArg find_better_copy(TCGContext *s, TCGArg temp)
> }
>
> /* If it is a temp, search for a temp local. */
> - if (!s->temps[temp].temp_local) {
> + if (!arg_temp(temp)->temp_local) {
> for (i = temps[temp].next_copy ; i != temp ; i = temps[i].next_copy)
> {
> if (s->temps[i].temp_local) {
> return i;
> @@ -207,7 +207,7 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op,
> TCGArg dst, TCGArg src)
> }
> temps[dst].mask = mask;
>
> - if (s->temps[src].type == s->temps[dst].type) {
> + if (arg_temp(src)->type == arg_temp(dst)->type) {
> temps[dst].next_copy = temps[src].next_copy;
> temps[dst].prev_copy = src;
> temps[temps[dst].next_copy].prev_copy = dst;
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index e2248a6..068ac51 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -977,11 +977,10 @@ static char *tcg_get_arg_str_ptr(TCGContext *s, char
> *buf, int buf_size,
> return buf;
> }
>
> -static char *tcg_get_arg_str_idx(TCGContext *s, char *buf,
> - int buf_size, int idx)
> +static char *tcg_get_arg_str(TCGContext *s, char *buf,
> + int buf_size, TCGArg arg)
> {
> - tcg_debug_assert(idx >= 0 && idx < s->nb_temps);
> - return tcg_get_arg_str_ptr(s, buf, buf_size, &s->temps[idx]);
> + return tcg_get_arg_str_ptr(s, buf, buf_size, arg_temp(arg));
> }
>
> /* Find helper name. */
> @@ -1084,14 +1083,14 @@ void tcg_dump_ops(TCGContext *s)
> tcg_find_helper(s, op->args[nb_oargs +
> nb_iargs]),
> op->args[nb_oargs + nb_iargs + 1], nb_oargs);
> for (i = 0; i < nb_oargs; i++) {
> - col += qemu_log(",%s", tcg_get_arg_str_idx(s, buf,
> sizeof(buf),
> - op->args[i]));
> + col += qemu_log(",%s", tcg_get_arg_str(s, buf, sizeof(buf),
> + op->args[i]));
> }
> for (i = 0; i < nb_iargs; i++) {
> TCGArg arg = op->args[nb_oargs + i];
> const char *t = "<dummy>";
> if (arg != TCG_CALL_DUMMY_ARG) {
> - t = tcg_get_arg_str_idx(s, buf, sizeof(buf), arg);
> + t = tcg_get_arg_str(s, buf, sizeof(buf), arg);
> }
> col += qemu_log(",%s", t);
> }
> @@ -1107,15 +1106,15 @@ void tcg_dump_ops(TCGContext *s)
> if (k != 0) {
> col += qemu_log(",");
> }
> - col += qemu_log("%s", tcg_get_arg_str_idx(s, buf,
> sizeof(buf),
> - op->args[k++]));
> + col += qemu_log("%s", tcg_get_arg_str(s, buf, sizeof(buf),
> + op->args[k++]));
> }
> for (i = 0; i < nb_iargs; i++) {
> if (k != 0) {
> col += qemu_log(",");
> }
> - col += qemu_log("%s", tcg_get_arg_str_idx(s, buf,
> sizeof(buf),
> - op->args[k++]));
> + col += qemu_log("%s", tcg_get_arg_str(s, buf, sizeof(buf),
> + op->args[k++]));
> }
> switch (c) {
> case INDEX_op_brcond_i32:
> @@ -1707,7 +1706,7 @@ static bool liveness_pass_2(TCGContext *s, uint8_t
> *temp_state)
> if (arg < nb_globals) {
> dir = dir_temps[arg];
> if (dir != 0 && temp_state[arg] == TS_DEAD) {
> - TCGTemp *its = &s->temps[arg];
> + TCGTemp *its = arg_temp(arg);
> TCGOpcode lopc = (its->type == TCG_TYPE_I32
> ? INDEX_op_ld_i32
> : INDEX_op_ld_i64);
> @@ -1778,7 +1777,7 @@ static bool liveness_pass_2(TCGContext *s, uint8_t
> *temp_state)
>
> /* Sync outputs upon their last write. */
> if (NEED_SYNC_ARG(i)) {
> - TCGTemp *its = &s->temps[arg];
> + TCGTemp *its = arg_temp(arg);
> TCGOpcode sopc = (its->type == TCG_TYPE_I32
> ? INDEX_op_st_i32
> : INDEX_op_st_i64);
> @@ -1809,7 +1808,7 @@ static void dump_regs(TCGContext *s)
>
> for(i = 0; i < s->nb_temps; i++) {
> ts = &s->temps[i];
> - printf(" %10s: ", tcg_get_arg_str_idx(s, buf, sizeof(buf), i));
> + printf(" %10s: ", tcg_get_arg_str_ptr(s, buf, sizeof(buf), ts));
> switch(ts->val_type) {
> case TEMP_VAL_REG:
> printf("%s", tcg_target_reg_names[ts->reg]);
> @@ -2113,7 +2112,7 @@ static void tcg_reg_alloc_do_movi(TCGContext *s,
> TCGTemp *ots,
>
> static void tcg_reg_alloc_movi(TCGContext *s, const TCGOp *op)
> {
> - TCGTemp *ots = &s->temps[op->args[0]];
> + TCGTemp *ots = arg_temp(op->args[0]);
> tcg_target_ulong val = op->args[1];
>
> tcg_reg_alloc_do_movi(s, ots, val, op->life);
> @@ -2127,8 +2126,8 @@ static void tcg_reg_alloc_mov(TCGContext *s, const
> TCGOp *op)
> TCGType otype, itype;
>
> tcg_regset_set(allocated_regs, s->reserved_regs);
> - ots = &s->temps[op->args[0]];
> - ts = &s->temps[op->args[1]];
> + ots = arg_temp(op->args[0]);
> + ts = arg_temp(op->args[1]);
>
> /* Note that otype != itype for no-op truncation. */
> otype = ots->type;
> @@ -2225,7 +2224,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp
> *op)
> i = def->sorted_args[nb_oargs + k];
> arg = op->args[i];
> arg_ct = &def->args_ct[i];
> - ts = &s->temps[arg];
> + ts = arg_temp(arg);
>
> if (ts->val_type == TEMP_VAL_CONST
> && tcg_target_const_match(ts->val, ts->type, arg_ct)) {
> @@ -2282,7 +2281,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp
> *op)
> /* mark dead temporaries and free the associated registers */
> for (i = nb_oargs; i < nb_oargs + nb_iargs; i++) {
> if (IS_DEAD_ARG(i)) {
> - temp_dead(s, &s->temps[op->args[i]]);
> + temp_dead(s, arg_temp(op->args[i]));
> }
> }
>
> @@ -2308,7 +2307,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp
> *op)
> i = def->sorted_args[k];
> arg = op->args[i];
> arg_ct = &def->args_ct[i];
> - ts = &s->temps[arg];
> + ts = arg_temp(arg);
> if ((arg_ct->ct & TCG_CT_ALIAS)
> && !const_args[arg_ct->alias_index]) {
> reg = new_args[arg_ct->alias_index];
> @@ -2349,7 +2348,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp
> *op)
>
> /* move the outputs in the correct register if needed */
> for(i = 0; i < nb_oargs; i++) {
> - ts = &s->temps[op->args[i]];
> + ts = arg_temp(op->args[i]);
> reg = new_args[i];
> if (ts->fixed_reg && ts->reg != reg) {
> tcg_out_mov(s, ts->type, ts->reg, reg);
> @@ -2409,7 +2408,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op)
> stack_offset -= sizeof(tcg_target_long);
> #endif
> if (arg != TCG_CALL_DUMMY_ARG) {
> - ts = &s->temps[arg];
> + ts = arg_temp(arg);
> temp_load(s, ts, tcg_target_available_regs[ts->type],
> s->reserved_regs);
> tcg_out_st(s, ts->type, ts->reg, TCG_REG_CALL_STACK,
> stack_offset);
> @@ -2424,7 +2423,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op)
> for (i = 0; i < nb_regs; i++) {
> arg = op->args[nb_oargs + i];
> if (arg != TCG_CALL_DUMMY_ARG) {
> - ts = &s->temps[arg];
> + ts = arg_temp(arg);
> reg = tcg_target_call_iarg_regs[i];
> tcg_reg_free(s, reg, allocated_regs);
>
> @@ -2447,7 +2446,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op)
> /* mark dead temporaries and free the associated registers */
> for (i = nb_oargs; i < nb_iargs + nb_oargs; i++) {
> if (IS_DEAD_ARG(i)) {
> - temp_dead(s, &s->temps[op->args[i]]);
> + temp_dead(s, arg_temp(op->args[i]));
> }
> }
>
> @@ -2473,7 +2472,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op)
> /* assign output registers and emit moves if needed */
> for(i = 0; i < nb_oargs; i++) {
> arg = op->args[i];
> - ts = &s->temps[arg];
> + ts = arg_temp(arg);
> reg = tcg_target_call_oarg_regs[i];
> tcg_debug_assert(s->reg_to_temp[reg] == NULL);
>
> @@ -2646,7 +2645,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb)
> }
> break;
> case INDEX_op_discard:
> - temp_dead(s, &s->temps[op->args[0]]);
> + temp_dead(s, arg_temp(op->args[0]));
> break;
> case INDEX_op_set_label:
> tcg_reg_alloc_bb_end(s, s->reserved_regs);
> diff --git a/tcg/tcg.h b/tcg/tcg.h
> index 720e04e..70d9fda 100644
> --- a/tcg/tcg.h
> +++ b/tcg/tcg.h
> @@ -724,6 +724,11 @@ struct TCGContext {
> extern TCGContext tcg_ctx;
> extern bool parallel_cpus;
>
> +static inline TCGTemp *arg_temp(TCGArg a)
> +{
> + return &tcg_ctx.temps[a];
> +}
> +
> static inline void tcg_set_insn_param(int op_idx, int arg, TCGArg v)
> {
> tcg_ctx.gen_op_buf[op_idx].args[arg] = v;
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
--
Alex Bennée
