Changeset 9397 in vbox for trunk/src

Timestamp:

Jun 4, 2008 6:01:34 PM (17 years ago)

Author:

vboxsync

Message:

attempt to fix the 64-bit Linux box

Location:

trunk/src/VBox/VMM

Files:

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

trunk/src/VBox/VMM/PGMInternal.h

@@ -1623 +1623 @@
     STAMCOUNTER     StatCacheUncacheable;
 # endif
-#elif HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
+#elif HC_ARCH_BITS == 64
     uint32_t        Alignment1;         /**< Align the next member on a 64-bit boundrary. */
 #endif
     /** The AVL tree for looking up a page by its HC physical address. */
     AVLOHCPHYSTREE  HCPhysTree;
-    uint32_t        Alignment3;         /**< Align the next member on a 64-bit boundrary. */
+    uint32_t        Alignment2;         /**< Align the next member on a 64-bit boundrary. */
     /** Array of pages. (cMaxPages in length)
      * The Id is the index into thist array.
      */
-#if GC_ARCH_BITS == 64
-    uint32_t        Alignment4;
-#endif
     PGMPOOLPAGE     aPages[PGMPOOL_IDX_FIRST];
 } PGMPOOL, *PPGMPOOL, **PPPGMPOOL;
@@ -2294 +2291 @@
     /** GC: Which statistic this \#PF should be attributed to. */
     RCPTRTYPE(PSTAMPROFILE)   pStatTrap0eAttributionGC;
-    RTGCPTR                   padding0;
+    RTRCPTR                   padding0;
     /** HC: Which statistic this \#PF should be attributed to. */
     R3R0PTRTYPE(PSTAMPROFILE) pStatTrap0eAttributionHC;
-    RTHCPTR                 padding1;
+    RTHCPTR                   padding1;
     STAMPROFILE     StatGCTrap0e;                       /**< GC: PGMGCTrap0eHandler() profiling. */
     STAMPROFILE     StatTrap0eCSAM;                     /**< Profiling of the Trap0eHandler body when the cause is CSAM. */

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

@@ -493 +493 @@
     GEN_CHECK_OFF(PGM, cZeroPages);
     GEN_CHECK_OFF(PGM, cGuestModeChanges);
+#ifdef VBOX_WITH_STATISTICS
+    GEN_CHECK_OFF(PGM, pStatTrap0eAttributionHC);
+#endif
 
     GEN_CHECK_SIZE(PGMMAPPING);