Changeset 86461 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 6, 2020 4:40:59 PM (5 years ago)

Author:

vboxsync

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

140765

Message:

VMM/PGM: Don't check for, or even define, PGM_PDFLAGS_MAPPING when PGM_WITHOUT_MAPPINGS is active (the default now).

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGMDbg.cpp (modified) (6 diffs)
• PGMPool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp

@@ -1346 +1346 @@
                                         Pde.b.u1NoExecute   ? "NX" : "--",
                                         Pde.u & PGM_PDFLAGS_BIG_PAGE    ? 'b' : '-',
+#ifndef PGM_WITHOUT_MAPPINGS
                                         Pde.u & PGM_PDFLAGS_MAPPING     ? 'm' : '-',
+#else
+                                        '-',
+#endif
                                         Pde.u & PGM_PDFLAGS_TRACK_DIRTY ? 'd' : '-',
                                         Pde.u & X86_PDE2M_PAE_PG_MASK);
@@ -1375 +1379 @@
                                         Pde.n.u1NoExecute   ? "NX" : "--",
                                         Pde.u & PGM_PDFLAGS_BIG_PAGE    ? 'b' : '-',
+#ifndef PGM_WITHOUT_MAPPINGS
                                         Pde.u & PGM_PDFLAGS_MAPPING     ? 'm' : '-',
+#else
+                                        '-',
+#endif
                                         Pde.u & PGM_PDFLAGS_TRACK_DIRTY ? 'd' : '-',
                                         Pde.u & X86_PDE_PAE_PG_MASK);
@@ -1386 +1394 @@
                 if (cMaxDepth)
                 {
-                    int rc2 = pgmR3DumpHierarchyShwPaePT(pState, Pde.u & X86_PDE_PAE_PG_MASK, !!(Pde.u & PGM_PDFLAGS_MAPPING));
+                    int rc2 = pgmR3DumpHierarchyShwPaePT(pState, Pde.u & X86_PDE_PAE_PG_MASK,
+#ifndef PGM_WITHOUT_MAPPINGS
+                                                         RT_BOOL(Pde.u & PGM_PDFLAGS_MAPPING)
+#else
+                                                         false /*fIsMapping*/
+#endif
+                                                         );
                     if (rc2 < rc && RT_SUCCESS(rc))
                         rc = rc2;
@@ -1662 +1676 @@
                                         Pde.b.u1PAT         ? "AT" : "--",
                                         Pde.u & PGM_PDFLAGS_BIG_PAGE    ? 'b' : '-',
+#ifndef PGM_WITHOUT_MAPPINGS
                                         Pde.u & PGM_PDFLAGS_MAPPING     ? 'm' : '-',
+#else
+                                        '-',
+#endif
                                         Pde.u & PGM_PDFLAGS_TRACK_DIRTY ? 'd' : '-',
                                         u64Phys);
@@ -1683 +1701 @@
                                         Pde.n.u1CacheDisable? "CD" : "--",
                                         Pde.u & PGM_PDFLAGS_BIG_PAGE    ? 'b' : '-',
+#ifndef PGM_WITHOUT_MAPPINGS
                                         Pde.u & PGM_PDFLAGS_MAPPING     ? 'm' : '-',
+#else
+                                        '-',
+#endif
                                         Pde.u & PGM_PDFLAGS_TRACK_DIRTY ? 'd' : '-',
                                         Pde.u & X86_PDE_PG_MASK);
@@ -1692 +1714 @@
                 if (cMaxDepth)
                 {
-                    int rc2 = pgmR3DumpHierarchyShw32BitPT(pState, Pde.u & X86_PDE_PG_MASK, !!(Pde.u & PGM_PDFLAGS_MAPPING));
+                    int rc2 = pgmR3DumpHierarchyShw32BitPT(pState, Pde.u & X86_PDE_PG_MASK,
+#ifndef PGM_WITHOUT_MAPPINGS
+                                                           !!(Pde.u & PGM_PDFLAGS_MAPPING)
+#else
+                                                           false /*fIsMapping*/
+#endif
+                                                           );
                     if (rc2 < rc && RT_SUCCESS(rc))
                         rc = rc2;

trunk/src/VBox/VMM/VMMR3/PGMPool.cpp

@@ -543 +543 @@
                                 &&  pShwPD->a[i].b.u1Size)
                             {
+# ifndef PGM_WITHOUT_MAPPINGS
                                 Assert(!(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING));
+# endif
                                 pShwPD->a[i].u = 0;
                                 Assert(pPage->cPresent);
@@ -564 +566 @@
                                 &&  pShwPD->a[i].b.u1Size)
                             {
+# ifndef PGM_WITHOUT_MAPPINGS
                                 Assert(!(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING));
+# endif
                                 pShwPD->a[i].u = 0;
                                 Assert(pPage->cPresent);