Changeset 38652 in vbox

Timestamp:

Sep 6, 2011 9:02:35 AM (14 years ago)

Author:

vboxsync

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

73862

Message:

Additions/common/VBoxGuest: try to get structure alignment right this time

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -172 +172 @@
      */
 #ifdef VBOXGUEST_USE_DEFERRED_WAKE_UP
-    uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 12 : 52];
+    uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 140 : 52];
 #else
-    uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 20 : 4];
+    uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 84 : 4];
 #endif
 
@@ -183 +183 @@
         VBOXGUESTDEVEXTWIN          s;
 #endif
-        uint8_t                     padding[384];      /* Multiple of 64; fix me! */
+        uint8_t                     padding[256];      /* Multiple of 64; fix me! */
     } win;
 
@@ -190 +190 @@
 typedef VBOXGUESTDEVEXT *PVBOXGUESTDEVEXT;
 
-#if defined(VBOXGUEST_USE_DEFERRED_WAKE_UP) && HC_ARCH_BITS == 64
+#ifdef VBOXGUEST_USE_DEFERRED_WAKE_UP
 AssertCompileMemberOffset(VBOXGUESTDEVEXT, win, 384);
-#elif HC_ARCH_BITS == 64
+#else
 AssertCompileMemberOffset(VBOXGUESTDEVEXT, win, 320);
-#else
-AssertCompileMemberOffset(VBOXGUESTDEVEXT, win, 256);
-#endif
-AssertCompileMemberSizeAlignment(VBOXGUESTDEVEXT, win, 64);
+#endif
+AssertCompileMemberAlignment(VBOXGUESTDEVEXT, win, 64);
 
 /**