Changeset 56715 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 30, 2015 11:48:17 PM (10 years ago)

Author:

vboxsync

Message:

Fix various alignments of STAM members in devices and VMM for 32bit, producing assertions in stamR3RegisterU() previously. (Hoping the 64bit builds are not starting to burn now)

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchAc97.cpp (modified) (2 diffs)
• Storage/DevAHCI.cpp (modified) (2 diffs)
• Storage/DevATA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -269 +269 @@
     uint64_t                uTicks;
 #ifdef VBOX_WITH_STATISTICS
+# if HC_ARCH_BITS == 32
+    uint32_t                u32Alignment0;
+# endif
     STAMPROFILE             StatTimer;
     STAMCOUNTER             StatBytesRead;
@@ -300 +303 @@
 /** Pointer to the AC97 device state. */
 typedef AC97STATE *PAC97STATE;
+
+AssertCompileMemberAlignment(AC97STATE, StatTimer, 8);
 
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -575 +575 @@
     R3PTRTYPE(PRTLISTANCHOR)        pListReqsFree;
 
+    /** Align to a multiple of 8. */
+#if HC_ARCH_BITS == 32
+    uint32_t                        u32Alignment6;
+#endif
+
 } AHCIPort;
 /** Pointer to the state of an AHCI port. */
 typedef AHCIPort *PAHCIPort;
+
+AssertCompileMemberAlignment(AHCIPort, StatDMA, 8);
+AssertCompileSizeAlignment(AHCIPort, 8);
 
 /**
@@ -723 +731 @@
 /** Pointer to the state of an AHCI device. */
 typedef AHCI *PAHCI;
+
+AssertCompileMemberAlignment(AHCI, ahciPort[0], 8);
 
 /**

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -441 +441 @@
     /** Magic delay before triggering interrupts in DMA mode. */
     uint32_t            DelayIRQMillies;
+    /** The event semaphore the thread is waiting on during suspended I/O. */
+    RTSEMEVENT          SuspendIOSem;
     /** The lock protecting the request queue. */
     PDMCRITSECT         AsyncIORequestLock;
-    /** The event semaphore the thread is waiting on during suspended I/O. */
-    RTSEMEVENT          SuspendIOSem;
 #if 0 /*HC_ARCH_BITS == 32*/
     uint32_t            Alignment0;
@@ -464 +464 @@
 AssertCompileMemberAlignment(ATACONTROLLER, u64ResetTime, 8);
 AssertCompileMemberAlignment(ATACONTROLLER, StatAsyncOps, 8);
+AssertCompileMemberAlignment(ATACONTROLLER, AsyncIORequestLock, 8);
+AssertCompileSizeAlignment(ATACONTROLLER, 8);
 
 typedef enum CHIPSET