aboutsummaryrefslogtreecommitdiff
path: root/tcg
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2016-11-02 11:20:15 -0600
committerRichard Henderson <richard.henderson@linaro.org>2017-10-24 21:43:50 +0200
commitfa477d25470187030614288d35bc734edffa41ee (patch)
treea4e21c764fff7a6fa3f4c48d3ac2c95eb1c73bf1 /tcg
parent434391390ba99996af1591b427a73b3f5c05065e (diff)
downloadqemu-fa477d25470187030614288d35bc734edffa41ee.zip
qemu-fa477d25470187030614288d35bc734edffa41ee.tar.gz
qemu-fa477d25470187030614288d35bc734edffa41ee.tar.bz2
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>
Diffstat (limited to 'tcg')
-rw-r--r--tcg/optimize.c15
-rw-r--r--tcg/tcg.c11
-rw-r--r--tcg/tcg.h12
3 files changed, 24 insertions, 14 deletions
diff --git a/tcg/optimize.c b/tcg/optimize.c
index d8c3a7e..55f9e83 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -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;
/* If this is already a global, we can't do better. */
- if (temp < s->nb_globals) {
- return temp;
+ if (ts->temp_global) {
+ return arg;
}
/* 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) {
return i;
}
}
/* If it is a temp, search for a temp local. */
- if (!arg_temp(temp)->temp_local) {
- for (i = temps[temp].next_copy ; i != temp ; i = temps[i].next_copy) {
+ if (!ts->temp_local) {
+ for (i = temps[arg].next_copy ; i != arg; i = temps[i].next_copy) {
if (s->temps[i].temp_local) {
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. */
- return temp;
+ return arg;
}
static bool temps_are_copies(TCGArg arg1, TCGArg arg2)
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 935f3da..e2a5f3f 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -489,9 +489,14 @@ static inline TCGTemp *tcg_temp_alloc(TCGContext *s)
static inline TCGTemp *tcg_global_alloc(TCGContext *s)
{
+ TCGTemp *ts;
+
tcg_debug_assert(s->nb_globals == s->nb_temps);
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,
@@ -1190,7 +1195,7 @@ static char *tcg_get_arg_str_ptr(TCGContext *s, char *buf, int buf_size,
{
int idx = temp_idx(s, ts);
- if (idx < s->nb_globals) {
+ if (ts->temp_global) {
pstrcpy(buf, buf_size, ts->name);
} else if (ts->temp_local) {
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->temp_local
- || temp_idx(s, ts) < s->nb_globals
+ || ts->temp_global
? TEMP_VAL_MEM : TEMP_VAL_DEAD);
}
diff --git a/tcg/tcg.h b/tcg/tcg.h
index f06187f..fc4d1ed 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -579,10 +579,14 @@ typedef struct TCGTemp {
unsigned int indirect_base:1;
unsigned int mem_coherent:1;
unsigned int mem_allocated:1;
- unsigned int temp_local:1; /* If true, the temp is saved across
- basic blocks. Otherwise, it is not
- preserved across basic blocks. */
- unsigned int temp_allocated:1; /* never used for code gen */
+ /* If true, the temp is saved across both basic blocks and
+ translation blocks. */
+ unsigned int temp_global:1;
+ /* 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;
struct TCGTemp *mem_base;