Changeset 7053 in vbox for trunk/src/VBox

Timestamp:

Feb 20, 2008 4:26:06 PM (17 years ago)

Author:

vboxsync

Message:

Realigning after RTGCPHYS change.

File:

• trunk/src/VBox/VMM/IOMInternal.h (modified) (5 diffs)

trunk/src/VBox/VMM/IOMInternal.h

@@ -43 +43 @@
     /** Avl node core with GCPhys as Key and GCPhys + cbSize - 1 as KeyLast. */
     AVLROGCPHYSNODECORE         Core;
-#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32 && !defined(RT_OS_WINDOWS)
-    uint32_t                    u32Alignment; /**< The sizeof(Core) differs. */
-#endif
     /** Start physical address. */
     RTGCPHYS                    GCPhys;
     /** Size of the range. */
     RTUINT                      cbSize;
+    /** Alignment. */
+    uint32_t                    u32Alignment;
     /** Pointer to user argument. */
     RTR3PTR                     pvUser;
@@ -73 +72 @@
     /** Avl node core with GCPhys as Key and GCPhys + cbSize - 1 as KeyLast. */
     AVLROGCPHYSNODECORE         Core;
-#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32 && !defined(RT_OS_WINDOWS)
-    uint32_t                    u32Alignment; /**< The sizeof(Core) differs. */
-#endif
     /** Start physical address. */
     RTGCPHYS                    GCPhys;
     /** Size of the range. */
-    RTUINT                      cbSize;
+    uint32_t                    cbSize;
+    /** Alignment. */
+    uint32_t                    u32Alignment;
     /** Pointer to user argument. */
     RTR0PTR                     pvUser;
@@ -103 +101 @@
     /** Avl node core with GCPhys as Key and GCPhys + cbSize - 1 as KeyLast. */
     AVLROGCPHYSNODECORE         Core;
-#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32 && !defined(RT_OS_WINDOWS)
-    uint32_t                    u32Alignment; /**< The sizeof(Core) differs. */
-#endif
     /** Start physical address. */
     RTGCPHYS                    GCPhys;
@@ -120 +115 @@
     /** Pointer to fill (memset) callback function. */
     GCPTRTYPE(PFNIOMMMIOFILL)   pfnFillCallback;
-#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
-    RTGCPTR                     GCPtrAlignment; /**< pszDesc is 8 byte aligned. */
-#endif 
     /** Description / Name. For easing debugging. */
     R3PTRTYPE(const char *)     pszDesc;
@@ -266 +258 @@
 #if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
     RTGCPTR                     GCPtrAlignment; /**< pszDesc is 8 byte aligned. */
-#endif 
+#endif
     /** Description / Name. For easing debugging. */
     R3PTRTYPE(const char *)     pszDesc;