vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcg: Change tcg_out_ld/st offset to intptr_t 

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
master
Richard Henderson 2013-08-20 17:07:26 -07:00
parent 8cfd04959a
commit a05b5b9be0
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tcg/aarch64/tcg-target.c
View File

@ -423,14 +423,14 @@ static inline void tcg_out_mov(TCGContext *s,
} }
static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg 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, (type == TCG_TYPE_I64) ? LDST_64 : LDST_32, LDST_LD, tcg_out_ldst(s, (type == TCG_TYPE_I64) ? LDST_64 : LDST_32, LDST_LD,
arg, arg1, arg2); arg, arg1, arg2);
} }
static inline void tcg_out_st(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)
{ {
tcg_out_ldst(s, (type == TCG_TYPE_I64) ? LDST_64 : LDST_32, LDST_ST, tcg_out_ldst(s, (type == TCG_TYPE_I64) ? LDST_64 : LDST_32, LDST_ST,
arg, arg1, arg2); arg, arg1, arg2);

4
tcg/arm/tcg-target.c
View File

@ -2065,13 +2065,13 @@ static void tcg_target_init(TCGContext *s)
} }
static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg 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_ld32u(s, COND_AL, arg, arg1, arg2); tcg_out_ld32u(s, COND_AL, arg, arg1, arg2);
} }
static inline void tcg_out_st(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)
{ {
tcg_out_st32(s, COND_AL, arg, arg1, arg2); tcg_out_st32(s, COND_AL, arg, arg1, arg2);
} }

4
tcg/hppa/tcg-target.c
View File

@ -392,14 +392,14 @@ static void tcg_out_ldst(TCGContext *s, int ret, int addr,
/* This function is required by tcg.c. */ /* This function is required by tcg.c. */
static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, 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); tcg_out_ldst(s, ret, arg1, arg2, INSN_LDW);
} }
/* This function is required by tcg.c. */ /* This function is required by tcg.c. */
static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg ret, 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); tcg_out_ldst(s, ret, arg1, arg2, INSN_STW);
} }

4
tcg/i386/tcg-target.c
View File

@ -595,14 +595,14 @@ static inline void tcg_out_pop(TCGContext *s, int reg)
} }
static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, 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); int opc = OPC_MOVL_GvEv + (type == TCG_TYPE_I64 ? P_REXW : 0);
tcg_out_modrm_offset(s, opc, ret, arg1, arg2); tcg_out_modrm_offset(s, opc, ret, arg1, arg2);
} }
static inline void tcg_out_st(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)
{ {
int opc = OPC_MOVL_EvGv + (type == TCG_TYPE_I64 ? P_REXW : 0); int opc = OPC_MOVL_EvGv + (type == TCG_TYPE_I64 ? P_REXW : 0);
tcg_out_modrm_offset(s, opc, arg, arg1, arg2); tcg_out_modrm_offset(s, opc, arg, arg1, arg2);

4
tcg/ia64/tcg-target.c
View File

@ -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, 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) { if (type == TCG_TYPE_I32) {
tcg_out_ld_rel(s, OPC_LD4_M1, arg, arg1, arg2); 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, 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) { if (type == TCG_TYPE_I32) {
tcg_out_st_rel(s, OPC_ST4_M4, arg, arg1, arg2); tcg_out_st_rel(s, OPC_ST4_M4, arg, arg1, arg2);

4
tcg/mips/tcg-target.c
View File

@ -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, 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); tcg_out_ldst(s, OPC_LW, arg, arg1, arg2);
} }
static inline void tcg_out_st(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)
{ {
tcg_out_ldst(s, OPC_SW, arg, arg1, arg2); tcg_out_ldst(s, OPC_SW, arg, arg1, arg2);
} }

8
tcg/ppc/tcg-target.c
View File

@ -1062,14 +1062,14 @@ static void tcg_target_qemu_prologue (TCGContext *s)
#endif #endif
} }
static void tcg_out_ld (TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
tcg_target_long arg2) intptr_t arg2)
{ {
tcg_out_ldst (s, ret, arg1, arg2, LWZ, LWZX); tcg_out_ldst (s, ret, arg1, arg2, LWZ, LWZX);
} }
static void tcg_out_st (TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
tcg_target_long arg2) intptr_t arg2)
{ {
tcg_out_ldst (s, arg, arg1, arg2, STW, STWX); tcg_out_ldst (s, arg, arg1, arg2, STW, STWX);
} }

8
tcg/ppc64/tcg-target.c
View File

@ -1072,8 +1072,8 @@ static void tcg_target_qemu_prologue (TCGContext *s)
tcg_out32(s, BCLR | BO_ALWAYS); tcg_out32(s, BCLR | BO_ALWAYS);
} }
static void tcg_out_ld (TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1,
tcg_target_long arg2) intptr_t arg2)
{ {
if (type == TCG_TYPE_I32) if (type == TCG_TYPE_I32)
tcg_out_ldst (s, ret, arg1, arg2, LWZ, LWZX); 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); tcg_out_ldsta (s, ret, arg1, arg2, LD, LDX);
} }
static void tcg_out_st (TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
tcg_target_long arg2) intptr_t arg2)
{ {
if (type == TCG_TYPE_I32) if (type == TCG_TYPE_I32)
tcg_out_ldst (s, arg, arg1, arg2, STW, STWX); tcg_out_ldst (s, arg, arg1, arg2, STW, STWX);

4
tcg/s390/tcg-target.c
View File

@ -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 */ /* load data without address translation or endianness conversion */
static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg data, 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) { if (type == TCG_TYPE_I32) {
tcg_out_mem(s, RX_L, RXY_LY, data, base, TCG_REG_NONE, ofs); 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, 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) { if (type == TCG_TYPE_I32) {
tcg_out_mem(s, RX_ST, RXY_STY, data, base, TCG_REG_NONE, ofs); tcg_out_mem(s, RX_ST, RXY_STY, data, base, TCG_REG_NONE, ofs);

4
tcg/sparc/tcg-target.c
View File

@ -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, 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)); 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, 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)); tcg_out_ldst(s, arg, arg1, arg2, (type == TCG_TYPE_I32 ? STW : STX));
} }

4
tcg/tcg.c
View File

@ -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. */ /* Forward declarations for functions declared and used in tcg-target.c. */
static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str); static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str);
static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, 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_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg);
static void tcg_out_movi(TCGContext *s, TCGType type, static void tcg_out_movi(TCGContext *s, TCGType type,
TCGReg ret, tcg_target_long arg); TCGReg ret, tcg_target_long arg);
static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
const int *const_args); const int *const_args);
static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, 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, static int tcg_target_const_match(tcg_target_long val,
const TCGArgConstraint *arg_ct); const TCGArgConstraint *arg_ct);

4
tcg/tci/tcg-target.c
View File

@ -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, 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; uint8_t *old_code_ptr = s->code_ptr;
if (type == TCG_TYPE_I32) { 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, 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; uint8_t *old_code_ptr = s->code_ptr;
if (type == TCG_TYPE_I32) { if (type == TCG_TYPE_I32) {