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

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.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/sanity.h (modified) (3 diffs)
• common/string/strformatrt.cpp (modified) (2 diffs)
• testcase/tstStrFormat.cpp (modified) (1 diff)

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
 

trunk/src/VBox/Runtime/common/string/strformatrt.cpp

@@ -54 +54 @@
  *      - \%RTproc          - Takes a #RTPROCESS value.
  *      - \%RTptr           - Takes a #RTINTPTR or #RTUINTPTR value (but not void *).
- *      - \%RTreg           - Takes a #RTUINTREG value.
+ *      - \%RTreg           - Takes a #RTCCUINTREG value.
  *      - \%RTsel           - Takes a #RTSEL value.
  *      - \%RTsem           - Takes a #RTSEMEVENT, #RTSEMEVENTMULTI, #RTSEMMUTEX, #RTSEMFASTMUTEX, or #RTSEMRW value.
@@ -245 +245 @@
                     { STRMEM("Tproc"),   sizeof(RTPROCESS),      16, RTSF_INTW,  0 },
                     { STRMEM("Tptr"),    sizeof(RTUINTPTR),      16, RTSF_INTW,  0 },
-                    { STRMEM("Treg"),    sizeof(RTUINTREG),      16, RTSF_INTW,  0 },
+                    { STRMEM("Treg"),    sizeof(RTCCUINTREG),    16, RTSF_INTW,  0 },
                     { STRMEM("Tsel"),    sizeof(RTSEL),          16, RTSF_INTW,  0 },
                     { STRMEM("Tsem"),    sizeof(RTSEMEVENT),     16, RTSF_INTW,  0 },

trunk/src/VBox/Runtime/testcase/tstStrFormat.cpp

@@ -294 +294 @@
     }
 
-    if (sizeof(RTUINTREG) == 8)
-    {
-        CHECK42("%RTreg", (RTUINTREG)0, "0000000000000000");
-        CHECK42("%RTreg", ~(RTUINTREG)0, "ffffffffffffffff");
-        CHECK42("%RTreg", (RTUINTREG)0x84342134, "0000000084342134");
-        CHECK42("%RTreg", (RTUINTREG)0x23484342134ULL, "0000023484342134");
+    if (sizeof(RTCCUINTREG) == 8)
+    {
+        CHECK42("%RTreg", (RTCCUINTREG)0, "0000000000000000");
+        CHECK42("%RTreg", ~(RTCCUINTREG)0, "ffffffffffffffff");
+        CHECK42("%RTreg", (RTCCUINTREG)0x84342134, "0000000084342134");
+        CHECK42("%RTreg", (RTCCUINTREG)0x23484342134ULL, "0000023484342134");
     }
     else
     {
-        CHECK42("%RTreg", (RTUINTREG)0, "00000000");
-        CHECK42("%RTreg", ~(RTUINTREG)0, "ffffffff");
-        CHECK42("%RTreg", (RTUINTREG)0x84342134, "84342134");
+        CHECK42("%RTreg", (RTCCUINTREG)0, "00000000");
+        CHECK42("%RTreg", ~(RTCCUINTREG)0, "ffffffff");
+        CHECK42("%RTreg", (RTCCUINTREG)0x84342134, "84342134");
     }