On Thu, Aug 22, 2013 at 09:58:43AM -0700, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <r...@twiddle.net>
> ---
> tcg/aarch64/tcg-target.c | 4 ++--
> tcg/arm/tcg-target.c | 4 ++--
> tcg/hppa/tcg-target.c | 4 ++--
> tcg/i386/tcg-target.c | 4 ++--
> tcg/ia64/tcg-target.c | 4 ++--
> tcg/mips/tcg-target.c | 4 ++--
> tcg/ppc/tcg-target.c | 8 ++++----
> tcg/ppc64/tcg-target.c | 8 ++++----
> tcg/s390/tcg-target.c | 4 ++--
> tcg/sparc/tcg-target.c | 4 ++--
> tcg/tcg.c | 4 ++--
> tcg/tci/tcg-target.c | 4 ++--
> 12 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
> index 7dde210..c472a4a 100644
> --- a/tcg/aarch64/tcg-target.c
> +++ b/tcg/aarch64/tcg-target.c
> @@ -423,14 +423,14 @@ static inline void tcg_out_mov(TCGContext *s,
> }
>
> static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ldst(s, (type == TCG_TYPE_I64) ? LDST_64 : LDST_32, LDST_LD,
> arg, arg1, arg2);
> }
>
> static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ldst(s, (type == TCG_TYPE_I64) ? LDST_64 : LDST_32, LDST_ST,
> arg, arg1, arg2);
> diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
> index e93c67f..5d2db36 100644
> --- a/tcg/arm/tcg-target.c
> +++ b/tcg/arm/tcg-target.c
> @@ -2065,13 +2065,13 @@ static void tcg_target_init(TCGContext *s)
> }
>
> static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ld32u(s, COND_AL, arg, arg1, arg2);
> }
>
> static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_st32(s, COND_AL, arg, arg1, arg2);
> }
> diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c
> index e055988..f464aff 100644
> --- a/tcg/hppa/tcg-target.c
> +++ b/tcg/hppa/tcg-target.c
> @@ -388,14 +388,14 @@ static void tcg_out_ldst(TCGContext *s, int ret, int
> addr,
>
> /* This function is required by tcg.c. */
> static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ldst(s, ret, arg1, arg2, INSN_LDW);
> }
>
> /* This function is required by tcg.c. */
> static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg ret,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ldst(s, ret, arg1, arg2, INSN_STW);
> }
> diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
> index 63db888..b1e4e5b 100644
> --- a/tcg/i386/tcg-target.c
> +++ b/tcg/i386/tcg-target.c
> @@ -581,14 +581,14 @@ static inline void tcg_out_pop(TCGContext *s, int reg)
> }
>
> static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> int opc = OPC_MOVL_GvEv + (type == TCG_TYPE_I64 ? P_REXW : 0);
> tcg_out_modrm_offset(s, opc, ret, arg1, arg2);
> }
>
> static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> int opc = OPC_MOVL_EvGv + (type == TCG_TYPE_I64 ? P_REXW : 0);
> tcg_out_modrm_offset(s, opc, arg, arg1, arg2);
> diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c
> index c499ee8..0a3ff70 100644
> --- a/tcg/ia64/tcg-target.c
> +++ b/tcg/ia64/tcg-target.c
> @@ -993,7 +993,7 @@ static inline void tcg_out_st_rel(TCGContext *s, uint64_t
> opc_m4, TCGArg arg,
> }
>
> static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> if (type == TCG_TYPE_I32) {
> tcg_out_ld_rel(s, OPC_LD4_M1, arg, arg1, arg2);
> @@ -1003,7 +1003,7 @@ static inline void tcg_out_ld(TCGContext *s, TCGType
> type, TCGReg arg,
> }
>
> static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> if (type == TCG_TYPE_I32) {
> tcg_out_st_rel(s, OPC_ST4_M4, arg, arg1, arg2);
> diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
> index 5aa31dc..acf6957 100644
> --- a/tcg/mips/tcg-target.c
> +++ b/tcg/mips/tcg-target.c
> @@ -514,13 +514,13 @@ static inline void tcg_out_ldst(TCGContext *s, int opc,
> TCGArg arg,
> }
>
> static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ldst(s, OPC_LW, arg, arg1, arg2);
> }
>
> static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ldst(s, OPC_SW, arg, arg1, arg2);
> }
> diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c
> index 4d6ee1e..f45ce7c 100644
> --- a/tcg/ppc/tcg-target.c
> +++ b/tcg/ppc/tcg-target.c
> @@ -1062,14 +1062,14 @@ static void tcg_target_qemu_prologue (TCGContext *s)
> #endif
> }
>
> -static void tcg_out_ld (TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
> - tcg_target_long arg2)
> +static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
> + intptr_t arg2)
> {
> tcg_out_ldst (s, ret, arg1, arg2, LWZ, LWZX);
> }
>
> -static void tcg_out_st (TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
> - tcg_target_long arg2)
> +static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
> + intptr_t arg2)
> {
> tcg_out_ldst (s, arg, arg1, arg2, STW, STWX);
> }
> diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
> index fb070f8..e0353d0 100644
> --- a/tcg/ppc64/tcg-target.c
> +++ b/tcg/ppc64/tcg-target.c
> @@ -1072,8 +1072,8 @@ static void tcg_target_qemu_prologue (TCGContext *s)
> tcg_out32(s, BCLR | BO_ALWAYS);
> }
>
> -static void tcg_out_ld (TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
> - tcg_target_long arg2)
> +static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
> + intptr_t arg2)
> {
> if (type == TCG_TYPE_I32)
> tcg_out_ldst (s, ret, arg1, arg2, LWZ, LWZX);
> @@ -1081,8 +1081,8 @@ static void tcg_out_ld (TCGContext *s, TCGType type,
> TCGReg ret, TCGReg arg1,
> tcg_out_ldsta (s, ret, arg1, arg2, LD, LDX);
> }
>
> -static void tcg_out_st (TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
> - tcg_target_long arg2)
> +static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
> + intptr_t arg2)
> {
> if (type == TCG_TYPE_I32)
> tcg_out_ldst (s, arg, arg1, arg2, STW, STWX);
> diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
> index adf7099..a1dcb3d 100644
> --- a/tcg/s390/tcg-target.c
> +++ b/tcg/s390/tcg-target.c
> @@ -771,7 +771,7 @@ static void tcg_out_mem(TCGContext *s, S390Opcode opc_rx,
> S390Opcode opc_rxy,
>
> /* load data without address translation or endianness conversion */
> static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg data,
> - TCGReg base, tcg_target_long ofs)
> + TCGReg base, intptr_t ofs)
> {
> if (type == TCG_TYPE_I32) {
> tcg_out_mem(s, RX_L, RXY_LY, data, base, TCG_REG_NONE, ofs);
> @@ -781,7 +781,7 @@ static inline void tcg_out_ld(TCGContext *s, TCGType
> type, TCGReg data,
> }
>
> static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg data,
> - TCGReg base, tcg_target_long ofs)
> + TCGReg base, intptr_t ofs)
> {
> if (type == TCG_TYPE_I32) {
> tcg_out_mem(s, RX_ST, RXY_STY, data, base, TCG_REG_NONE, ofs);
> diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
> index 9f2e2c9..5eb8c76 100644
> --- a/tcg/sparc/tcg-target.c
> +++ b/tcg/sparc/tcg-target.c
> @@ -436,13 +436,13 @@ static inline void tcg_out_ldst(TCGContext *s, int ret,
> int addr,
> }
>
> static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ldst(s, ret, arg1, arg2, (type == TCG_TYPE_I32 ? LDUW : LDX));
> }
>
> static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg,
> - TCGReg arg1, tcg_target_long arg2)
> + TCGReg arg1, intptr_t arg2)
> {
> tcg_out_ldst(s, arg, arg1, arg2, (type == TCG_TYPE_I32 ? STW : STX));
> }
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index c80aa3c..1d7cdaf 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -93,14 +93,14 @@ static void tcg_register_jit_int(void *buf, size_t size,
> /* Forward declarations for functions declared and used in tcg-target.c. */
> static int target_parse_constraint(TCGArgConstraint *ct, const char
> **pct_str);
> static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
> - tcg_target_long arg2);
> + intptr_t arg2);
> static void tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg);
> static void tcg_out_movi(TCGContext *s, TCGType type,
> TCGReg ret, tcg_target_long arg);
> static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
> const int *const_args);
> static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
> - tcg_target_long arg2);
> + intptr_t arg2);
> static int tcg_target_const_match(tcg_target_long val,
> const TCGArgConstraint *arg_ct);
>
> diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c
> index 49be6a5..281d7d5 100644
> --- a/tcg/tci/tcg-target.c
> +++ b/tcg/tci/tcg-target.c
> @@ -488,7 +488,7 @@ static void tci_out_label(TCGContext *s, TCGArg arg)
> }
>
> static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
> - tcg_target_long arg2)
> + intptr_t arg2)
> {
> uint8_t *old_code_ptr = s->code_ptr;
> if (type == TCG_TYPE_I32) {
> @@ -842,7 +842,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
> const TCGArg *args,
> }
>
> static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
> - tcg_target_long arg2)
> + intptr_t arg2)
> {
> uint8_t *old_code_ptr = s->code_ptr;
> if (type == TCG_TYPE_I32) {
Reviewed-by: Aurelien Jarno <aurel...@aurel32.net>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurel...@aurel32.net http://www.aurel32.net
