Changeset 7620 in vbox for trunk/include

Timestamp:

Mar 28, 2008 10:12:44 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

29121

Message:

RTGCPHYS is now 64 bits

Location:

trunk/include/iprt

Files:

• assert.h (modified) (1 diff)
• avl.h (modified) (2 diffs)
• cdefs.h (modified) (1 diff)
• types.h (modified) (2 diffs)

trunk/include/iprt/assert.h

@@ -1941 +1941 @@
 #define AssertPtrNullBreakVoid(pv)  AssertMsgBreakVoid(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
 
+/** @def AssertGCPhys32
+ * Asserts that the high dword of a physical address is zero
+ *
+ * @param   pv      The pointer.
+ */
+#define AssertGCPhys32(pv)          AssertMsg(VALID_PHYS32_PTR(pv), ("%p\n", (pv)))
 
 __BEGIN_DECLS

trunk/include/iprt/avl.h

@@ -220 +220 @@
     /** Height of this tree: max(height(left), height(right)) + 1 */
     unsigned char       uchHeight;
+    /** Padding */
+    unsigned char       Padding[7];
 } AVLOGCPHYSNODECORE, *PAVLOGCPHYSNODECORE;
 
@@ -271 +273 @@
     /** Height of this tree: max(height(left), height(right)) + 1 */
     unsigned char       uchHeight;
+    /** Padding */
+    unsigned char       Padding[7];
 } AVLROGCPHYSNODECORE, *PAVLROGCPHYSNODECORE;
 

trunk/include/iprt/cdefs.h

@@ -1203 +1203 @@
 
 
+/** @def VALID_PHYS32_PTR
+ * 32 bits physical address validation macro.
+ * @param   ptr
+ */
+#define VALID_PHYS32_PTR(ptr)     ( (RTGCPHYS64)(ptr) < _4G )
+
 /** @def N_
  * The \#define N_ is used mark a string for translation. This is usable in

trunk/include/iprt/types.h

@@ -741 +741 @@
 
 /** Guest Physical Memory Address.*/
-typedef uint32_t        RTGCPHYS;
+typedef uint64_t        RTGCPHYS;
 /** Pointer to Guest Physical Memory Address. */
 typedef RTGCPHYS       *PRTGCPHYS;
@@ -752 +752 @@
  * some contexts.
  */
-#define NIL_RTGCPHYS     ((RTGCPHYS)~0U) /** @todo change this to (~(RTGCPHYS)0) or maybe NIL_RTGCPHYS32? */
+#define NIL_RTGCPHYS     (~(RTGCPHYS)0U)