Changeset 22886 in vbox

Timestamp:

Sep 9, 2009 10:13:16 PM (15 years ago)

Author:

vboxsync

Message:

vm.h: 64-bit host realignment.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (9 diffs)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (2 diffs)

trunk/include/VBox/vm.h

@@ -125 +125 @@
         struct CPUMCPU      s;
 #endif
-        char                padding[4096];      /* multiple of 64 */
+        char                padding[3456];      /* multiple of 64 */
     } cpum;
 
@@ -152 +152 @@
         struct EMCPU        s;
 #endif
-        char                padding[1280];      /* multiple of 64 */
+        char                padding[1408];      /* multiple of 64 */
     } em;
 
@@ -211 +211 @@
 
     /** Align at page boundrary. */
-    uint8_t                 abReserved[HC_ARCH_BITS == 32 ? 448 : 64];
+    uint8_t                 abReserved[HC_ARCH_BITS == 32 ? 448 : 960];
 } VMCPU;
 
@@ -839 +839 @@
         struct PGM  s;
 #endif
-        uint8_t     padding[5184];      /* multiple of 64 */
+        uint8_t     padding[6080];      /* multiple of 64 */
     } pgm;
 
@@ -884 +884 @@
         struct PDM s;
 #endif
-        uint8_t     padding[1024];      /* multiple of 64 */
+        uint8_t     padding[1536];      /* multiple of 64 */
     } pdm;
 
@@ -893 +893 @@
         struct IOM s;
 #endif
-        uint8_t     padding[768];       /* multiple of 64 */
+        uint8_t     padding[832];       /* multiple of 64 */
     } iom;
 
@@ -911 +911 @@
         struct CSAM s;
 #endif
-        uint8_t     padding[1024];      /* multiple of 64 */
+        uint8_t     padding[1088];      /* multiple of 64 */
     } csam;
 
@@ -947 +947 @@
         struct SSM  s;
 #endif
-        uint8_t     padding[64];        /* multiple of 64 */
+        uint8_t     padding[128];        /* multiple of 64 */
     } ssm;
 
@@ -993 +993 @@
 
     /** Padding for aligning the cpu array on a 64 byte boundrary. */
-    uint8_t         abReserved2[8 + (HC_ARCH_BITS == 32 ? 3712 : 0)];
+    uint8_t         abReserved2[8 + (HC_ARCH_BITS == 32 ? 3712 : 2112)];
 
     /* ---- end small stuff ---- */

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

@@ -149 +149 @@
     CHECK_SIZE(X86PML4, PAGE_SIZE);
 
+    PRINT_OFFSET(VM, cpum);
     CHECK_PADDING_VM(64, cpum);
     CHECK_PADDING_VM(64, vmm);
@@ -171 +172 @@
     CHECK_PADDING_VM(8, cfgm);
 
+    PRINT_OFFSET(VMCPU, cpum);
     CHECK_PADDING_VMCPU(64, cpum);
     CHECK_PADDING_VMCPU(64, pgm);