Changeset 9212 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

May 29, 2008 9:38:38 AM (17 years ago)

Author:

vboxsync

Message:

Major changes for sizeof(RTGCPTR) == uint64_t.
Introduced RCPTRTYPE for pointers valid in raw mode only (RTGCPTR32).

Disabled by default. Enable by adding VBOX_WITH_64_BITS_GUESTS to your LocalConfig.kmk.

File:

• trunk/src/VBox/Runtime/common/misc/sanity.h (modified) (3 diffs)

trunk/src/VBox/Runtime/common/misc/sanity.h

@@ -46 +46 @@
 # error "defined(IN_RING0) && ARCH_BITS != R0_ARCH_BITS"
 #endif
-#if defined(IN_GC) && ARCH_BITS != GC_ARCH_BITS
-# error "defined(IN_GC) && ARCH_BITS != GC_ARCH_BITS"
+#if defined(IN_GC) && ARCH_BITS != 32
+# error "defined(IN_GC) && ARCH_BITS != 32"
 #endif
 #if (defined(IN_RING0) || defined(IN_RING3)) && HC_ARCH_BITS != ARCH_BITS
 # error "(defined(IN_RING0) || defined(IN_RING3)) && HC_ARCH_BITS != ARCH_BITS"
 #endif
-#if defined(IN_GC) && GC_ARCH_BITS != ARCH_BITS
+#if defined(IN_GC) && GC_ARCH_BITS != 64 && GC_ARCH_BITS != ARCH_BITS
 # error "defined(IN_GC) && GC_ARCH_BITS != ARCH_BITS"
 #endif
@@ -124 +124 @@
 #if GC_ARCH_BITS == 64
 
-AssertCompileSize(RTGCINT, 4);
-AssertCompileSize(RTGCUINT, 4);
+AssertCompileSize(RTGCINT, 8);
+AssertCompileSize(RTGCUINT, 8);
 AssertCompileSize(RTGCINTPTR, 8);
 AssertCompileSize(RTGCUINTPTR, 8);
@@ -133 +133 @@
 # ifdef IN_GC
 /*AssertCompileSize(RTCCINTREG, 8);*/
-AssertCompileSize(RTCCUINTREG, 8);
+/* Hack alert: there is no such thing as a GC context when GC_ARCH_BITS == 64; it's still 32 bits */
+AssertCompileSize(RTCCUINTREG, 4);
 # endif