tcg: make tcg_const_ptr actually accept a pointer argument
Make tcg_const_ptr() include a cast so that you can pass it a pointer. This allows us to drop the casts we had in all the places that use this macro. Acked-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
parent
e7d81004e4
commit
73f5e3132a
@ -389,7 +389,7 @@ static inline void tcg_gen_helperN(void *func, int flags, int sizemask,
|
||||
TCGArg ret, int nargs, TCGArg *args)
|
||||
{
|
||||
TCGv_ptr fn;
|
||||
fn = tcg_const_ptr((tcg_target_long)func);
|
||||
fn = tcg_const_ptr(func);
|
||||
tcg_gen_callN(&tcg_ctx, fn, flags, sizemask, ret,
|
||||
nargs, args);
|
||||
tcg_temp_free_ptr(fn);
|
||||
@ -405,7 +405,7 @@ static inline void tcg_gen_helper32(void *func, int sizemask, TCGv_i32 ret,
|
||||
{
|
||||
TCGv_ptr fn;
|
||||
TCGArg args[2];
|
||||
fn = tcg_const_ptr((tcg_target_long)func);
|
||||
fn = tcg_const_ptr(func);
|
||||
args[0] = GET_TCGV_I32(a);
|
||||
args[1] = GET_TCGV_I32(b);
|
||||
tcg_gen_callN(&tcg_ctx, fn, TCG_CALL_CONST | TCG_CALL_PURE, sizemask,
|
||||
@ -418,7 +418,7 @@ static inline void tcg_gen_helper64(void *func, int sizemask, TCGv_i64 ret,
|
||||
{
|
||||
TCGv_ptr fn;
|
||||
TCGArg args[2];
|
||||
fn = tcg_const_ptr((tcg_target_long)func);
|
||||
fn = tcg_const_ptr(func);
|
||||
args[0] = GET_TCGV_I64(a);
|
||||
args[1] = GET_TCGV_I64(b);
|
||||
tcg_gen_callN(&tcg_ctx, fn, TCG_CALL_CONST | TCG_CALL_PURE, sizemask,
|
||||
|
@ -544,7 +544,7 @@ void tcg_add_target_add_op_defs(const TCGTargetOpDef *tdefs);
|
||||
#define TCGV_NAT_TO_PTR(n) MAKE_TCGV_PTR(GET_TCGV_I32(n))
|
||||
#define TCGV_PTR_TO_NAT(n) MAKE_TCGV_I32(GET_TCGV_PTR(n))
|
||||
|
||||
#define tcg_const_ptr(V) TCGV_NAT_TO_PTR(tcg_const_i32(V))
|
||||
#define tcg_const_ptr(V) TCGV_NAT_TO_PTR(tcg_const_i32((tcg_target_long)(V)))
|
||||
#define tcg_global_reg_new_ptr(R, N) \
|
||||
TCGV_NAT_TO_PTR(tcg_global_reg_new_i32((R), (N)))
|
||||
#define tcg_global_mem_new_ptr(R, O, N) \
|
||||
@ -555,7 +555,7 @@ void tcg_add_target_add_op_defs(const TCGTargetOpDef *tdefs);
|
||||
#define TCGV_NAT_TO_PTR(n) MAKE_TCGV_PTR(GET_TCGV_I64(n))
|
||||
#define TCGV_PTR_TO_NAT(n) MAKE_TCGV_I64(GET_TCGV_PTR(n))
|
||||
|
||||
#define tcg_const_ptr(V) TCGV_NAT_TO_PTR(tcg_const_i64(V))
|
||||
#define tcg_const_ptr(V) TCGV_NAT_TO_PTR(tcg_const_i64((tcg_target_long)(V)))
|
||||
#define tcg_global_reg_new_ptr(R, N) \
|
||||
TCGV_NAT_TO_PTR(tcg_global_reg_new_i64((R), (N)))
|
||||
#define tcg_global_mem_new_ptr(R, O, N) \
|
||||
|
Loading…
Reference in New Issue
Block a user