Changeset 6905 in vbox

Timestamp:

Feb 11, 2008 5:41:19 PM (17 years ago)

Author:

vboxsync

Message:

A couple of fixes to PGMAssertHandlerAndFlagsInSync.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (2 diffs)

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

@@ -1477 +1477 @@
         uint64_t   fGst;
         int rc = PGMGstGetPage(pVM, (RTGCPTR)GCPtr, &fGst, &GCPhysGst);
-        if (rc == VERR_PAGE_NOT_PRESENT)
+        if (    rc == VERR_PAGE_NOT_PRESENT
+            ||  rc == VERR_PAGE_TABLE_NOT_PRESENT)
         {
             if (pVirt->aPhysToVirt[iPage].Core.Key != NIL_RTGCPHYS)
@@ -1591 +1592 @@
 #ifdef IN_RING3
                         /* validate that REM is handling it. */
-                        if (!REMR3IsPageAccessHandled(pVM, State.GCPhys))
+                        if (    !REMR3IsPageAccessHandled(pVM, State.GCPhys)
+                                /* ignore shadowed ROM for the time being. */ /// @todo PAGE FLAGS
+                            &&  (pPage->HCPhys & (MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO2)) != (MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO2))
                         {
                             AssertMsgFailed(("ram range vs phys handler REM mismatch. GCPhys=%RGp state=%d %s\n",