Changeset 23478 in vbox for trunk/src

Timestamp:

Oct 1, 2009 1:12:06 PM (15 years ago)

Author:

vboxsync

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

53100

Message:

PGMPAGE: Removed the PGM_PAGE_WITH_BIT_FIELD bits.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (12 diffs)
• PGMPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -620 +620 @@
 /** @} */
 
+
 /**
  * A Physical Guest Page tracking structure.
@@ -635 +636 @@
     /** The page state.
      * Only 2 bits are really needed for this. */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-    uint32_t    uStateY : 8;
-#else
     uint8_t     uStateY;
-#endif
     /** The page type (PGMPAGETYPE).
      * Only 3 bits are really needed for this. */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-    uint32_t    uTypeY : 8;
-#else
     uint8_t     uTypeY;
-#endif
 
     /** The physical handler state (PGM_PAGE_HNDL_PHYS_STATE*).
      * Only 2 bits are really needed for this.  */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-    uint32_t    uHandlerPhysStateY : 8;
-#else
     uint8_t     uHandlerPhysStateY;
-#endif
-
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-    /** The virtual handler state (PGM_PAGE_HNDL_VIRT_STATE*) */
-    uint32_t    u2HandlerVirtStateY : 2;
-    /** For later. */
-    uint32_t    afSomethingElse0 : 5;
-    /** Flag indicating that a write monitored page was written to when set. */
-    uint32_t    fWrittenToY : 1;
-#else
-    /** Combination of u2HandlerVirtStateY, fWrittenToY and 5 unused bits. */
+    /** 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). */
@@ -688 +672 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-# define PGM_PAGE_CLEAR(pPage) \
-    do { \
-        (pPage)->HCPhysAndPageID     = 0; \
-        (pPage)->uStateY             = 0; \
-        (pPage)->fWrittenToY         = 0; \
-        (pPage)->afSomethingElse0    = 0; \
-        (pPage)->uTypeY              = 0; \
-        (pPage)->uHandlerPhysStateY  = 0; \
-        (pPage)->u2HandlerVirtStateY = 0; \
-        (pPage)->u16TrackingY        = 0; \
-        (pPage)->cReadLocksY         = 0; \
-        (pPage)->cWriteLocksY        = 0; \
-    } while (0)
-#else
-# define PGM_PAGE_CLEAR(pPage) \
+#define PGM_PAGE_CLEAR(pPage) \
     do { \
         (pPage)->HCPhysAndPageID     = 0; \
@@ -714 +683 @@
         (pPage)->cWriteLocksY        = 0; \
     } while (0)
-#endif
 
 /**
@@ -720 +688 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-# define PGM_PAGE_INIT(pPage, _HCPhys, _idPage, _uType, _uState) \
+#define PGM_PAGE_INIT(pPage, _HCPhys, _idPage, _uType, _uState) \
     do { \
         RTHCPHYS SetHCPhysTmp = (_HCPhys); \
@@ -736 +703 @@
         (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
 
 /**
@@ -889 +841 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-#define PGM_PAGE_SET_WRITTEN_TO(pPage)      do { (pPage)->fWrittenToY = 1; } while (0)
-#else
 #define PGM_PAGE_SET_WRITTEN_TO(pPage)      do { (pPage)->f8MiscY |= UINT8_C(0x80); } while (0)
-#endif
 
 /**
@@ -899 +847 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-#define PGM_PAGE_CLEAR_WRITTEN_TO(pPage)    do { (pPage)->fWrittenToY = 0; } while (0)
-#else
 #define PGM_PAGE_CLEAR_WRITTEN_TO(pPage)    do { (pPage)->f8MiscY &= UINT8_C(0x7f); } while (0)
-#endif
 
 /**
@@ -910 +854 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-#define PGM_PAGE_IS_WRITTEN_TO(pPage)       ( (pPage)->fWrittenToY )
-#else
 #define PGM_PAGE_IS_WRITTEN_TO(pPage)       ( !!((pPage)->f8MiscY & UINT8_C(0x80)) )
-#endif
 
 
@@ -984 +924 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-#define PGM_PAGE_GET_HNDL_VIRT_STATE(pPage) ( (pPage)->u2HandlerVirtStateY )
-#else
 #define PGM_PAGE_GET_HNDL_VIRT_STATE(pPage) ( (pPage)->f8MiscY & UINT8_C(0x03) )
-#endif
 
 /**
@@ -995 +931 @@
  * @param   _uState     The new state value.
  */
-#ifdef PGM_PAGE_WITH_BIT_FIELD
-#define PGM_PAGE_SET_HNDL_VIRT_STATE(pPage, _uState) \
-    do { (pPage)->u2HandlerVirtStateY = (_uState); } while (0)
-#else
 #define PGM_PAGE_SET_HNDL_VIRT_STATE(pPage, _uState) \
     do { \
@@ -1004 +936 @@
                          | ((_uState)        & UINT8_C(0x03)); \
     } while (0)
-#endif
 
 /**

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -3328 +3328 @@
 }
 
-
-