Changeset 13885 in vbox

Timestamp:

Nov 5, 2008 5:41:57 PM (16 years ago)

Author:

vboxsync

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

38884

Message:

fix 32-bit builds

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (3 diffs)
• testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -197 +197 @@
     /** Maximum ASID allowed. */
     RTUINT                      uMaxASID;
+
+#if HC_ARCH_BITS == 32
+    uint32_t                    Alignment0;
+#endif
 
     struct
@@ -348 +352 @@
      * HWACCMR0Enter and cleared in HWACCMR0Leave. */
     RTCPUID                 idEnteredCpu;
+#else
 # if HC_ARCH_BITS == 32
-    RTCPUID                 Alignment0;
+    RTCPUID                 Alignment2;
 # endif
 #endif
@@ -502 +507 @@
     } svm;
 
+#if HC_ARCH_BITS == 32
+    uint32_t                        Alignment;
+#endif
+
     /** Event injection state. */
     struct

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

@@ -264 +264 @@
     CHECK_MEMBER_ALIGNMENT(HWACCM, u64RegisterMask, 8);
     CHECK_MEMBER_ALIGNMENT(HWACCM, vmx.hostCR4, 8);
+    CHECK_MEMBER_ALIGNMENT(HWACCM, vmx.msr.feature_ctrl, 8);
+    CHECK_MEMBER_ALIGNMENT(HWACCM, StatEntry, 8);
+    CHECK_MEMBER_ALIGNMENT(HWACCMCPU, vmx.proc_ctls, 8);
     CHECK_MEMBER_ALIGNMENT(HWACCMCPU, Event.intInfo, 8);
-    CHECK_MEMBER_ALIGNMENT(HWACCM, StatEntry, 8);