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

tcg: Introduce temp_arg, export temp_idx 

At the same time, drop the TCGContext argument and use tcg_ctx instead.

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 2017-06-20 12:24:57 -07:00 committed by Richard Henderson
parent c6c7d84df8
commit 1807f4c400
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tcg/tcg.c
View File

@ -473,13 +473,6 @@ void tcg_func_start(TCGContext *s)
s->gen_next_op_idx = 1; s->gen_next_op_idx = 1;
} }
static inline int temp_idx(TCGContext *s, TCGTemp *ts)
{
ptrdiff_t n = ts - s->temps;
tcg_debug_assert(n >= 0 && n < s->nb_temps);
return n;
}
static inline TCGTemp *tcg_temp_alloc(TCGContext *s) static inline TCGTemp *tcg_temp_alloc(TCGContext *s)
{ {
int n = s->nb_temps++; int n = s->nb_temps++;
@ -516,7 +509,7 @@ static int tcg_global_reg_new_internal(TCGContext *s, TCGType type,
ts->name = name; ts->name = name;
tcg_regset_set_reg(s->reserved_regs, reg); tcg_regset_set_reg(s->reserved_regs, reg);
return temp_idx(s, ts); return temp_idx(ts);
} }
void tcg_set_frame(TCGContext *s, TCGReg reg, intptr_t start, intptr_t size) void tcg_set_frame(TCGContext *s, TCGReg reg, intptr_t start, intptr_t size)
@ -605,7 +598,7 @@ int tcg_global_mem_new_internal(TCGType type, TCGv_ptr base,
ts->mem_offset = offset; ts->mem_offset = offset;
ts->name = name; ts->name = name;
} }
return temp_idx(s, ts); return temp_idx(ts);
} }
static int tcg_temp_new_internal(TCGType type, int temp_local) static int tcg_temp_new_internal(TCGType type, int temp_local)
@ -645,7 +638,7 @@ static int tcg_temp_new_internal(TCGType type, int temp_local)
ts->temp_allocated = 1; ts->temp_allocated = 1;
ts->temp_local = temp_local; ts->temp_local = temp_local;
} }
idx = temp_idx(s, ts); idx = temp_idx(ts);
} }
#if defined(CONFIG_DEBUG_TCG) #if defined(CONFIG_DEBUG_TCG)
@ -1193,7 +1186,7 @@ static void tcg_reg_alloc_start(TCGContext *s)
static char *tcg_get_arg_str_ptr(TCGContext *s, char *buf, int buf_size, static char *tcg_get_arg_str_ptr(TCGContext *s, char *buf, int buf_size,
TCGTemp *ts) TCGTemp *ts)
{ {
int idx = temp_idx(s, ts); int idx = temp_idx(ts);
if (ts->temp_global) { if (ts->temp_global) {
pstrcpy(buf, buf_size, ts->name); pstrcpy(buf, buf_size, ts->name);
@ -1941,7 +1934,7 @@ static bool liveness_pass_2(TCGContext *s, uint8_t *temp_state)
TCGOp *lop = tcg_op_insert_before(s, op, lopc, 3); TCGOp *lop = tcg_op_insert_before(s, op, lopc, 3);
lop->args[0] = dir; lop->args[0] = dir;
lop->args[1] = temp_idx(s, its->mem_base); lop->args[1] = temp_arg(its->mem_base);
lop->args[2] = its->mem_offset; lop->args[2] = its->mem_offset;
/* Loaded, but synced with memory. */ /* Loaded, but synced with memory. */
@ -2012,7 +2005,7 @@ static bool liveness_pass_2(TCGContext *s, uint8_t *temp_state)
TCGOp *sop = tcg_op_insert_after(s, op, sopc, 3); TCGOp *sop = tcg_op_insert_after(s, op, sopc, 3);
sop->args[0] = dir; sop->args[0] = dir;
sop->args[1] = temp_idx(s, its->mem_base); sop->args[1] = temp_arg(its->mem_base);
sop->args[2] = its->mem_offset; sop->args[2] = its->mem_offset;
temp_state[arg] = TS_MEM; temp_state[arg] = TS_MEM;

12
tcg/tcg.h
View File

@ -729,6 +729,18 @@ struct TCGContext {
extern TCGContext tcg_ctx; extern TCGContext tcg_ctx;
extern bool parallel_cpus; extern bool parallel_cpus;
static inline size_t temp_idx(TCGTemp *ts)
{
ptrdiff_t n = ts - tcg_ctx.temps;
tcg_debug_assert(n >= 0 && n < tcg_ctx.nb_temps);
return n;
}
static inline TCGArg temp_arg(TCGTemp *ts)
{
return temp_idx(ts);
}
static inline TCGTemp *arg_temp(TCGArg a) static inline TCGTemp *arg_temp(TCGArg a)
{ {
return a == TCG_CALL_DUMMY_ARG ? NULL : &tcg_ctx.temps[a]; return a == TCG_CALL_DUMMY_ARG ? NULL : &tcg_ctx.temps[a];