[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/33] tcg: Add tcg_call_func
From: |
Richard Henderson |
Subject: |
[PULL 07/33] tcg: Add tcg_call_func |
Date: |
Sat, 19 Jun 2021 11:14:26 -0700 |
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/tcg-internal.h | 5 +++++
tcg/tcg.c | 5 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/tcg/tcg-internal.h b/tcg/tcg-internal.h
index 6ab8910210..92c91dcde9 100644
--- a/tcg/tcg-internal.h
+++ b/tcg/tcg-internal.h
@@ -44,6 +44,11 @@ bool tcg_region_alloc(TCGContext *s);
void tcg_region_initial_alloc(TCGContext *s);
void tcg_region_prologue_set(TCGContext *s);
+static inline void *tcg_call_func(TCGOp *op)
+{
+ return (void *)(uintptr_t)op->args[TCGOP_CALLO(op) + TCGOP_CALLI(op)];
+}
+
static inline const TCGHelperInfo *tcg_call_info(TCGOp *op)
{
return (void *)(uintptr_t)op->args[TCGOP_CALLO(op) + TCGOP_CALLI(op) + 1];
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 0dc99cc65b..8f4f1711cd 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -1740,7 +1740,7 @@ static void tcg_dump_ops(TCGContext *s, bool have_prefs)
}
} else if (c == INDEX_op_call) {
const TCGHelperInfo *info = tcg_call_info(op);
- void *func;
+ void *func = tcg_call_func(op);
/* variable number of arguments */
nb_oargs = TCGOP_CALLO(op);
@@ -1754,7 +1754,6 @@ static void tcg_dump_ops(TCGContext *s, bool have_prefs)
* Note that plugins have a template function for the info,
* but the actual function pointer comes from the plugin.
*/
- func = (void *)(uintptr_t)op->args[nb_oargs + nb_iargs];
if (func == info->func) {
col += qemu_log("%s", info->name);
} else {
@@ -3789,7 +3788,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op)
int allocate_args;
TCGRegSet allocated_regs;
- func_addr = (tcg_insn_unit *)(intptr_t)op->args[nb_oargs + nb_iargs];
+ func_addr = tcg_call_func(op);
flags = tcg_call_flags(op);
nb_regs = ARRAY_SIZE(tcg_target_call_iarg_regs);
--
2.25.1
- [PULL 00/33] tcg patch queue, Richard Henderson, 2021/06/19
- [PULL 01/33] tcg: Combine dh_is_64bit and dh_is_signed to dh_typecode, Richard Henderson, 2021/06/19
- [PULL 03/33] accel/tcg/plugin-gen: Drop inline markers, Richard Henderson, 2021/06/19
- [PULL 04/33] plugins: Drop tcg_flags from struct qemu_plugin_dyn_cb, Richard Henderson, 2021/06/19
- [PULL 06/33] tcg: Store the TCGHelperInfo in the TCGOp for call, Richard Henderson, 2021/06/19
- [PULL 05/33] accel/tcg: Add tcg call flags to plugins helpers, Richard Henderson, 2021/06/19
- [PULL 07/33] tcg: Add tcg_call_func,
Richard Henderson <=
- [PULL 08/33] tcg: Build ffi data structures for helpers, Richard Henderson, 2021/06/19
- [PULL 09/33] tcg/tci: Improve tcg_target_call_clobber_regs, Richard Henderson, 2021/06/19
- [PULL 02/33] tcg: Add tcg_call_flags, Richard Henderson, 2021/06/19
- [PULL 10/33] tcg/tci: Move call-return regs to end of tcg_target_reg_alloc_order, Richard Henderson, 2021/06/19
- [PULL 11/33] tcg/tci: Use ffi for calls, Richard Henderson, 2021/06/19
- [PULL 18/33] tcg/tci: Implement andc, orc, eqv, nand, nor, Richard Henderson, 2021/06/19
- [PULL 12/33] tcg/tci: Reserve r13 for a temporary, Richard Henderson, 2021/06/19
- [PULL 30/33] tcg: Allocate sufficient storage in temp_allocate_frame, Richard Henderson, 2021/06/19
- [PULL 26/33] tcg/tci: Use {set,clear}_helper_retaddr, Richard Henderson, 2021/06/19
- [PULL 25/33] tcg/tci: Remove the qemu_ld/st_type macros, Richard Henderson, 2021/06/19