[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 01/26] tcg: add temp_dead()
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PATCH v3 01/26] tcg: add temp_dead() |
Date: |
Fri, 19 Oct 2012 23:38:50 +0200 |
A lot of code is duplicated to mark a temporary as dead. Replace it
by temp_dead(), which in addition marks the temp as saved in memory
for globals and local temps, instead of doing this a posteriori in
temp_save().
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
---
tcg/tcg.c | 67 ++++++++++++++++++++++++++++---------------------------------
1 file changed, 31 insertions(+), 36 deletions(-)
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 5faaca5..2f84287 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -1564,6 +1564,24 @@ static int tcg_reg_alloc(TCGContext *s, TCGRegSet reg1,
TCGRegSet reg2)
tcg_abort();
}
+/* mark a temporary as dead. */
+static inline void temp_dead(TCGContext *s, int temp)
+{
+ TCGTemp *ts;
+
+ ts = &s->temps[temp];
+ if (!ts->fixed_reg) {
+ if (ts->val_type == TEMP_VAL_REG) {
+ s->reg_to_temp[ts->reg] = -1;
+ }
+ if (temp < s->nb_globals || (ts->temp_local && ts->mem_allocated)) {
+ ts->val_type = TEMP_VAL_MEM;
+ } else {
+ ts->val_type = TEMP_VAL_DEAD;
+ }
+ }
+}
+
/* save a temporary to memory. 'allocated_regs' is used in case a
temporary registers needs to be allocated to store a constant. */
static void temp_save(TCGContext *s, int temp, TCGRegSet allocated_regs)
@@ -1621,10 +1639,7 @@ static void tcg_reg_alloc_bb_end(TCGContext *s,
TCGRegSet allocated_regs)
if (ts->temp_local) {
temp_save(s, i, allocated_regs);
} else {
- if (ts->val_type == TEMP_VAL_REG) {
- s->reg_to_temp[ts->reg] = -1;
- }
- ts->val_type = TEMP_VAL_DEAD;
+ temp_dead(s, i);
}
}
@@ -1673,8 +1688,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const
TCGOpDef *def,
if (ots->val_type == TEMP_VAL_REG)
s->reg_to_temp[ots->reg] = -1;
reg = ts->reg;
- s->reg_to_temp[reg] = -1;
- ts->val_type = TEMP_VAL_DEAD;
+ temp_dead(s, args[1]);
} else {
if (ots->val_type == TEMP_VAL_REG) {
reg = ots->reg;
@@ -1801,14 +1815,8 @@ static void tcg_reg_alloc_op(TCGContext *s,
} else {
/* mark dead temporaries and free the associated registers */
for(i = nb_oargs; i < nb_oargs + nb_iargs; i++) {
- arg = args[i];
if (IS_DEAD_ARG(i)) {
- ts = &s->temps[arg];
- if (!ts->fixed_reg) {
- if (ts->val_type == TEMP_VAL_REG)
- s->reg_to_temp[ts->reg] = -1;
- ts->val_type = TEMP_VAL_DEAD;
- }
+ temp_dead(s, args[i]);
}
}
@@ -1848,11 +1856,12 @@ static void tcg_reg_alloc_op(TCGContext *s,
tcg_regset_set_reg(allocated_regs, reg);
/* if a fixed register is used, then a move will be done
afterwards */
if (!ts->fixed_reg) {
- if (ts->val_type == TEMP_VAL_REG)
- s->reg_to_temp[ts->reg] = -1;
if (IS_DEAD_ARG(i)) {
- ts->val_type = TEMP_VAL_DEAD;
+ temp_dead(s, args[i]);
} else {
+ if (ts->val_type == TEMP_VAL_REG) {
+ s->reg_to_temp[ts->reg] = -1;
+ }
ts->val_type = TEMP_VAL_REG;
ts->reg = reg;
/* temp value is modified, so the value kept in memory is
@@ -2011,14 +2020,8 @@ static int tcg_reg_alloc_call(TCGContext *s, const
TCGOpDef *def,
/* mark dead temporaries and free the associated registers */
for(i = nb_oargs; i < nb_iargs + nb_oargs; i++) {
- arg = args[i];
if (IS_DEAD_ARG(i)) {
- ts = &s->temps[arg];
- if (!ts->fixed_reg) {
- if (ts->val_type == TEMP_VAL_REG)
- s->reg_to_temp[ts->reg] = -1;
- ts->val_type = TEMP_VAL_DEAD;
- }
+ temp_dead(s, args[i]);
}
}
@@ -2048,11 +2051,12 @@ static int tcg_reg_alloc_call(TCGContext *s, const
TCGOpDef *def,
tcg_out_mov(s, ts->type, ts->reg, reg);
}
} else {
- if (ts->val_type == TEMP_VAL_REG)
- s->reg_to_temp[ts->reg] = -1;
if (IS_DEAD_ARG(i)) {
- ts->val_type = TEMP_VAL_DEAD;
+ temp_dead(s, args[i]);
} else {
+ if (ts->val_type == TEMP_VAL_REG) {
+ s->reg_to_temp[ts->reg] = -1;
+ }
ts->val_type = TEMP_VAL_REG;
ts->reg = reg;
ts->mem_coherent = 0;
@@ -2167,16 +2171,7 @@ static inline int tcg_gen_code_common(TCGContext *s,
uint8_t *gen_code_buf,
args += args[0];
goto next;
case INDEX_op_discard:
- {
- TCGTemp *ts;
- ts = &s->temps[args[0]];
- /* mark the temporary as dead */
- if (!ts->fixed_reg) {
- if (ts->val_type == TEMP_VAL_REG)
- s->reg_to_temp[ts->reg] = -1;
- ts->val_type = TEMP_VAL_DEAD;
- }
- }
+ temp_dead(s, args[0]);
break;
case INDEX_op_set_label:
tcg_reg_alloc_bb_end(s, s->reserved_regs);
--
1.7.10.4
- [Qemu-devel] [PATCH v3 00/26] tcg: rework liveness analysis and register allocator, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 02/26] tcg: add tcg_reg_sync(), Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 01/26] tcg: add temp_dead(),
Aurelien Jarno <=
- [Qemu-devel] [PATCH v3 23/26] target-sh4: rename helper flags, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 18/26] target-i386: rename helper flags, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 05/26] tcg: rework liveness analysis, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 11/26] tcg: fix some op flags, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 25/26] target-xtensa: rename helper flags, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 09/26] tcg: start with local temps in TEMP_VAL_MEM state, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 17/26] target-cris: rename helper flags, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 21/26] target-ppc: rename helper flags, Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 06/26] tcg: improve tcg_reg_alloc_movi(), Aurelien Jarno, 2012/10/19
- [Qemu-devel] [PATCH v3 15/26] target-alpha: rename helper flags, Aurelien Jarno, 2012/10/19