SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

exec: Use uintptr_t in cpu_ldst.h

Browse Source 
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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20210212184902.1251044-5-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2021-02-12 10:48:35 -08:00 committed by Peter Maydell
parent 5ca870b9f6
commit 9abf09ffde
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/exec/cpu_ldst.h
View File

@ -70,14 +70,14 @@ typedef uint64_t abi_ptr;
#endif #endif
/* All direct uses of g2h and h2g need to go away for usermode softmmu. */ /* 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 #if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS
#define guest_addr_valid(x) (1) #define guest_addr_valid(x) (1)
#else #else
#define guest_addr_valid(x) ((x) <= GUEST_ADDR_MAX) #define guest_addr_valid(x) ((x) <= GUEST_ADDR_MAX)
#endif #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) 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) ({ \ #define h2g_nocheck(x) ({ \
unsigned long __ret = (unsigned long)(x) - guest_base; \ uintptr_t __ret = (uintptr_t)(x) - guest_base; \
(abi_ptr)__ret; \ (abi_ptr)__ret; \
}) })