Changeset 23484 in vbox for trunk/src/VBox

Timestamp:

Oct 1, 2009 1:42:50 PM (16 years ago)

Author:

vboxsync

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

53106

Message:

PGMPAGE: Removed the non-PGM_PAGE_WITH_U16MISCY bits.

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
@@ -654 +652 @@
      */
     RTUINT16U   u16MiscY;
-#else
-    /** The physical handler state (PGM_PAGE_HNDL_PHYS_STATE*).
-     * Only 2 bits are really needed for this.  */
-    uint8_t     uHandlerPhysStateY;
-    /** Combination of:
-     *  - u2HandlerVirtStateY - the virtual handler state
-     *    (PGM_PAGE_HNDL_VIRT_STATE_*).
-     *  - fWrittenToY - flag indicating that a write monitored page was written to
-     *    when set.
-     *  - 5 unused bits. */
-    uint8_t     f8MiscY;
-#endif
 
     /** Usage tracking (page pool). */
@@ -687 +673 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef PGM_PAGE_WITH_U16MISCY
 #define PGM_PAGE_CLEAR(pPage) \
     do { \
@@ -698 +683 @@
         (pPage)->cWriteLocksY        = 0; \
     } while (0)
-#else
-#define PGM_PAGE_CLEAR(pPage) \
-    do { \
-        (pPage)->HCPhysAndPageID     = 0; \
-        (pPage)->uStateY             = 0; \
-        (pPage)->uTypeY              = 0; \
-        (pPage)->uHandlerPhysStateY  = 0; \
-        (pPage)->f8MiscY             = 0; \
-        (pPage)->u16TrackingY        = 0; \
-        (pPage)->cReadLocksY         = 0; \
-        (pPage)->cWriteLocksY        = 0; \
-    } while (0)
-#endif
 
 /**
@@ -716 +688 @@
  * @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 { \
@@ -729 +700 @@
         (pPage)->cWriteLocksY        = 0; \
     } while (0)
-#else
-#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)->uHandlerPhysStateY  = 0; \
-        (pPage)->f8MiscY             = 0; \
-        (pPage)->u16TrackingY        = 0; \
-        (pPage)->cReadLocksY         = 0; \
-        (pPage)->cWriteLocksY        = 0; \
-    } while (0)
-#endif
 
 /**
@@ -882 +838 @@
  * @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
 
 /**
@@ -892 +844 @@
  * @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
 
 /**
@@ -903 +851 @@
  * @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
 
 
@@ -930 +874 @@
  * @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
 
 /**
@@ -943 +882 @@
  * @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
 
 /**
@@ -987 +921 @@
  * @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
 
 /**
@@ -998 +928 @@
  * @param   _uState     The new state value.
  */
-#ifdef PGM_PAGE_WITH_U16MISCY
 #define PGM_PAGE_SET_HNDL_VIRT_STATE(pPage, _uState) \
     do { \
@@ -1004 +933 @@
                                  | ((_uState)                & UINT8_C(0x03)); \
     } while (0)
-#else
-#define PGM_PAGE_SET_HNDL_VIRT_STATE(pPage, _uState) \
-    do { \
-        (pPage)->f8MiscY = ((pPage)->f8MiscY & UINT8_C(0xfc)) \
-                         | ((_uState)        & UINT8_C(0x03)); \
-    } while (0)
-#endif
 
 /**