diff options
| author | Richard Henderson <rth@twiddle.net> | 2013-09-09 08:26:49 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2014-04-28 11:06:34 -0700 |
| commit | 71b926992e0e0a0da078873480c6fc1dd65af6fc (patch) | |
| tree | 8fcb8b37e95f6a35e630bd0514b9c395d627aa00 | |
| parent | e2da502c003b9a91b4aea7684959192bd07c1f1d (diff) | |
tcg: Fix missed pointer size != TCG_TARGET_REG_BITS changes
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | include/exec/def-helper.h | 2 | ||||
| -rw-r--r-- | 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 73d51f9cf5..255b58bb03 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 8d4ff7da9b..6b8ee5dac5 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -2861,7 +2861,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) \ @@ -2883,4 +2883,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 */ |