Changeset 41456 in vbox for trunk/src/VBox/VMM/include

Timestamp:

May 28, 2012 10:11:53 AM (13 years ago)

Author:

vboxsync

Message:

PGMPool: PGMPOOLPAGE adjustments and cleanups, no real code changes intended.

Location:

trunk/src/VBox/VMM/include

Files:

• PGMInline.h (modified) (7 diffs)
• PGMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/include/PGMInline.h

@@ -86 +86 @@
 
 
-
 /**
  * Gets the PGMPAGE structure for a guest page.
@@ -132 +131 @@
     return VINF_SUCCESS;
 }
-
-
 
 
@@ -417 +414 @@
 }
 
+
 /**
  * Maps the page into current context (RC and maybe R0).
@@ -503 +501 @@
 
 #endif /* !IN_RC */
-
 
 /**
@@ -667 +664 @@
     return VINF_SUCCESS;
 }
+
 
 /**
@@ -1174 +1172 @@
 
 #endif /* !IN_RC */
-
 
 /**
@@ -1431 +1428 @@
 }
 
+
 /**
  * Locks a page to prevent flushing (important for cr3 root pages or shadow pae pd pages).

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -2114 +2114 @@
     R3R0PTRTYPE(void *) pvPageR3;
 #endif
-    /** The guest physical address. */
 #if HC_ARCH_BITS == 32 && GC_ARCH_BITS == 64
     uint32_t            Alignment0;
 #endif
+    /** The guest physical address. */
     RTGCPHYS            GCPhys;
-
-    /** Access handler statistics to determine whether the guest is (re)initializing a page table. */
-    RTGCPTR             pvLastAccessHandlerRip;
-    RTGCPTR             pvLastAccessHandlerFault;
-    uint64_t            cLastAccessHandlerCount;
-
     /** The kind of page we're shadowing. (This is really a PGMPOOLKIND enum.) */
     uint8_t             enmKind;
     /** The subkind of page we're shadowing. (This is really a PGMPOOLACCESS enum.) */
     uint8_t             enmAccess;
+    /** This supplements enmKind and enmAccess */
+    bool                fA20Enabled : 1;
+
+    /** Used to indicate that the page is zeroed. */
+    bool                fZeroed : 1;
+    /** Used to indicate that a PT has non-global entries. */
+    bool                fSeenNonGlobal : 1;
+    /** Used to indicate that we're monitoring writes to the guest page. */
+    bool                fMonitored : 1;
+    /** Used to indicate that the page is in the cache (e.g. in the GCPhys hash).
+     * (All pages are in the age list.) */
+    bool                fCached : 1;
+    /** This is used by the R3 access handlers when invoked by an async thread.
+     * It's a hack required because of REMR3NotifyHandlerPhysicalDeregister. */
+    bool volatile       fReusedFlushPending : 1;
+    /** Used to mark the page as dirty (write monitoring is temporarily
+     *  off). */
+    bool                fDirty : 1;
+    bool                afPadding1 : 1+8;
+
     /** The index of this page. */
     uint16_t            idx;
@@ -2154 +2168 @@
     /** The previous page in the age list. */
     uint16_t            iAgePrev;
-    /** Used to indicate that the page is zeroed. */
-    bool                fZeroed;
-    /** Used to indicate that a PT has non-global entries. */
-    bool                fSeenNonGlobal;
-    /** Used to indicate that we're monitoring writes to the guest page. */
-    bool                fMonitored;
-    /** Used to indicate that the page is in the cache (e.g. in the GCPhys hash).
-     * (All pages are in the age list.) */
-    bool                fCached;
-    /** This is used by the R3 access handlers when invoked by an async thread.
-     * It's a hack required because of REMR3NotifyHandlerPhysicalDeregister. */
-    bool volatile       fReusedFlushPending;
-    /** Used to mark the page as dirty (write monitoring is temporarily
-     *  off). */
-    bool                fDirty;
-
-    /** Used to indicate that this page can't be flushed. Important for cr3 root pages or shadow pae pd pages). */
-    uint32_t            cLocked;
-    uint32_t            idxDirty;
-    RTGCPTR             pvDirtyFault;
-} PGMPOOLPAGE, *PPGMPOOLPAGE, **PPPGMPOOLPAGE;
+    /** Index into PGMPOOL::aDirtyPages if fDirty is set. */
+    uint8_t             idxDirtyEntry;
+
+    /** @name Access handler statistics to determine whether the guest is
+     *        (re)initializing a page table.
+     * @{ */
+    RTGCPTR             GCPtrLastAccessHandlerRip;
+    RTGCPTR             GCPtrLastAccessHandlerFault;
+    uint64_t            cLastAccessHandler;
+    /** @}  */
+    /** Used to indicate that this page can't be flushed. Important for cr3 root pages or shadow pae pd pages. */
+    uint32_t volatile   cLocked;
+#if GC_ARCH_BITS == 64
+    uint32_t            Alignment2;
+#endif
+# ifdef VBOX_STRICT
+    RTGCPTR             GCPtrDirtyFault;
+# endif
+} PGMPOOLPAGE;
+/** Pointer to a pool page. */
+typedef PGMPOOLPAGE *PPGMPOOLPAGE;
 /** Pointer to a const pool page. */
 typedef PGMPOOLPAGE const *PCPGMPOOLPAGE;
+/** Pointer to a pool page pointer. */
+typedef PGMPOOLPAGE **PPPGMPOOLPAGE;
 
 
@@ -2256 +2272 @@
     uint32_t                    u32Padding2;
 # endif
-    /* Next available slot. */
+    /** Next available slot (in aDirtyPages). */
     uint32_t                    idxFreeDirtyPage;
-    /* Number of active dirty pages. */
+    /** Number of active dirty pages. */
     uint32_t                    cDirtyPages;
-    /* Array of current dirty pgm pool page indices. */
+    /** Array of current dirty pgm pool page indices. */
     struct
     {