Changeset 23483 in vbox for trunk/src

Timestamp:

Oct 1, 2009 1:40:25 PM (15 years ago)

Author:

vboxsync

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

53105

Message:

PGMPAGE: Merging u2HandlerPhysStateY into the misc field.

File:

• trunk/src/VBox/VMM/PGMInternal.h (modified) (14 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -641 +641 @@
     uint8_t     uTypeY;
 
+#define PGM_PAGE_WITH_U16MISCY 1
+#ifdef PGM_PAGE_WITH_U16MISCY
+    /** Combination of:
+     *  - [0-7]: u2HandlerPhysStateY - the physical handler state
+     *    (PGM_PAGE_HNDL_PHYS_STATE_*).
+     *  - [8-9]: u2HandlerVirtStateY - the virtual handler state
+     *    (PGM_PAGE_HNDL_VIRT_STATE_*).
+     *  - [15]:  fWrittenToY - flag indicating that a write monitored page was
+     *    written to when set.
+     *  - [10-14]: 5 unused bits.
+     * @remarks Warning! All accesses to the bits are hardcoded.
+     */
+    RTUINT16U   u16MiscY;
+#else
     /** The physical handler state (PGM_PAGE_HNDL_PHYS_STATE*).
      * Only 2 bits are really needed for this.  */
@@ -651 +665 @@
      *  - 5 unused bits. */
     uint8_t     f8MiscY;
+#endif
 
     /** Usage tracking (page pool). */
@@ -672 +687 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_CLEAR(pPage) \
+    do { \
+        (pPage)->HCPhysAndPageID     = 0; \
+        (pPage)->uStateY             = 0; \
+        (pPage)->uTypeY              = 0; \
+        (pPage)->u16MiscY.u          = 0; \
+        (pPage)->u16TrackingY        = 0; \
+        (pPage)->cReadLocksY         = 0; \
+        (pPage)->cWriteLocksY        = 0; \
+    } while (0)
+#else
 #define PGM_PAGE_CLEAR(pPage) \
     do { \
@@ -683 +710 @@
         (pPage)->cWriteLocksY        = 0; \
     } while (0)
+#endif
 
 /**
@@ -688 +716 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_INIT(pPage, _HCPhys, _idPage, _uType, _uState) \
+    do { \
+        RTHCPHYS SetHCPhysTmp = (_HCPhys); \
+        AssertFatal(!(SetHCPhysTmp & ~UINT64_C(0x0000fffffffff000))); \
+        (pPage)->HCPhysAndPageID     = (SetHCPhysTmp << (28-12)) | ((_idPage) & UINT32_C(0x0fffffff)); \
+        (pPage)->uStateY             = (_uState); \
+        (pPage)->uTypeY              = (_uType); \
+        (pPage)->u16MiscY.u          = 0; \
+        (pPage)->u16TrackingY        = 0; \
+        (pPage)->cReadLocksY         = 0; \
+        (pPage)->cWriteLocksY        = 0; \
+    } while (0)
+#else
 #define PGM_PAGE_INIT(pPage, _HCPhys, _idPage, _uType, _uState) \
     do { \
@@ -701 +743 @@
         (pPage)->cWriteLocksY        = 0; \
     } while (0)
+#endif
 
 /**
@@ -839 +882 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_SET_WRITTEN_TO(pPage)      do { (pPage)->u16MiscY.au8[1] |= UINT8_C(0x80); } while (0)
+#else
 #define PGM_PAGE_SET_WRITTEN_TO(pPage)      do { (pPage)->f8MiscY |= UINT8_C(0x80); } while (0)
+#endif
 
 /**
@@ -845 +892 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_CLEAR_WRITTEN_TO(pPage)    do { (pPage)->u16MiscY.au8[1] &= UINT8_C(0x7f); } while (0)
+#else
 #define PGM_PAGE_CLEAR_WRITTEN_TO(pPage)    do { (pPage)->f8MiscY &= UINT8_C(0x7f); } while (0)
+#endif
 
 /**
@@ -852 +903 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_IS_WRITTEN_TO(pPage)       ( !!((pPage)->u16MiscY.au8[1] & UINT8_C(0x80)) )
+#else
 #define PGM_PAGE_IS_WRITTEN_TO(pPage)       ( !!((pPage)->f8MiscY & UINT8_C(0x80)) )
+#endif
 
 
@@ -875 +930 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_GET_HNDL_PHYS_STATE(pPage)  \
+    ( (pPage)->u16MiscY.au8[0] )
+#else
 #define PGM_PAGE_GET_HNDL_PHYS_STATE(pPage)  \
     ( (pPage)->uHandlerPhysStateY )
+#endif
 
 /**
@@ -883 +943 @@
  * @param   _uState     The new state value.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, _uState) \
+    do { (pPage)->u16MiscY.au8[0] = (_uState); } while (0)
+#else
 #define PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, _uState) \
     do { (pPage)->uHandlerPhysStateY = (_uState); } while (0)
+#endif
 
 /**
@@ -922 +987 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_GET_HNDL_VIRT_STATE(pPage) ( (pPage)->u16MiscY.au8[1] & UINT8_C(0x03) )
+#else
 #define PGM_PAGE_GET_HNDL_VIRT_STATE(pPage) ( (pPage)->f8MiscY & UINT8_C(0x03) )
+#endif
 
 /**
@@ -929 +998 @@
  * @param   _uState     The new state value.
  */
+#ifdef PGM_PAGE_WITH_U16MISCY
+#define PGM_PAGE_SET_HNDL_VIRT_STATE(pPage, _uState) \
+    do { \
+        (pPage)->u16MiscY.au8[1] = ((pPage)->u16MiscY.au8[1] & UINT8_C(0xfc)) \
+                                 | ((_uState)                & UINT8_C(0x03)); \
+    } while (0)
+#else
 #define PGM_PAGE_SET_HNDL_VIRT_STATE(pPage, _uState) \
     do { \
@@ -934 +1010 @@
                          | ((_uState)        & UINT8_C(0x03)); \
     } while (0)
+#endif
 
 /**