Changeset 22925 in vbox

Timestamp:

Sep 10, 2009 10:24:58 PM (16 years ago)

Author:

vboxsync

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

52190

Message:

Devices: Alignment fun. (32-bit darwin)

Location:

trunk/src/VBox/Devices

Files:

• Network/DevPCNet.cpp (modified) (1 diff)
• Network/DrvNAT.cpp (modified) (2 diffs)
• PC/DevAPIC.cpp (modified) (5 diffs)
• Storage/DevATA.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -329 +329 @@
 #endif /* VBOX_WITH_STATISTICS */
 };
+AssertCompileMemberAlignment(PCNetState, StatReceiveBytes, 8);
 
 #define PCNETSTATE_2_DEVINS(pPCNet)            ((pPCNet)->CTX_SUFF(pDevIns))

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -167 +167 @@
     /** The read end of the control pipe. */
     RTFILE                  PipeRead;
+# if HC_ARCH_BITS == 32
+    /** Alignment padding. */
+    uint32_t                u32Alignment;
+# endif
 #else
     /** for external notification */
@@ -184 +188 @@
 #endif
 } DRVNAT;
+AssertCompileMemberAlignment(DRVNAT, StatNATRecvWakeups, 8);
 /** Pointer the NAT driver instance data. */
 typedef DRVNAT *PDRVNAT;

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -241 +241 @@
     R3PTRTYPE(char *)       pszDesc;
 # ifdef VBOX_WITH_STATISTICS
+#  if HC_ARCH_BITS == 32
+    uint32_t                u32Alignment0;
+#  endif
     STAMCOUNTER             StatTimerSetInitialCount;
     STAMCOUNTER             StatTimerSetInitialCountArm;
@@ -254 +257 @@
 #endif /* VBOX */
 } APICState;
+#ifdef VBOX
+AssertCompileMemberAlignment(APICState, initial_count_load_time, 8);
+# ifdef VBOX_WITH_STATISTICS
+AssertCompileMemberAlignment(APICState, StatTimerSetInitialCount, 8);
+# endif
+#endif
 
 struct IOAPICState {
@@ -320 +329 @@
     /** The critical section - R3 Ptr. */
     RCPTRTYPE(PPDMCRITSECT) pCritSectRC;
-    RTRCPTR                 Padding0;
 
     /** APIC specification version in this virtual hardware configuration. */
@@ -332 +340 @@
 
 # ifdef VBOX_WITH_STATISTICS
+    uint32_t                u32Alignment0;
     STAMCOUNTER             StatMMIOReadGC;
     STAMCOUNTER             StatMMIOReadHC;
@@ -339 +348 @@
 # endif
 } APICDeviceInfo;
+# ifdef VBOX_WITH_STATISTICS
+AssertCompileMemberAlignment(APICDeviceInfo, StatMMIOReadGC, 8);
+# endif
 #endif /* VBOX */
 

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

@@ -266 +266 @@
     /** The LUN #. */
     RTUINT                          iLUN;
-#if HC_ARCH_BITS == 64
     RTUINT                          Alignment2; /**< Align pDevInsR3 correctly. */
-#endif
     /** Pointer to device instance. */
     PPDMDEVINSR3                        pDevInsR3;
@@ -289 +287 @@
     char                                szModelNumber[ATA_MODEL_NUMBER_LENGTH+1];
 
-#if HC_ARCH_BITS == 64
-    uint32_t                            Alignment3[2];
-#endif
+    uint8_t                             abAlignment3[HC_ARCH_BITS == 32 ? 7 : 7];
 } ATADevState;
+AssertCompileMemberAlignment(ATADevState, cTotalSectors, 8);
+AssertCompileMemberAlignment(ATADevState, StatATADMA, 8);
+AssertCompileMemberAlignment(ATADevState, u64CmdTS, 8);
+AssertCompileMemberAlignment(ATADevState, pDevInsR3, 8);
+AssertCompileMemberAlignment(ATADevState, szSerialNumber, 8);
+AssertCompileSizeAlignment(ATADevState, 8);
 
 
@@ -422 +424 @@
     STAMPROFILE     StatLockWait;
 } ATACONTROLLER, *PATACONTROLLER;
+AssertCompileMemberAlignment(ATACONTROLLER, lock, 8);
+AssertCompileMemberAlignment(ATACONTROLLER, aIfs, 8);
+AssertCompileMemberAlignment(ATACONTROLLER, aIfs[1], 8);
+AssertCompileMemberAlignment(ATACONTROLLER, u64ResetTime, 8);
+AssertCompileMemberAlignment(ATACONTROLLER, StatAsyncOps, 8);
 
 typedef enum CHIPSET