[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/45] exec: Use uintptr_t in cpu_ldst.h
From: |
Peter Maydell |
Subject: |
[PULL 13/45] exec: Use uintptr_t in cpu_ldst.h |
Date: |
Thu, 11 Feb 2021 12:58:28 +0000 |
From: Richard Henderson <richard.henderson@linaro.org>
This is more descriptive than 'unsigned long'.
No functional change, since these match on all linux+bsd hosts.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210210000223.884088-5-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
include/exec/cpu_ldst.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index ef54cb7e1f8..3f9063aaded 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -70,14 +70,14 @@ typedef uint64_t abi_ptr;
#endif
/* All direct uses of g2h and h2g need to go away for usermode softmmu. */
-#define g2h(x) ((void *)((unsigned long)(abi_ptr)(x) + guest_base))
+#define g2h(x) ((void *)((uintptr_t)(abi_ptr)(x) + guest_base))
#if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS
#define guest_addr_valid(x) (1)
#else
#define guest_addr_valid(x) ((x) <= GUEST_ADDR_MAX)
#endif
-#define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base)
+#define h2g_valid(x) guest_addr_valid((uintptr_t)(x) - guest_base)
static inline int guest_range_valid(unsigned long start, unsigned long len)
{
@@ -85,7 +85,7 @@ static inline int guest_range_valid(unsigned long start,
unsigned long len)
}
#define h2g_nocheck(x) ({ \
- unsigned long __ret = (unsigned long)(x) - guest_base; \
+ uintptr_t __ret = (uintptr_t)(x) - guest_base; \
(abi_ptr)__ret; \
})
--
2.20.1
- [PULL 07/45] target/arm: Set ID_PFR0.DIT to 1 for "max" 32-bit CPU, (continued)
- [PULL 07/45] target/arm: Set ID_PFR0.DIT to 1 for "max" 32-bit CPU, Peter Maydell, 2021/02/11
- [PULL 04/45] target/arm: Add support for FEAT_DIT, Data Independent Timing, Peter Maydell, 2021/02/11
- [PULL 02/45] target/arm: Fix SCR RES1 handling, Peter Maydell, 2021/02/11
- [PULL 08/45] arm: Update infocenter.arm.com URLs, Peter Maydell, 2021/02/11
- [PULL 03/45] hw/arm: Remove GPIO from unimplemented NPCM7XX, Peter Maydell, 2021/02/11
- [PULL 06/45] target/arm: Set ID_AA64PFR0.DIT and ID_PFR0.DIT to 1 for "max" AA64 CPU, Peter Maydell, 2021/02/11
- [PULL 09/45] accel/tcg: Add URL of clang bug to comment about our workaround, Peter Maydell, 2021/02/11
- [PULL 10/45] tcg: Introduce target-specific page data for user-only, Peter Maydell, 2021/02/11
- [PULL 11/45] linux-user: Introduce PAGE_ANON, Peter Maydell, 2021/02/11
- [PULL 12/45] exec: Use uintptr_t for guest_base, Peter Maydell, 2021/02/11
- [PULL 13/45] exec: Use uintptr_t in cpu_ldst.h,
Peter Maydell <=
- [PULL 16/45] linux-user: Tidy VERIFY_READ/VERIFY_WRITE, Peter Maydell, 2021/02/11
- [PULL 17/45] bsd-user: Tidy VERIFY_READ/VERIFY_WRITE, Peter Maydell, 2021/02/11
- [PULL 15/45] linux-user: Check for overflow in access_ok, Peter Maydell, 2021/02/11
- [PULL 14/45] exec: Improve types for guest_addr_valid, Peter Maydell, 2021/02/11
- [PULL 20/45] exec: Introduce cpu_untagged_addr, Peter Maydell, 2021/02/11
- [PULL 18/45] linux-user: Do not use guest_addr_valid for h2g_valid, Peter Maydell, 2021/02/11
- [PULL 19/45] linux-user: Fix guest_addr_valid vs reserved_va, Peter Maydell, 2021/02/11
- [PULL 23/45] linux-user: Use guest_range_valid in access_ok, Peter Maydell, 2021/02/11
- [PULL 21/45] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged, Peter Maydell, 2021/02/11