mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcg: Rename struct tcg_temp_info to TempOptInfo

Browse Source 
Fix this name vs our coding style.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2020-03-30 17:44:30 -07:00
parent bdb38b95f7
commit 6fcb98eda1
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tcg/optimize.c
View File

@ -35,20 +35,20 @@
glue(glue(case INDEX_op_, x), _i64): \ glue(glue(case INDEX_op_, x), _i64): \
glue(glue(case INDEX_op_, x), _vec) glue(glue(case INDEX_op_, x), _vec)
struct tcg_temp_info { typedef struct TempOptInfo {
bool is_const; bool is_const;
TCGTemp *prev_copy; TCGTemp *prev_copy;
TCGTemp *next_copy; TCGTemp *next_copy;
tcg_target_ulong val; tcg_target_ulong val;
tcg_target_ulong mask; 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; 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)); 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. */ /* Reset TEMP's state, possibly removing the temp for the list of copies. */
static void reset_ts(TCGTemp *ts) static void reset_ts(TCGTemp *ts)
{ {
struct tcg_temp_info *ti = ts_info(ts); TempOptInfo *ti = ts_info(ts);
struct tcg_temp_info *pi = ts_info(ti->prev_copy); TempOptInfo *pi = ts_info(ti->prev_copy);
struct tcg_temp_info *ni = ts_info(ti->next_copy); TempOptInfo *ni = ts_info(ti->next_copy);
ni->prev_copy = ti->prev_copy; ni->prev_copy = ti->prev_copy;
pi->next_copy = ti->next_copy; pi->next_copy = ti->next_copy;
@ -89,12 +89,12 @@ static void reset_temp(TCGArg arg)
} }
/* Initialize and activate a temporary. */ /* 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) TCGTempSet *temps_used, TCGTemp *ts)
{ {
size_t idx = temp_idx(ts); size_t idx = temp_idx(ts);
if (!test_bit(idx, temps_used->l)) { if (!test_bit(idx, temps_used->l)) {
struct tcg_temp_info *ti = &infos[idx]; TempOptInfo *ti = &infos[idx];
ts->state_ptr = ti; ts->state_ptr = ti;
ti->next_copy = ts; ti->next_copy = ts;
@ -105,7 +105,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) TCGTempSet *temps_used, TCGArg arg)
{ {
init_ts_info(infos, temps_used, arg_temp(arg)); init_ts_info(infos, temps_used, arg_temp(arg));
@ -171,7 +171,7 @@ static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg val)
const TCGOpDef *def; const TCGOpDef *def;
TCGOpcode new_op; TCGOpcode new_op;
tcg_target_ulong mask; tcg_target_ulong mask;
struct tcg_temp_info *di = arg_info(dst); TempOptInfo *di = arg_info(dst);
def = &tcg_op_defs[op->opc]; def = &tcg_op_defs[op->opc];
if (def->flags & TCG_OPF_VECTOR) { if (def->flags & TCG_OPF_VECTOR) {
@ -202,8 +202,8 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src)
TCGTemp *dst_ts = arg_temp(dst); TCGTemp *dst_ts = arg_temp(dst);
TCGTemp *src_ts = arg_temp(src); TCGTemp *src_ts = arg_temp(src);
const TCGOpDef *def; const TCGOpDef *def;
struct tcg_temp_info *di; TempOptInfo *di;
struct tcg_temp_info *si; TempOptInfo *si;
tcg_target_ulong mask; tcg_target_ulong mask;
TCGOpcode new_op; TCGOpcode new_op;
@ -236,7 +236,7 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src)
di->mask = mask; di->mask = mask;
if (src_ts->type == dst_ts->type) { 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->next_copy = si->next_copy;
di->prev_copy = src_ts; di->prev_copy = src_ts;
@ -599,7 +599,7 @@ void tcg_optimize(TCGContext *s)
{ {
int nb_temps, nb_globals; int nb_temps, nb_globals;
TCGOp *op, *op_next, *prev_mb = NULL; TCGOp *op, *op_next, *prev_mb = NULL;
struct tcg_temp_info *infos; TempOptInfo *infos;
TCGTempSet temps_used; TCGTempSet temps_used;
/* Array VALS has an element for each temp. /* Array VALS has an element for each temp.
@ -610,7 +610,7 @@ void tcg_optimize(TCGContext *s)
nb_temps = s->nb_temps; nb_temps = s->nb_temps;
nb_globals = s->nb_globals; nb_globals = s->nb_globals;
bitmap_zero(temps_used.l, nb_temps); 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) { QTAILQ_FOREACH_SAFE(op, &s->ops, link, op_next) {
tcg_target_ulong mask, partmask, affected; tcg_target_ulong mask, partmask, affected;