Changeset 32133 in vbox

Timestamp:

Aug 31, 2010 12:06:50 PM (14 years ago)

Author:

vboxsync

Message:

vm.h/mac: alignment fixes.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (4 diffs)
• include/VBox/vm.mac (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -95 +95 @@
     /** Ring-0 Host Context VM Pointer. */
     PVMR0                   pVMR0;
+    /** Alignment padding. */
+    RTR0PTR                 pvR0Padding;
     /** Raw-mode Context VM Pointer. */
     PVMRC                   pVMRC;
@@ -112 +114 @@
     STAMPROFILEADV          aStatAdHoc[8];
 
-#if HC_ARCH_BITS == 32
     /** Align the next bit on a 64-byte boundary and make sure it starts at the same
      *  offset in both 64-bit and 32-bit builds.
@@ -121 +122 @@
      *          following it (to grow into and align the struct size).
      *   */
-    uint8_t                 abAlignment1[HC_ARCH_BITS == 32 ? 20 : 0];
-#endif
+    uint8_t                 abAlignment1[HC_ARCH_BITS == 32 ? 64 : 56];
 
     /** CPUM part. */
@@ -207 +207 @@
 
     /** Align the following members on page boundrary. */
-    uint8_t                 abAlignment2[256];
+    uint8_t                 abAlignment2[192];
 
     /** PGM part. */

trunk/include/VBox/vm.mac

@@ -117 +117 @@
     .pVMR3                  RTR3PTR_RES 1
     .pVMR0                  RTR0PTR_RES 1
+    .pvR0Padding            RTR0PTR_RES 1
     .pVMRC                  RTRCPTR_RES 1
     .idCpu                  resd 1

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -228 +228 @@
     CHECK_PADDING_VMCPU(64, iom);
     CHECK_PADDING_VMCPU(64, dbgf);
+    PRINT_OFFSET(VMCPU, abAlignment2);
+    PRINT_OFFSET(VMCPU, pgm);
     CHECK_PADDING_VMCPU(4096, pgm);
 #ifdef VBOX_WITH_STATISTICS