Changeset 9145 in vbox for trunk/include/iprt

Timestamp:

May 27, 2008 8:36:18 AM (17 years ago)

Author:

vboxsync

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

31276

Message:

More 64 bits guest updates

Location:

trunk/include/iprt

Files:

• asmdefs.mac (modified) (1 diff)
• cdefs.h (modified) (4 diffs)
• types.h (modified) (2 diffs)

trunk/include/iprt/asmdefs.mac

@@ -502 +502 @@
 ;; @def RTGCPHYS_DEF
 ; The pesudo-instruction used to declare an initialized guest physical address.
-%define RTGCPHYS_DEF    dd
+%define RTGCPHYS_DEF    dq
 
 ;; @def RTGCPTR_RES
 ; The pesudo-instruction used to declare (=reserve space for) an uninitialized
 ; guest physical address variable
-%define RTGCPHYS_RES    resd
+%define RTGCPHYS_RES    resq
 
 ;; @def RTGCPTR_PRE
 ; The memory operand prefix used for a guest physical address.
-%define RTGCPHYS_PRE    dword
+%define RTGCPHYS_PRE    qword
 
 ;; @def RTGCPHYS_CB
 ; The size in bytes of a guest physical address.
-%define RTGCPHYS_CB     4
+%define RTGCPHYS_CB     8
 
 

trunk/include/iprt/cdefs.h

@@ -167 +167 @@
 
 /** @def HC_ARCH_BITS
- * Defines the host architechture bit count.
+ * Defines the host architecture bit count.
  */
 #if !defined(HC_ARCH_BITS) || defined(DOXYGEN_RUNNING)
@@ -178 +178 @@
 
 /** @def R3_ARCH_BITS
- * Defines the host ring-3 architechture bit count.
+ * Defines the host ring-3 architecture bit count.
  */
 #if !defined(R3_ARCH_BITS) || defined(DOXYGEN_RUNNING)
@@ -189 +189 @@
 
 /** @def R0_ARCH_BITS
- * Defines the host ring-0 architechture bit count.
+ * Defines the host ring-0 architecture bit count.
  */
 #if !defined(R0_ARCH_BITS) || defined(DOXYGEN_RUNNING)
@@ -200 +200 @@
 
 /** @def GC_ARCH_BITS
- * Defines the guest architechture bit count.
+ * Defines the guest architecture bit count.
  */
 #if !defined(GC_ARCH_BITS) || defined(DOXYGEN_RUNNING)

trunk/include/iprt/types.h

@@ -804 +804 @@
 #define NIL_RTGCPHYS64     (~(RTGCPHYS64)0)
 
-/** Guest context pointer.
- * Keep in mind that this type is an unsigned integer in
- * HC and void pointer in GC.
- */
-#ifdef IN_GC
-typedef void           *RTGCPTR;
-#else
-typedef RTGCUINTPTR     RTGCPTR;
-#endif
-/** Pointer to a guest context pointer. */
-typedef RTGCPTR        *PRTGCPTR;
-/** Pointer to a const guest context pointer. */
-typedef const RTGCPTR  *PCRTGCPTR;
-/** @def NIL_RTGCPTR
- * NIL GC pointer.
- */
-#define NIL_RTGCPTR     ((RTGCPTR)0)
-
 /** Guest context pointer, 32 bits.
  * Keep in mind that this type is an unsigned integer in
@@ -852 +834 @@
 #define NIL_RTGCPTR64   ((RTGCPTR64)0)
 
+/** Guest context pointer.
+ * Keep in mind that this type is an unsigned integer in
+ * HC and void pointer in GC.
+ */
+#if GC_ARCH_BITS == 64
+typedef RTGCPTR64       RTGCPTR;
+/** Pointer to a guest context pointer. */
+typedef PRTGCPTR64      PRTGCPTR;
+/** Pointer to a const guest context pointer. */
+typedef PCRTGCPTR64    PCRTGCPTR;
+/** @def NIL_RTGCPTR
+ * NIL GC pointer.
+ */
+#define NIL_RTGCPTR     NIL_RTGCPTR64
+#elif GC_ARCH_BITS == 32
+typedef RTGCPTR32       RTGCPTR;
+/** Pointer to a guest context pointer. */
+typedef PRTGCPTR32      PRTGCPTR;
+/** Pointer to a const guest context pointer. */
+typedef PCRTGCPTR32    PCRTGCPTR;
+/** @def NIL_RTGCPTR
+ * NIL GC pointer.
+ */
+#define NIL_RTGCPTR     NIL_RTGCPTR32
+#else
+# error "Unsupported GC_ARCH_BITS!"
+#endif
+
 /** Unsigned integer register in the guest context. */
-#if GC_ARCH_BITS == 32
+#if GC_ARCH_BITS == 64
+typedef uint64_t            RTGCUINTREG;
+#elif GC_ARCH_BITS == 32
 typedef uint32_t            RTGCUINTREG;
-#elif GC_ARCH_BITS == 64
-typedef uint64_t            RTGCUINTREG;
 #else
 # error "Unsupported GC_ARCH_BITS!"