[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 08/52] tcg: Introduce temp_arg, export temp_idx
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v7 08/52] tcg: Introduce temp_arg, export temp_idx |
Date: |
Fri, 20 Oct 2017 16:19:39 -0700 |
From: Richard Henderson <address@hidden>
At the same time, adrop the TCGContext argument and use tcg_ctx instead.
Reviewed-by: Emilio G. Cota <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/tcg.h | 12 ++++++++++++
tcg/tcg.c | 19 ++++++-------------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/tcg/tcg.h b/tcg/tcg.h
index 5fcdec1fc5..828c1e70e5 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -729,6 +729,18 @@ struct TCGContext {
extern TCGContext tcg_ctx;
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)
{
return a == TCG_CALL_DUMMY_ARG ? NULL : &tcg_ctx.temps[a];
diff --git a/tcg/tcg.c b/tcg/tcg.c
index e2a5f3f4c2..f6e76df3ba 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -473,13 +473,6 @@ void tcg_func_start(TCGContext *s)
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)
{
int n = s->nb_temps++;
@@ -516,7 +509,7 @@ static int tcg_global_reg_new_internal(TCGContext *s,
TCGType type,
ts->name = name;
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)
@@ -605,7 +598,7 @@ int tcg_global_mem_new_internal(TCGType type, TCGv_ptr base,
ts->mem_offset = offset;
ts->name = name;
}
- return temp_idx(s, ts);
+ return temp_idx(ts);
}
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_local = temp_local;
}
- idx = temp_idx(s, ts);
+ idx = temp_idx(ts);
}
#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,
TCGTemp *ts)
{
- int idx = temp_idx(s, ts);
+ int idx = temp_idx(ts);
if (ts->temp_global) {
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);
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;
/* 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);
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;
temp_state[arg] = TS_MEM;
--
2.13.6
- [Qemu-devel] [PATCH v7 00/52] tcg queued patches, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 01/52] tcg: Merge opcode arguments into TCGOp, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 03/52] tcg: Propagate args to op->args in tcg.c, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 04/52] tcg: Propagate TCGOp down to allocators, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 02/52] tcg: Propagate args to op->args in optimizer, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 05/52] tcg: Introduce arg_temp, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 07/52] tcg: Return NULL temp for TCG_CALL_DUMMY_ARG, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 06/52] tcg: Add temp_global bit to TCGTemp, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 08/52] tcg: Introduce temp_arg, export temp_idx,
Richard Henderson <=
- [Qemu-devel] [PATCH v7 10/52] tcg: Avoid loops against variable bounds, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 11/52] tcg: Change temp_allocate_frame arg to TCGTemp, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 12/52] tcg: Remove unused TCG_CALL_DUMMY_TCGV, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 09/52] tcg: Use per-temp state data in liveness, Richard Henderson, 2017/10/20
- [Qemu-devel] [PATCH v7 15/52] tcg: Push tcg_ctx into tcg_gen_callN, Richard Henderson, 2017/10/20