Changeset 7050 in vbox

Timestamp:

Feb 20, 2008 4:21:25 PM (17 years ago)

Author:

vboxsync

Message:

Realigning after RTGCPHYS change.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (9 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -368 +368 @@
 {
     AVLROGCPHYSNODECORE                 Core;
-    /** Alignment padding. */
-    uint32_t                            u32Padding;
     /** Access type. */
     PGMPHYSHANDLERTYPE                  enmType;
@@ -897 +895 @@
     /** Pointer to the next RAM range - for GC. */
     GCPTRTYPE(struct PGMRAMRANGE *)     pNextGC;
+#if GC_ARCH_BITS == 32
+    RTGCPTR                             GCPtrAlignment; /**< Pointer alignment. */
+#endif
     /** Start of the range. Page aligned. */
     RTGCPHYS                            GCPhys;
@@ -920 +921 @@
 #ifdef VBOX_WITH_NEW_PHYS_CODE
     /** Padding to make aPage aligned on sizeof(PGMPAGE). */
-    uint32_t                            au32Reserved[2];
+    uint32_t                            au32Reserved[1];
 #else
 # if HC_ARCH_BITS == 32 && !defined(RT_OS_WINDOWS)
     /** Padding to make aPage aligned on sizeof(PGMPAGE). */
-    uint32_t                            u32Reserved[2];
+    uint32_t                            u32Reserved[1];
 # endif
 #endif
@@ -982 +983 @@
     /** Pointer to the next range - R0. */
     GCPTRTYPE(struct PGMROMRANGE *) pNextGC;
+#if GC_ARCH_BITS == 32
+    RTGCPTR                         GCPtrAlignment; /**< Pointer alignment. */
+#endif
     /** Address of the range. */
     RTGCPHYS                        GCPhys;
@@ -1118 +1122 @@
     /** Address of the page. */
     RTGCPHYS volatile                    GCPhys;
-#if HC_ARCH_BITS == 64
-    uint32_t                             u32Padding; /**< alignment padding. */
-#endif
     /** The guest page. */
     R3R0PTRTYPE(PPGMPAGE) volatile       pPage;
@@ -1127 +1128 @@
     /** The address */
     R3R0PTRTYPE(void *) volatile         pv;
+#if HC_ARCH_BITS == 32
+    uint32_t                             u32Padding; /**< alignment padding. */
+#endif
 } PGMPAGER3MAPTLBE;
 /** Pointer to an entry in the HC physical TLB. */
@@ -1379 +1383 @@
      */
     bool                fCR3Mix;
-#if HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64
-    bool                Alignment[4];   /**< Align the structure size on a 64-bit boundrary. */
-#endif
+//#if HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64
+//    bool                Alignment[4];   /**< Align the structure size on a 64-bit boundrary. */
+//#endif
 } PGMPOOLPAGE, *PPGMPOOLPAGE, **PPPGMPOOLPAGE;
 
@@ -1838 +1842 @@
      * are used of the PDs in PAE mode. */
     RTGCPTR                     GCPtrCR3Mapping;
+#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
+    RTGCPTR                     GCPtrPadding0; /**< alignment padding. */
+#endif
     /** The physical address of the currently monitored guest CR3 page.
      * When this value is NIL_RTGCPHYS no page is being monitored. */
     RTGCPHYS                    GCPhysGstCR3Monitored;
-#if HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64
-    RTGCPHYS                    GCPhysPadding0; /**< alignment padding. */
-#endif
 
     /** @name 32-bit Guest Paging.
@@ -2123 +2127 @@
     RTUINT                          fSyncFlags;
 
-#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
-    RTUINT                          uPadding3; /**< alignment padding. */
-#endif
     /** PGM critical section.
      * This protects the physical & virtual access handlers, ram ranges,

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -509 +509 @@
     GEN_CHECK_SIZE(PGMPHYSHANDLER);
     GEN_CHECK_OFF(PGMPHYSHANDLER, Core);
+    GEN_CHECK_SIZE(((PPGMPHYSHANDLER)0)->Core);
     GEN_CHECK_OFF(PGMPHYSHANDLER, enmType);
     GEN_CHECK_OFF(PGMPHYSHANDLER, cPages);