Changeset 161 in vbox for trunk/src/VBox/VMM/REMInternal.h

Timestamp:

Jan 18, 2007 6:25:45 PM (18 years ago)

Author:

vboxsync

Message:

64-bit: structure alignment.

File:

• trunk/src/VBox/VMM/REMInternal.h (modified) (6 diffs)

trunk/src/VBox/VMM/REMInternal.h

@@ -116 +116 @@
 {
     RTHCUINTPTR pChunk1;
+    RTHCUINTPTR pChunk2;
     RTGCPHYS    GCPhys1;
-    RTHCUINTPTR pChunk2;
     RTGCPHYS    GCPhys2;
 } REMCHUNKINFO, *PREMCHUNKINFO;
@@ -129 +129 @@
 typedef struct REMPHYSREGISTRATION
 {
+    RTHCUINTPTR     HCVirt;
     RTGCPHYS        GCPhys;
-    RTHCUINTPTR     HCVirt;
     RTUINT          cb;
 } REMPHYSREGISTRATION, *PREMPHYSREGISTRATION;
@@ -177 +177 @@
      * These instructions are replayed when entering REM. */
     RTGCPTR                 aGCPtrInvalidatedPages[48];
-
     /** The number of recorded handler notifications. */
     RTUINT volatile         cHandlerNotifications;
+    RTUINT                  padding0; /**< Padding. */
     /** Array of recorded handler noticications.
      * These are replayed when entering REM. */
@@ -185 +185 @@
 
     /** Pointer to an array of hc virt to gc phys records. */
-    PREMCHUNKINFO           paHCVirtToGCPhys;
+    HCPTRTYPE(PREMCHUNKINFO) paHCVirtToGCPhys;
     /** Pointer to a GC Phys to HC Virt lookup table. */
-    RTHCUINTPTR            *paGCPhysToHCVirt;
-
-    /** Number of external RAM and ROM registrations (excluding guest RAM) */
+    HCPTRTYPE(PRTHCUINTPTR) paGCPhysToHCVirt;
+
+    /** Array of external RAM and ROM registrations (excluding guest RAM). */
+    REMPHYSREGISTRATION     aPhysReg[REM_MAX_PHYS_REGISTRATIONS];
+    /** Number of external RAM and ROM registrations (excluding guest RAM). */
     RTUINT                  cPhysRegistrations;
-    REMPHYSREGISTRATION     aPhysReg[REM_MAX_PHYS_REGISTRATIONS];
 
     /** MMIO memory type.
@@ -213 +214 @@
 
     /** Padding for MS / GC alignment difference. */
-    //uint32_t                u32Padding;
+    uint32_t                u32Padding;
     /** Time spent in QEMU. */
     STAMPROFILEADV          StatsInQEMU;
@@ -223 +224 @@
     STAMPROFILE             StatsStateBack;
 
+#if HC_ARCH_BITS != 32
     /** Padding the CPUX86State structure to 32 byte. */
-    uint8_t                 abPadding[8];
+    uint32_t                abPadding[HC_ARCH_BITS == 32 ? 0 : 6];
+#endif
 
 #define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x6440 : 0xb4a0)