mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcg: Add tcg_call_func

Browse Source 
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>
This commit is contained in:
Richard Henderson 2021-03-18 16:40:07 -06:00
parent 3e92aa3443
commit fa52e66062
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tcg/tcg-internal.h
View File

@ -44,6 +44,11 @@ bool tcg_region_alloc(TCGContext *s);
void tcg_region_initial_alloc(TCGContext *s); void tcg_region_initial_alloc(TCGContext *s);
void tcg_region_prologue_set(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) static inline const TCGHelperInfo *tcg_call_info(TCGOp *op)
{ {
return (void *)(uintptr_t)op->args[TCGOP_CALLO(op) + TCGOP_CALLI(op) + 1]; return (void *)(uintptr_t)op->args[TCGOP_CALLO(op) + TCGOP_CALLI(op) + 1];

5
tcg/tcg.c
View File

@ -1740,7 +1740,7 @@ static void tcg_dump_ops(TCGContext *s, bool have_prefs)
} }
} else if (c == INDEX_op_call) { } else if (c == INDEX_op_call) {
const TCGHelperInfo *info = tcg_call_info(op); const TCGHelperInfo *info = tcg_call_info(op);
void *func; void *func = tcg_call_func(op);
/* variable number of arguments */ /* variable number of arguments */
nb_oargs = TCGOP_CALLO(op); 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, * Note that plugins have a template function for the info,
* but the actual function pointer comes from the plugin. * but the actual function pointer comes from the plugin.
*/ */
func = (void *)(uintptr_t)op->args[nb_oargs + nb_iargs];
if (func == info->func) { if (func == info->func) {
col += qemu_log("%s", info->name); col += qemu_log("%s", info->name);
} else { } else {
@ -3789,7 +3788,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op)
int allocate_args; int allocate_args;
TCGRegSet allocated_regs; 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); flags = tcg_call_flags(op);
nb_regs = ARRAY_SIZE(tcg_target_call_iarg_regs); nb_regs = ARRAY_SIZE(tcg_target_call_iarg_regs);