From c6d506742fd997a29b611fda11f67c53d60dd5ef Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 16 Mar 2012 20:23:49 +0100 Subject: [PATCH] w64: Fix data types in cpu-all.h, exec.c w64 needs uintptr_t instead of unsigned long. For other hosts, nothing changes. Signed-off-by: Stefan Weil --- cpu-all.h | 8 ++++---- exec.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 58420be86f..f7d6867b0d 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -299,10 +299,10 @@ extern unsigned long reserved_va; #define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) #define TARGET_PAGE_ALIGN(addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK) -/* ??? These should be the larger of unsigned long and target_ulong. */ -extern unsigned long qemu_real_host_page_size; -extern unsigned long qemu_host_page_size; -extern unsigned long qemu_host_page_mask; +/* ??? These should be the larger of uintptr_t and target_ulong. */ +extern uintptr_t qemu_real_host_page_size; +extern uintptr_t qemu_host_page_size; +extern uintptr_t qemu_host_page_mask; #define HOST_PAGE_ALIGN(addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask) diff --git a/exec.c b/exec.c index 68b8a6a2ba..3dda2ca271 100644 --- a/exec.c +++ b/exec.c @@ -177,9 +177,9 @@ typedef struct PageDesc { #define V_L1_SHIFT (L1_MAP_ADDR_SPACE_BITS - TARGET_PAGE_BITS - V_L1_BITS) -unsigned long qemu_real_host_page_size; -unsigned long qemu_host_page_size; -unsigned long qemu_host_page_mask; +uintptr_t qemu_real_host_page_size; +uintptr_t qemu_host_page_size; +uintptr_t qemu_host_page_mask; /* This is a multi-level map on the virtual address space. The bottom level has pointers to PageDesc. */