Changeset 18939 in vbox

Timestamp:

Apr 16, 2009 1:20:22 PM (16 years ago)

Author:

vboxsync

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

46017

Message:

Use different assert macros.

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (1 diff)
• EM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -122 +122 @@
      * Assert alignment and sizes.
      */
-    AssertCompile(!(RT_OFFSETOF(VM, cpum.s) & 31));
+    AssertCompileMemberAlignment(VM, cpum.s, 32);
     AssertCompile(sizeof(pVM->cpum.s) <= sizeof(pVM->cpum.padding));
-    AssertCompile(!(sizeof(CPUMCTX) & 63));
-    AssertCompile(!(sizeof(CPUMCTXMSR) & 63));
-    AssertCompile(!(sizeof(CPUMHOSTCTX) & 63));
-    AssertCompile(!(RT_OFFSETOF(VM, cpum) & 63));
-    AssertCompile(!(RT_OFFSETOF(VM, aCpus) & 63));
-    AssertCompile(!(RT_OFFSETOF(VMCPU, cpum.s) & 63));
-    AssertCompile(!(sizeof(pVM->aCpus[0].cpum.s) & 63));
+    AssertCompileSizeAlignment(CPUMCTX, 64);
+    AssertCompileSizeAlignment(CPUMCTXMSR, 64);
+    AssertCompileSizeAlignment(CPUMHOSTCTX, 64);
+    AssertCompileMemberAlignment(VM, cpum, 64);
+    AssertCompileMemberAlignment(VM, aCpus, 64);
+    AssertCompileMemberAlignment(VMCPU, cpum.s, 64);
+    AssertCompileMemberSizeAlignment(VM, aCpus[0].cpum.s, 64);
 
     /* Calculate the offset from CPUM to CPUMCPU for the first CPU. */

trunk/src/VBox/VMM/EM.cpp

@@ -122 +122 @@
      * Assert alignment and sizes.
      */
-    AssertCompile(!(RT_OFFSETOF(VM, em.s) & 31));
+    AssertCompileMemberAlignment(VM, em.s, 32);
     AssertCompile(sizeof(pVM->em.s) <= sizeof(pVM->em.padding));
     AssertReleaseMsg(sizeof(pVM->aCpus[0].em.s.u.FatalLongJump) <= sizeof(pVM->aCpus[0].em.s.u.achPaddingFatalLongJump),