Changeset 42601 in vbox for trunk/src/recompiler/cpu-all.h

Timestamp:

Aug 5, 2012 4:26:25 PM (12 years ago)

Author:

vboxsync

Message:

REM: Initial changes to make it work (seemingly) with MinGW-w64.

File:

• trunk/src/recompiler/cpu-all.h (modified) (7 diffs)

trunk/src/recompiler/cpu-all.h

@@ -774 +774 @@
  */
 #if defined(CONFIG_USE_GUEST_BASE)
-extern unsigned long guest_base;
+extern uintptr_t guest_base;
 extern int have_guest_base;
-extern unsigned long reserved_va;
+extern uintptr_t reserved_va;
 #define GUEST_BASE guest_base
 #define RESERVED_VA reserved_va
@@ -785 +785 @@
 
 /* All direct uses of g2h and h2g need to go away for usermode softmmu.  */
-#define g2h(x) ((void *)((unsigned long)(x) + GUEST_BASE))
+#define g2h(x) ((void *)((uintptr_t)(x) + GUEST_BASE))
 
 #if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS
@@ -791 +791 @@
 #else
 #define h2g_valid(x) ({ \
-    unsigned long __guest = (unsigned long)(x) - GUEST_BASE; \
+    uintptr_t __guest = (uintptr_t)(x) - GUEST_BASE; \
     __guest < (1ul << TARGET_VIRT_ADDR_SPACE_BITS); \
 })
@@ -797 +797 @@
 
 #define h2g(x) ({ \
-    unsigned long __ret = (unsigned long)(x) - GUEST_BASE; \
+    uintptr_t __ret = (uintptr_t)(x) - GUEST_BASE; \
     /* Check if given address fits target address space */ \
     assert(h2g_valid(x)); \
@@ -809 +809 @@
 /* NOTE: we use double casts if pointers and target_ulong have
    different sizes */
-#define saddr(x) (uint8_t *)(long)(x)
-#define laddr(x) (uint8_t *)(long)(x)
+#define saddr(x) (uint8_t *)(intptr_t)(x)
+#define laddr(x) (uint8_t *)(intptr_t)(x)
 #endif
 
@@ -877 +877 @@
 #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_bits;
-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 size_t qemu_real_host_page_size;
+extern size_t qemu_host_page_bits;
+extern size_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)
@@ -903 +903 @@
 
 typedef int (*walk_memory_regions_fn)(void *, abi_ulong,
-                                      abi_ulong, unsigned long);
+                                      abi_ulong, uintptr_t);
 int walk_memory_regions(void *, walk_memory_regions_fn);