Changeset 2090 in vbox for trunk

Timestamp:

Apr 14, 2007 3:24:02 PM (18 years ago)

Author:

vboxsync

Message:

Added PGMPOOLKIND_32BIT_PT_FOR_PHYS & PGMPOOLKIND_PAE_PT_FOR_PHYS

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (18 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -256 +256 @@
         switch (pPage->enmKind)
         {
-            case PGMPOOLKIND_32BIT_PT_FOR_32BIT_PT:
+             case PGMPOOLKIND_32BIT_PT_FOR_32BIT_PT:
             {
                 const unsigned iShw = off / sizeof(X86PTE);
@@ -865 +865 @@
     {
         /*
+         * It's prefectly fine to reuse these..
+         */
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+            return true;
+
+        /*
          * It's prefectly fine to reuse these, except for PAE stuff.
          */
@@ -903 +910 @@
 
         /*
-         * These cannot be flushed, and it's common to reused the PDs as PTs.
+         * These cannot be flushed, and it's common to reuse the PDs as PTs.
          */
         case PGMPOOLKIND_ROOT_32BIT_PD:
@@ -1109 +1116 @@
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
                 case PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB:
+                case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+                case PGMPOOLKIND_PAE_PT_FOR_PHYS:
                     break;
                 default:
@@ -1145 +1154 @@
         case PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB:
         case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
             /* Nothing to monitor here. */
             return VINF_SUCCESS;
@@ -1224 +1235 @@
         case PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB:
         case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
             /* Nothing to monitor here. */
             return VINF_SUCCESS;
@@ -1544 +1557 @@
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_PT:
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
+                case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+                case PGMPOOLKIND_PAE_PT_FOR_PHYS:
                 {
 #ifdef PGMPOOL_WITH_USER_TRACKING
@@ -1894 +1909 @@
     {
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_PT:
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB:
         case PGMPOOLKIND_ROOT_32BIT_PD:
             return 4;
 
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
         case PGMPOOLKIND_PAE_PT_FOR_32BIT_PT:
         case PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB:
@@ -1922 +1939 @@
  *          The kind of page.
  *
- * @returns The size of the entry in bytes. That is, 4 or 8.
+ * @returns The size of the entry in bytes. That is, 0, 4 or 8.
  * @returns If the kind is not for a table, an assertion is raised and 0 is
  *          returned.
@@ -1947 +1964 @@
             return 8;
 
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+            /** @todo can we return 0? (nobody is calling this...) */
+            return 0;
+
         default:
             AssertFatalMsgFailed(("enmKind=%d\n", enmKind));
@@ -1981 +2003 @@
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_PT:
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB:
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
         {
             const uint32_t  u32 = (*pHCPhys & X86_PTE_PAE_PG_MASK) | X86_PTE_P;
@@ -2010 +2033 @@
         case PGMPOOLKIND_PAE_PT_FOR_PAE_PT:
         case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
         {
             const uint64_t  u64 = (*pHCPhys & X86_PTE_PAE_PG_MASK) | X86_PTE_P;
@@ -2153 +2177 @@
                 case PGMPOOLKIND_32BIT_PT_FOR_32BIT_PT:
                 case PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB:
+                case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
                 {
                     unsigned    cPresent = pPage->cPresent;
@@ -2174 +2199 @@
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_PT:
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
+                case PGMPOOLKIND_PAE_PT_FOR_PHYS:
                 {
                     unsigned  cPresent = pPage->cPresent;
@@ -2724 +2750 @@
  * @param   pPage       The page.
  * @param   pShwPT      The shadow page table (mapping of the page).
- * @param   pGstPT      The guest page table.
  */
 DECLINLINE(void) pgmPoolTrackDerefPT32Bit4MB(PPGMPOOL pPool, PPGMPOOLPAGE pPage, PX86PT pShwPT)
@@ -2850 +2875 @@
         }
 
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS: /* treat it like a 4 MB page */
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB:
         {
@@ -2858 +2884 @@
         }
 
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:   /* treat it like a 4 MB page */
         case PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB:
         {
@@ -2872 +2899 @@
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB:
         case PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB:
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
             break;
 #endif /* !PGMPOOL_WITH_GCPHYS_TRACKING */