From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e499t-00026Z-Kp for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e499s-0003SC-Nk for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:33 -0400 Received: from mail-pf0-x22b.google.com ([2607:f8b0:400e:c00::22b]:51667) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e499s-0003RQ-DK for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:32 -0400 Received: by mail-pf0-x22b.google.com with SMTP id n14so16279924pfh.8 for ; Mon, 16 Oct 2017 10:26:32 -0700 (PDT) From: Richard Henderson Date: Mon, 16 Oct 2017 10:25:32 -0700 Message-Id: <20171016172609.23422-14-richard.henderson@linaro.org> In-Reply-To: <20171016172609.23422-1-richard.henderson@linaro.org> References: <20171016172609.23422-1-richard.henderson@linaro.org> Subject: [Qemu-devel] [PATCH v6 13/50] tcg: Export temp_idx List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: cota@braap.org, Richard Henderson From: Richard Henderson At the same time, drop the TCGContext argument and use tcg_ctx instead. Signed-off-by: Richard Henderson --- tcg/tcg.h | 7 ++++++- tcg/tcg.c | 15 ++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tcg/tcg.h b/tcg/tcg.h index e0615de90f..c50805217c 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -734,13 +734,18 @@ struct TCGContext { extern TCGContext tcg_ctx; extern bool parallel_cpus; -static inline TCGArg temp_arg(TCGTemp *ts) +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 163ec8b1c0..b39944d42a 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) @@ -1186,7 +1179,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); -- 2.13.6