[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/51] tcg: Push tcg_ctx into tcg_gen_callN
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 15/51] tcg: Push tcg_ctx into tcg_gen_callN |
Date: |
Wed, 25 Oct 2017 11:34:59 +0200 |
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Emilio G. Cota <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
include/exec/helper-gen.h | 12 ++++++------
tcg/tcg.h | 3 +--
tcg/tcg.c | 4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h
index 8239ffc77c..476acd9220 100644
--- a/include/exec/helper-gen.h
+++ b/include/exec/helper-gen.h
@@ -9,7 +9,7 @@
#define DEF_HELPER_FLAGS_0(name, flags, ret) \
static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \
{ \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 0, NULL); \
+ tcg_gen_callN(HELPER(name), dh_retvar(ret), 0, NULL); \
}
#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
@@ -17,7 +17,7 @@ static inline void glue(gen_helper_,
name)(dh_retvar_decl(ret) \
dh_arg_decl(t1, 1)) \
{ \
TCGArg args[1] = { dh_arg(t1, 1) }; \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 1, args); \
+ tcg_gen_callN(HELPER(name), dh_retvar(ret), 1, args); \
}
#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
@@ -25,7 +25,7 @@ static inline void glue(gen_helper_,
name)(dh_retvar_decl(ret) \
dh_arg_decl(t1, 1), dh_arg_decl(t2, 2)) \
{ \
TCGArg args[2] = { dh_arg(t1, 1), dh_arg(t2, 2) }; \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 2, args); \
+ tcg_gen_callN(HELPER(name), dh_retvar(ret), 2, args); \
}
#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
@@ -33,7 +33,7 @@ static inline void glue(gen_helper_,
name)(dh_retvar_decl(ret) \
dh_arg_decl(t1, 1), dh_arg_decl(t2, 2), dh_arg_decl(t3, 3)) \
{ \
TCGArg args[3] = { dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3) }; \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 3, args); \
+ tcg_gen_callN(HELPER(name), dh_retvar(ret), 3, args); \
}
#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
@@ -43,7 +43,7 @@ static inline void glue(gen_helper_,
name)(dh_retvar_decl(ret) \
{ \
TCGArg args[4] = { dh_arg(t1, 1), dh_arg(t2, 2), \
dh_arg(t3, 3), dh_arg(t4, 4) }; \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 4, args); \
+ tcg_gen_callN(HELPER(name), dh_retvar(ret), 4, args); \
}
#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
@@ -53,7 +53,7 @@ static inline void glue(gen_helper_,
name)(dh_retvar_decl(ret) \
{ \
TCGArg args[5] = { dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
dh_arg(t4, 4), dh_arg(t5, 5) }; \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 5, args); \
+ tcg_gen_callN(HELPER(name), dh_retvar(ret), 5, args); \
}
#include "helper.h"
diff --git a/tcg/tcg.h b/tcg/tcg.h
index 563e7d36aa..0d61932301 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -951,8 +951,7 @@ do {\
bool tcg_op_supported(TCGOpcode op);
-void tcg_gen_callN(TCGContext *s, void *func,
- TCGArg ret, int nargs, TCGArg *args);
+void tcg_gen_callN(void *func, TCGArg ret, int nargs, TCGArg *args);
void tcg_op_remove(TCGContext *s, TCGOp *op);
TCGOp *tcg_op_insert_before(TCGContext *s, TCGOp *op, TCGOpcode opc, int narg);
diff --git a/tcg/tcg.c b/tcg/tcg.c
index c10e73babe..dac3e06a5b 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -974,9 +974,9 @@ bool tcg_op_supported(TCGOpcode op)
/* Note: we convert the 64 bit args to 32 bit and do some alignment
and endian swap. Maybe it would be better to do the alignment
and endian swap in tcg_reg_alloc_call(). */
-void tcg_gen_callN(TCGContext *s, void *func, TCGArg ret,
- int nargs, TCGArg *args)
+void tcg_gen_callN(void *func, TCGArg ret, int nargs, TCGArg *args)
{
+ TCGContext *s = &tcg_ctx;
int i, real_args, nb_rets, pi;
unsigned sizemask, flags;
TCGHelperInfo *info;
--
2.13.6
- [Qemu-devel] [PULL 06/51] tcg: Add temp_global bit to TCGTemp, (continued)
- [Qemu-devel] [PULL 06/51] tcg: Add temp_global bit to TCGTemp, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 04/51] tcg: Propagate TCGOp down to allocators, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 05/51] tcg: Introduce arg_temp, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 02/51] tcg: Propagate args to op->args in optimizer, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 07/51] tcg: Return NULL temp for TCG_CALL_DUMMY_ARG, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 08/51] tcg: Introduce temp_arg, export temp_idx, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 11/51] tcg: Change temp_allocate_frame arg to TCGTemp, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 09/51] tcg: Use per-temp state data in liveness, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 10/51] tcg: Avoid loops against variable bounds, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 12/51] tcg: Remove unused TCG_CALL_DUMMY_TCGV, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 15/51] tcg: Push tcg_ctx into tcg_gen_callN,
Richard Henderson <=
- [Qemu-devel] [PULL 14/51] tcg: Push tcg_ctx into generator functions, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 13/51] tcg: Use per-temp state data in optimize, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 18/51] tcg: Remove GET_TCGV_* and MAKE_TCGV_*, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 21/51] tcg: Use offsets not indices for TCGv_*, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 17/51] tcg: Introduce temp_tcgv_{i32,i64,ptr}, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 24/51] tcg: Include CF_COUNT_MASK in CF_HASH_MASK, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 16/51] tcg: Introduce tcgv_{i32, i64, ptr}_{arg, temp}, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 23/51] tcg: Add CPUState cflags_next_tb, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 22/51] tcg: define CF_PARALLEL and use it for TB hashing along with CF_COUNT_MASK, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 20/51] qom: Introduce CPUClass.tcg_initialize, Richard Henderson, 2017/10/25