Changeset 19735 in vbox

Timestamp:

May 15, 2009 12:50:56 PM (16 years ago)

Author:

vboxsync

Message:

Relax critical alignment requirements a bit.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• IOM.cpp (modified) (1 diff)
• PDM.cpp (modified) (1 diff)
• PDMCritSect.cpp (modified) (1 diff)
• PGM.cpp (modified) (1 diff)
• testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -127 +127 @@
     AssertCompile(sizeof(pVM->em.s) <= sizeof(pVM->em.padding));
     AssertCompile(sizeof(pVM->aCpus[0].em.s.u.FatalLongJump) <= sizeof(pVM->aCpus[0].em.s.u.achPaddingFatalLongJump));
-    AssertCompileMemberAlignment(EM, CritSectREM, 8);
+    AssertCompileMemberAlignment(EM, CritSectREM, sizeof(uintptr_t));
 
     /*

trunk/src/VBox/VMM/IOM.cpp

@@ -150 +150 @@
     AssertCompileMemberAlignment(VM, iom.s, 32);
     AssertCompile(sizeof(pVM->iom.s) <= sizeof(pVM->iom.padding));
-    AssertCompileMemberAlignment(IOM, EmtLock, 8);
+    AssertCompileMemberAlignment(IOM, EmtLock, sizeof(uintptr_t));
 
     /*

trunk/src/VBox/VMM/PDM.cpp

@@ -325 +325 @@
     AssertRelease(!(RT_OFFSETOF(VM, pdm.s) & 31));
     AssertRelease(sizeof(pVM->pdm.s) <= sizeof(pVM->pdm.padding));
-
+    AssertCompileMemberAlignment(PDM, CritSect, sizeof(uintptr_t));
     /*
      * Init the structure.

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -151 +151 @@
     AssertCompile(sizeof(pCritSect->padding) >= sizeof(pCritSect->s));
 #endif
-    Assert(RT_ALIGN_P(pCritSect, 8) == pCritSect);
+    Assert(RT_ALIGN_P(pCritSect, sizeof(uintptr_t)) == pCritSect);
     return pdmR3CritSectInitOne(pVM, &pCritSect->s, pCritSect, pszName);
 }

trunk/src/VBox/VMM/PGM.cpp

@@ -1182 +1182 @@
      */
     AssertCompile(sizeof(pVM->pgm.s) <= sizeof(pVM->pgm.padding));
+    AssertCompileMemberAlignment(PGM, CritSect, sizeof(uintptr_t));
 
     /*

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

@@ -293 +293 @@
 
     /* TM */
-    CHECK_MEMBER_ALIGNMENT(TM, EmtLock, 8);
-    CHECK_MEMBER_ALIGNMENT(TM, VirtualSyncLock, 8);
-
-    CHECK_MEMBER_ALIGNMENT(IOM, EmtLock, 8);
-    CHECK_MEMBER_ALIGNMENT(EM, CritSectREM, 8);
-    CHECK_MEMBER_ALIGNMENT(PGM, CritSect, 8);
-    CHECK_MEMBER_ALIGNMENT(PDM, CritSect, 8);
-    CHECK_MEMBER_ALIGNMENT(MMHYPERHEAP, Lock, 8);
+    CHECK_MEMBER_ALIGNMENT(TM, EmtLock, sizeof(uintptr_t));
+    CHECK_MEMBER_ALIGNMENT(TM, VirtualSyncLock, sizeof(uintptr_t));
+
+    CHECK_MEMBER_ALIGNMENT(IOM, EmtLock, sizeof(uintptr_t));
+    CHECK_MEMBER_ALIGNMENT(EM, CritSectREM, sizeof(uintptr_t));
+    CHECK_MEMBER_ALIGNMENT(PGM, CritSect, sizeof(uintptr_t));
+    CHECK_MEMBER_ALIGNMENT(PDM, CritSect, sizeof(uintptr_t));
+    CHECK_MEMBER_ALIGNMENT(MMHYPERHEAP, Lock, sizeof(uintptr_t));
 
     /* hwaccm - 32-bit gcc won't align uint64_t naturally, so check. */