Changeset 22888 in vbox

Timestamp:

Sep 9, 2009 10:36:03 PM (15 years ago)

Author:

vboxsync

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

52144

Message:

vm.h/vm.mac: tweaking.

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

@@ -118 +118 @@
      *          following it (to grow into and align the struct size).
      *   */
-    uint32_t                au32Alignment[HC_ARCH_BITS == 32 ? 7 : 3];
+    uint8_t                 abAlignment1[HC_ARCH_BITS == 32 ? 28 : 12];
 
     /** CPUM part. */
@@ -211 +211 @@
     } dbgf;
 
-    /** Align at page boundrary. */
-    uint8_t                 abReserved[960];
+    /** Align the structure size at page boundrary. */
+    uint8_t                 abAlignment2[960];
 } VMCPU;
 
@@ -813 +813 @@
     /** Padding - the unions must be aligned on a 64 bytes boundrary and the unions
      *  must start at the same offset on both 64-bit and 32-bit hosts. */
-    uint32_t                    padding[HC_ARCH_BITS == 32 ? 4+8 : 6];
+    uint8_t                     abAlignment1[HC_ARCH_BITS == 32 ? 48 : 24];
 
     /** CPUM part. */
@@ -993 +993 @@
 
     /** Padding for aligning the cpu array on a page boundrary. */
-    uint8_t         abReserved2[2120];
+    uint8_t         abAlignment2[2120];
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vm.mac

@@ -96 +96 @@
     .StatSwitcherTSS        resb STAMPROFILEADV_size
 
+%ifndef HC_ARCH_BITS
+ %error "Missing HC_ARCH_BITS"
+%endif
+%if HC_ARCH_BITS == 32
+    .abAlignment1           resb 48
+%else
+    .abAlignment1           resb 24
+%endif
+
     alignb 64
     .cpum                   resb 1472

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

@@ -112 +112 @@
     do \
     { \
-        printf("%s::%s offset %#x (%d) sizeof %d\n",  #strct, #member, (int)RT_OFFSETOF(strct, member), (int)RT_OFFSETOF(strct, member), (int)RT_SIZEOFMEMB(strct, member)); \
+        printf("info: %s::%s offset %#x (%d) sizeof %d\n",  #strct, #member, (int)RT_OFFSETOF(strct, member), (int)RT_OFFSETOF(strct, member), (int)RT_SIZEOFMEMB(strct, member)); \
     } while (0)