yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 23:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg: Add temp_global bit to TCGTemp

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

Backports commit fa477d25470187030614288d35bc734edffa41ee from qemu
This commit is contained in:
Richard Henderson 2018-03-05 07:21:07 -05:00 committed by Lioncash
parent a9c46ad7a0
commit 010ded3088
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qemu/tcg/optimize.c
View file

@ -115,26 +115,27 @@ static TCGOpcode op_to_movi(TCGContext *s, TCGOpcode op)
} }
} }
static TCGArg find_better_copy(TCGContext *s, TCGArg temp) static TCGArg find_better_copy(TCGContext *s, TCGArg arg)
{ {
struct tcg_temp_info *temps = s->temps2; struct tcg_temp_info *temps = s->temps2;
TCGTemp *ts = arg_temp(s, 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 < (unsigned int)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 < (unsigned int)s->nb_globals) { if (i < (unsigned int)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(s, 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(TCGContext *s, TCGArg arg1, TCGArg arg2) static bool temps_are_copies(TCGContext *s, TCGArg arg1, TCGArg arg2)

11
qemu/tcg/tcg.c
View file

@ -485,9 +485,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,
@ -1180,7 +1185,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);
@ -2207,7 +2212,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
qemu/tcg/tcg.h
View file

@ -582,10 +582,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;
intptr_t mem_offset; intptr_t mem_offset;