Changeset 13415 in vbox

Timestamp:

Oct 20, 2008 11:22:47 PM (16 years ago)

Author:

vboxsync

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

38171

Message:

VMM: a couple of comments.

Location:

trunk/src/VBox/VMM

Files:

• IOM.cpp (modified) (3 diffs)
• VMMAll/PGMAllHandler.cpp (modified) (2 diffs)
• VMMAll/PGMAllShw.h (modified) (1 diff)

trunk/src/VBox/VMM/IOM.cpp

@@ -1422 +1422 @@
          */
         rc = PGMR3PhysMMIORegister(pVM, GCPhysStart, cbRange,
-                                    IOMR3MMIOHandler, pRange,
-                                    pVM->iom.s.pfnMMIOHandlerR0, MMHyperR3ToR0(pVM, pRange),
-                                    pVM->iom.s.pfnMMIOHandlerRC, MMHyperR3ToRC(pVM, pRange), pszDesc);
-
+                                   IOMR3MMIOHandler, pRange,
+                                   pVM->iom.s.pfnMMIOHandlerR0, MMHyperR3ToR0(pVM, pRange),
+                                   pVM->iom.s.pfnMMIOHandlerRC, MMHyperR3ToRC(pVM, pRange), pszDesc);
         if (RT_SUCCESS(rc))
         {
@@ -1605 +1604 @@
     while (GCPhys <= GCPhysLast && GCPhys >= GCPhysStart)
     {
-        int           rc;
         PIOMMMIORANGE pRange = (PIOMMMIORANGE)RTAvlroGCPhysRemove(&pVM->iom.s.pTreesR3->MMIOTree, GCPhys);
         Assert(pRange);
@@ -1611 +1609 @@
 
         /* remove it from PGM */
-        rc = PGMR3PhysMMIODeregister(pVM, GCPhys, pRange->cb);
+        int rc = PGMR3PhysMMIODeregister(pVM, GCPhys, pRange->cb);
+        AssertRC(rc);
 
         /* advance and free. */

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

@@ -899 +899 @@
 }
 
+
 /**
  * Temporarily turns off the access monitoring of a page within an MMIO
@@ -932 +933 @@
 
             AssertReturn(pCur->enmType == PGMPHYSHANDLERTYPE_MMIO, VERR_ACCESS_DENIED);
+            /** @todo r=bird: This totally breaks the new PGMPAGE management. Will probably
+             *        have to require that the current page is the zero page... Require
+             *        GCPhysPageRemap to be a MMIO2 page might help matters because those
+             *        pages aren't managed dynamically (at least not yet).
+             *        VBOX_WITH_NEW_PHYS_CODE TODO!  */
 
             PPGMPAGE pPageRemap;

trunk/src/VBox/VMM/VMMAll/PGMAllShw.h

@@ -359 +359 @@
             {
                 pPT->a[iPTE].u = (pPT->a[iPTE].u & (fMask | SHW_PTE_PG_MASK)) | (fFlags & ~SHW_PTE_PG_MASK);
+/** @todo r=bird: I think this may break assumptions in page pool GCPhys
+ * tracking, and I seems to recall putting it here to prevent API users from
+ * making anything !P. The assertion is kind of useless now, as it
+ * won't hit anything any longer... */
                 Assert(pPT->a[iPTE].n.u1Present || !(fMask & X86_PTE_P));
 # if PGM_SHW_TYPE == PGM_TYPE_EPT