From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOefI-0007EL-6V for qemu-devel@nongnu.org; Fri, 14 Mar 2014 22:49:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOef9-00079a-3H for qemu-devel@nongnu.org; Fri, 14 Mar 2014 22:49:36 -0400 Received: from mail-pb0-x230.google.com ([2607:f8b0:400e:c01::230]:55367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOef8-000798-SM for qemu-devel@nongnu.org; Fri, 14 Mar 2014 22:49:27 -0400 Received: by mail-pb0-f48.google.com with SMTP id md12so3377309pbc.7 for ; Fri, 14 Mar 2014 19:49:25 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Fri, 14 Mar 2014 19:48:28 -0700 Message-Id: <1394851732-25692-3-git-send-email-rth@twiddle.net> In-Reply-To: <1394851732-25692-1-git-send-email-rth@twiddle.net> References: <1394851732-25692-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 02/26] tcg-aarch64: Use intptr_t apropriately List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, claudio.fontana@gmail.com As opposed to tcg_target_long. Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c index 661a5af..6938248 100644 --- a/tcg/aarch64/tcg-target.c +++ b/tcg/aarch64/tcg-target.c @@ -497,7 +497,7 @@ static void tcg_out_insn_3509(TCGContext *s, AArch64Insn insn, TCGType ext, static inline void tcg_out_ldst_9(TCGContext *s, enum aarch64_ldst_op_data op_data, enum aarch64_ldst_op_type op_type, - TCGReg rd, TCGReg rn, tcg_target_long offset) + TCGReg rd, TCGReg rn, intptr_t offset) { /* use LDUR with BASE register with 9bit signed unscaled offset */ tcg_out32(s, op_data << 24 | op_type << 20 @@ -566,7 +566,7 @@ static inline void tcg_out_ldst_r(TCGContext *s, /* solve the whole ldst problem */ static inline void tcg_out_ldst(TCGContext *s, enum aarch64_ldst_op_data data, enum aarch64_ldst_op_type type, - TCGReg rd, TCGReg rn, tcg_target_long offset) + TCGReg rd, TCGReg rn, intptr_t offset) { if (offset >= -256 && offset < 256) { tcg_out_ldst_9(s, data, type, rd, rn, offset); @@ -954,9 +954,9 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) tcg_out_movr(s, 1, TCG_REG_X0, TCG_AREG0); tcg_out_movr(s, (TARGET_LONG_BITS == 64), TCG_REG_X1, lb->addrlo_reg); tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_X2, lb->mem_index); - tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_X3, (tcg_target_long)lb->raddr); + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_X3, (intptr_t)lb->raddr); tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP, - (tcg_target_long)qemu_ld_helpers[lb->opc & 3]); + (intptr_t)qemu_ld_helpers[lb->opc & 3]); tcg_out_callr(s, TCG_REG_TMP); if (lb->opc & 0x04) { tcg_out_sxt(s, 1, lb->opc & 3, lb->datalo_reg, TCG_REG_X0); @@ -979,7 +979,7 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP, (intptr_t)qemu_st_helpers[lb->opc & 3]); tcg_out_callr(s, TCG_REG_TMP); - tcg_out_goto(s, (tcg_target_long)lb->raddr); + tcg_out_goto(s, (intptr_t)lb->raddr); } static void add_qemu_ldst_label(TCGContext *s, int is_ld, int opc, -- 1.8.5.3