ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcg: Add temp_global bit to TCGTemp 

This avoids needing to test the index of a temp against nb_globals.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2016-11-02 11:20:15 -06:00 committed by Richard Henderson
parent 434391390b
commit fa477d2547
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tcg/optimize.c
View File

@ -116,25 +116,26 @@ static TCGOpcode op_to_movi(TCGOpcode op)
} }
} }
static TCGArg find_better_copy(TCGContext *s, TCGArg temp) static TCGArg find_better_copy(TCGContext *s, TCGArg arg)
{ {
TCGTemp *ts = arg_temp(arg);
TCGArg i; TCGArg i;
/* If this is already a global, we can't do better. */ /* If this is already a global, we can't do better. */
if (temp < s->nb_globals) { if (ts->temp_global) {
return temp; return arg;
} }
/* Search for a global first. */ /* Search for a global first. */
for (i = temps[temp].next_copy ; i != temp ; i = temps[i].next_copy) { for (i = temps[arg].next_copy ; i != arg; i = temps[i].next_copy) {
if (i < s->nb_globals) { if (i < s->nb_globals) {
return i; return i;
} }
} }
/* If it is a temp, search for a temp local. */ /* If it is a temp, search for a temp local. */
if (!arg_temp(temp)->temp_local) { if (!ts->temp_local) {
for (i = temps[temp].next_copy ; i != temp ; i = temps[i].next_copy) { for (i = temps[arg].next_copy ; i != arg; i = temps[i].next_copy) {
if (s->temps[i].temp_local) { if (s->temps[i].temp_local) {
return i; return i;
} }
@ -142,7 +143,7 @@ static TCGArg find_better_copy(TCGContext *s, TCGArg temp)
} }
/* Failure to find a better representation, return the same temp. */ /* Failure to find a better representation, return the same temp. */
return temp; return arg;
} }
static bool temps_are_copies(TCGArg arg1, TCGArg arg2) static bool temps_are_copies(TCGArg arg1, TCGArg arg2)

11
tcg/tcg.c
View File

@ -489,9 +489,14 @@ static inline TCGTemp *tcg_temp_alloc(TCGContext *s)
static inline TCGTemp *tcg_global_alloc(TCGContext *s) static inline TCGTemp *tcg_global_alloc(TCGContext *s)
{ {
TCGTemp *ts;
tcg_debug_assert(s->nb_globals == s->nb_temps); tcg_debug_assert(s->nb_globals == s->nb_temps);
s->nb_globals++; s->nb_globals++;
return tcg_temp_alloc(s); ts = tcg_temp_alloc(s);
ts->temp_global = 1;
return ts;
} }
static int tcg_global_reg_new_internal(TCGContext *s, TCGType type, static int tcg_global_reg_new_internal(TCGContext *s, TCGType type,
@ -1190,7 +1195,7 @@ static char *tcg_get_arg_str_ptr(TCGContext *s, char *buf, int buf_size,
{ {
int idx = temp_idx(s, ts); int idx = temp_idx(s, ts);
if (idx < s->nb_globals) { if (ts->temp_global) {
pstrcpy(buf, buf_size, ts->name); pstrcpy(buf, buf_size, ts->name);
} else if (ts->temp_local) { } else if (ts->temp_local) {
snprintf(buf, buf_size, "loc%d", idx - s->nb_globals); snprintf(buf, buf_size, "loc%d", idx - s->nb_globals);
@ -2128,7 +2133,7 @@ static void temp_free_or_dead(TCGContext *s, TCGTemp *ts, int free_or_dead)
} }
ts->val_type = (free_or_dead < 0 ts->val_type = (free_or_dead < 0
|| ts->temp_local || ts->temp_local
|| temp_idx(s, ts) < s->nb_globals || ts->temp_global
? TEMP_VAL_MEM : TEMP_VAL_DEAD); ? TEMP_VAL_MEM : TEMP_VAL_DEAD);
} }

12
tcg/tcg.h
View File

@ -579,10 +579,14 @@ typedef struct TCGTemp {
unsigned int indirect_base:1; unsigned int indirect_base:1;
unsigned int mem_coherent:1; unsigned int mem_coherent:1;
unsigned int mem_allocated:1; unsigned int mem_allocated:1;
unsigned int temp_local:1; /* If true, the temp is saved across /* If true, the temp is saved across both basic blocks and
basic blocks. Otherwise, it is not translation blocks. */
preserved across basic blocks. */ unsigned int temp_global:1;
unsigned int temp_allocated:1; /* never used for code gen */ /* If true, the temp is saved across basic blocks but dead
at the end of translation blocks. If false, the temp is
dead at the end of basic blocks. */
unsigned int temp_local:1;
unsigned int temp_allocated:1;
tcg_target_long val; tcg_target_long val;
struct TCGTemp *mem_base; struct TCGTemp *mem_base;