tcg: add tcg_reg_sync()

Add a new function tcg_reg_sync() to synchronize the canonical location
of a temp with the value in the associated register, but without freeing
it. Rewrite tcg_reg_free() to first call tcg_reg_sync() and then to free
the register.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2012-10-09 21:53:06 +02:00
parent 639368dd68
commit 7f6ceedf9c

View File

@ -1517,22 +1517,33 @@ static void temp_allocate_frame(TCGContext *s, int temp)
s->current_frame_offset += (tcg_target_long)sizeof(tcg_target_long); s->current_frame_offset += (tcg_target_long)sizeof(tcg_target_long);
} }
/* free register 'reg' by spilling the corresponding temporary if necessary */ /* sync register 'reg' by saving it to the corresponding temporary */
static void tcg_reg_free(TCGContext *s, int reg) static inline void tcg_reg_sync(TCGContext *s, int reg)
{ {
TCGTemp *ts; TCGTemp *ts;
int temp; int temp;
temp = s->reg_to_temp[reg]; temp = s->reg_to_temp[reg];
if (temp != -1) { ts = &s->temps[temp];
ts = &s->temps[temp]; assert(ts->val_type == TEMP_VAL_REG);
assert(ts->val_type == TEMP_VAL_REG); if (!ts->mem_coherent && !ts->fixed_reg) {
if (!ts->mem_coherent) { if (!ts->mem_allocated) {
if (!ts->mem_allocated) temp_allocate_frame(s, temp);
temp_allocate_frame(s, temp);
tcg_out_st(s, ts->type, reg, ts->mem_reg, ts->mem_offset);
} }
ts->val_type = TEMP_VAL_MEM; tcg_out_st(s, ts->type, reg, ts->mem_reg, ts->mem_offset);
}
ts->mem_coherent = 1;
}
/* free register 'reg' by spilling the corresponding temporary if necessary */
static void tcg_reg_free(TCGContext *s, int reg)
{
int temp;
temp = s->reg_to_temp[reg];
if (temp != -1) {
tcg_reg_sync(s, reg);
s->temps[temp].val_type = TEMP_VAL_MEM;
s->reg_to_temp[reg] = -1; s->reg_to_temp[reg] = -1;
} }
} }