Changeset 13047 in vbox for trunk

Timestamp:

Oct 7, 2008 1:24:42 PM (16 years ago)

Author:

vboxsync

Message:

AVLROGCPTRNODECORE: alignment adjustment.

Location:

trunk

Files:

• include/iprt/avl.h (modified) (2 diffs)
• src/VBox/VMM/PGMInternal.h (modified) (1 diff)

trunk/include/iprt/avl.h

@@ -519 +519 @@
     /** Height of this tree: max(height(left), height(right)) + 1 */
     unsigned char       uchHeight;
-    unsigned char       padding[GC_ARCH_BITS == 64 ? 7 : 3];
+    unsigned char       padding[GC_ARCH_BITS == 64 ? 7 : 7];
 } AVLROGCPTRNODECORE, *PAVLROGCPTRNODECORE;
 
@@ -633 +633 @@
 #if HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64
     unsigned char       Padding[7]; /**< Alignment padding. */
-#endif 
+#endif
 } AVLOHCPHYSNODECORE, *PAVLOHCPHYSNODECORE;
 

trunk/src/VBox/VMM/PGMInternal.h

@@ -444 +444 @@
     /** Core node for the tree based on virtual ranges. */
     AVLROGCPTRNODECORE                  Core;
-#if GC_ARCH_BITS == 32
-    /** Alignment padding. */
-    uint32_t                            u32Padding;
-#endif
+    /** Size of the range (in bytes). */
+    RTGCUINTPTR                         cb;
+    /** Number of cache pages. */
+    uint32_t                            cPages;
     /** Access type. */
     PGMVIRTHANDLERTYPE                  enmType;
-    /** Number of cache pages. */
-    uint32_t                            cPages;
-
-    /** Size of the range (in bytes). */
-    RTGCUINTPTR                         cb;
     /** Pointer to the RC callback function. */
     RCPTRTYPE(PFNPGMRCVIRTHANDLER)      pfnHandlerRC;
-#if GC_ARCH_BITS == 64
-    RTRCPTR                             padding1;
+#if HC_ARCH_BITS == 64
+    RTRCPTR                             padding;
 #endif
     /** Pointer to the R3 callback function for invalidation. */