[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/14] tcg: Change temp_dead argument to TCGTemp
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 07/14] tcg: Change temp_dead argument to TCGTemp |
Date: |
Thu, 17 Dec 2015 12:00:21 -0800 |
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/tcg.c | 48 +++++++++++++++++++++++-------------------------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/tcg/tcg.c b/tcg/tcg.c
index d91950d..d19bb45 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -1712,20 +1712,16 @@ static TCGReg tcg_reg_alloc(TCGContext *s, TCGRegSet
reg1, TCGRegSet reg2)
}
/* mark a temporary as dead. */
-static inline void temp_dead(TCGContext *s, int temp)
+static inline void temp_dead(TCGContext *s, TCGTemp *ts)
{
- TCGTemp *ts = &s->temps[temp];
-
- if (!ts->fixed_reg) {
- if (ts->val_type == TEMP_VAL_REG) {
- s->reg_to_temp[ts->reg] = NULL;
- }
- if (temp < s->nb_globals || ts->temp_local) {
- ts->val_type = TEMP_VAL_MEM;
- } else {
- ts->val_type = TEMP_VAL_DEAD;
- }
+ if (ts->fixed_reg) {
+ return;
}
+ if (ts->val_type == TEMP_VAL_REG) {
+ s->reg_to_temp[ts->reg] = NULL;
+ }
+ ts->val_type = (temp_idx(s, ts) < s->nb_globals || ts->temp_local
+ ? TEMP_VAL_MEM : TEMP_VAL_DEAD);
}
/* sync a temporary to memory. 'allocated_regs' is used in case a
@@ -1760,13 +1756,15 @@ static inline void temp_sync(TCGContext *s, int temp,
TCGRegSet allocated_regs)
temporary registers needs to be allocated to store a constant. */
static inline void temp_save(TCGContext *s, int temp, TCGRegSet allocated_regs)
{
+ TCGTemp *ts = &s->temps[temp];
+
#ifdef USE_LIVENESS_ANALYSIS
/* The liveness analysis already ensures that globals are back
in memory. Keep an assert for safety. */
- assert(s->temps[temp].val_type == TEMP_VAL_MEM ||
s->temps[temp].fixed_reg);
+ tcg_debug_assert(ts->val_type == TEMP_VAL_MEM || ts->fixed_reg);
#else
temp_sync(s, temp, allocated_regs);
- temp_dead(s, temp);
+ temp_dead(s, ts);
#endif
}
@@ -1816,7 +1814,7 @@ static void tcg_reg_alloc_bb_end(TCGContext *s, TCGRegSet
allocated_regs)
Keep an assert for safety. */
assert(ts->val_type == TEMP_VAL_DEAD);
#else
- temp_dead(s, i);
+ temp_dead(s, ts);
#endif
}
}
@@ -1852,7 +1850,7 @@ static void tcg_reg_alloc_movi(TCGContext *s, const
TCGArg *args,
temp_sync(s, args[0], s->reserved_regs);
}
if (IS_DEAD_ARG(0)) {
- temp_dead(s, args[0]);
+ temp_dead(s, ots);
}
}
@@ -1902,9 +1900,9 @@ static void tcg_reg_alloc_mov(TCGContext *s, const
TCGOpDef *def,
}
tcg_out_st(s, otype, ts->reg, ots->mem_base->reg, ots->mem_offset);
if (IS_DEAD_ARG(1)) {
- temp_dead(s, args[1]);
+ temp_dead(s, ts);
}
- temp_dead(s, args[0]);
+ temp_dead(s, ots);
} else if (ts->val_type == TEMP_VAL_CONST) {
/* propagate constant */
if (ots->val_type == TEMP_VAL_REG) {
@@ -1913,7 +1911,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const
TCGOpDef *def,
ots->val_type = TEMP_VAL_CONST;
ots->val = ts->val;
if (IS_DEAD_ARG(1)) {
- temp_dead(s, args[1]);
+ temp_dead(s, ts);
}
} else {
/* The code in the first if block should have moved the
@@ -1925,7 +1923,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const
TCGOpDef *def,
s->reg_to_temp[ots->reg] = NULL;
}
ots->reg = ts->reg;
- temp_dead(s, args[1]);
+ temp_dead(s, ts);
} else {
if (ots->val_type != TEMP_VAL_REG) {
/* When allocating a new register, make sure to not spill the
@@ -2042,7 +2040,7 @@ static void tcg_reg_alloc_op(TCGContext *s,
/* 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, args[i]);
+ temp_dead(s, &s->temps[args[i]]);
}
}
@@ -2113,7 +2111,7 @@ static void tcg_reg_alloc_op(TCGContext *s,
tcg_reg_sync(s, reg);
}
if (IS_DEAD_ARG(i)) {
- temp_dead(s, args[i]);
+ temp_dead(s, ts);
}
}
}
@@ -2215,7 +2213,7 @@ static void tcg_reg_alloc_call(TCGContext *s, int
nb_oargs, int nb_iargs,
/* 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, args[i]);
+ temp_dead(s, &s->temps[args[i]]);
}
}
@@ -2261,7 +2259,7 @@ static void tcg_reg_alloc_call(TCGContext *s, int
nb_oargs, int nb_iargs,
tcg_reg_sync(s, reg);
}
if (IS_DEAD_ARG(i)) {
- temp_dead(s, args[i]);
+ temp_dead(s, ts);
}
}
}
@@ -2391,7 +2389,7 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit
*gen_code_buf)
}
break;
case INDEX_op_discard:
- temp_dead(s, args[0]);
+ temp_dead(s, &s->temps[args[0]]);
break;
case INDEX_op_set_label:
tcg_reg_alloc_bb_end(s, s->reserved_regs);
--
2.5.0
- [Qemu-devel] [PATCH v2 00/14] tcg: Improve sparc register windows, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 00/14] tcg: Improve sparc register windows, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 03/14] tcg: Tidy temporary allocation, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 02/14] tcg: Change ts->mem_reg to ts->mem_base, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 05/14] tcg: Remove tcg_get_arg_str_i32/64, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 04/14] tcg: More use of TCGReg where appropriate, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 07/14] tcg: Change temp_dead argument to TCGTemp,
Richard Henderson <=
- [Qemu-devel] [PATCH v2 08/14] tcg: Change temp_sync argument to TCGTemp, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 06/14] tcg: Change reg_to_temp to TCGTemp pointer, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 09/14] tcg: Change temp_save argument to TCGTemp, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 13/14] target-sparc: Tidy global register initialization, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 12/14] tcg: Allocate indirect_base temporaries in a different order, Richard Henderson, 2015/12/17
- [Qemu-devel] [PATCH v2 10/14] tcg: Introduce temp_load, Richard Henderson, 2015/12/17