From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPcQO-0005xw-SZ for qemu-devel@nongnu.org; Mon, 17 Mar 2014 14:38:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPcQI-0001Ta-Ny for qemu-devel@nongnu.org; Mon, 17 Mar 2014 14:38:12 -0400 Received: from mail-qa0-x236.google.com ([2607:f8b0:400d:c00::236]:44322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPcQI-0001Sl-JP for qemu-devel@nongnu.org; Mon, 17 Mar 2014 14:38:06 -0400 Received: by mail-qa0-f54.google.com with SMTP id w8so5818144qac.13 for ; Mon, 17 Mar 2014 11:38:06 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 17 Mar 2014 11:37:43 -0700 Message-Id: <1395081476-6038-2-git-send-email-rth@twiddle.net> In-Reply-To: <1395081476-6038-1-git-send-email-rth@twiddle.net> References: <1395081476-6038-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 01/14] tcg: Fix missed pointer size != TCG_TARGET_REG_BITS changes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, aurelien@aurel32.net Signed-off-by: Richard Henderson --- include/exec/def-helper.h | 2 +- tcg/tcg-op.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/exec/def-helper.h b/include/exec/def-helper.h index 73d51f9..255b58b 100644 --- a/include/exec/def-helper.h +++ b/include/exec/def-helper.h @@ -84,7 +84,7 @@ #define dh_is_64bit_noreturn 0 #define dh_is_64bit_i32 0 #define dh_is_64bit_i64 1 -#define dh_is_64bit_ptr (TCG_TARGET_REG_BITS == 64) +#define dh_is_64bit_ptr (sizeof(void *) == 8) #define dh_is_64bit(t) glue(dh_is_64bit_, dh_alias(t)) #define dh_is_signed_void 0 diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index 7eabf22..4089d89 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -2865,7 +2865,7 @@ static inline void tcg_gen_qemu_st64(TCGv_i64 arg, TCGv addr, int mem_index) #define tcg_gen_muls2_tl tcg_gen_muls2_i32 #endif -#if TCG_TARGET_REG_BITS == 32 +#if UINTPTR_MAX == UINT32_MAX # define tcg_gen_ld_ptr(R, A, O) \ tcg_gen_ld_i32(TCGV_PTR_TO_NAT(R), (A), (O)) # define tcg_gen_discard_ptr(A) \ @@ -2887,4 +2887,4 @@ static inline void tcg_gen_qemu_st64(TCGv_i64 arg, TCGv addr, int mem_index) tcg_gen_addi_i64(TCGV_PTR_TO_NAT(R), TCGV_PTR_TO_NAT(A), (B)) # define tcg_gen_ext_i32_ptr(R, A) \ tcg_gen_ext_i32_i64(TCGV_PTR_TO_NAT(R), (A)) -#endif /* TCG_TARGET_REG_BITS == 32 */ +#endif /* UINTPTR_MAX == UINT32_MAX */ -- 1.8.5.3