Changeset 16045 in vbox for trunk/src/VBox/VMM/PGMPhys.cpp

Timestamp:

Jan 19, 2009 4:27:59 PM (16 years ago)

Author:

vboxsync

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

41737

Message:

PGMR3PhysTlbGCPhys2Ptr: Deal correctly with disabled access handlers. Ref #3399.

File:

• trunk/src/VBox/VMM/PGMPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -2463 +2463 @@
                 /* nothing */;
 #endif
-            else if (PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)) /* catches MMIO */
-                rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
-            else if (fWritable && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
-                rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
+            else if (PGM_PAGE_HAS_ANY_HANDLERS(pPage))
+            {
+                if (PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)) /* catches MMIO */
+                    rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
+                else if (fWritable && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
+                    rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
+                else
+                {
+                    /* Temporariliy disabled phycial handler(s), since the recompiler
+                       doesn't get notified when it's reset we'll have to pretend its
+                       operating normally. */
+                    if (pgmHandlerPhysicalIsAll(pVM, GCPhys))
+                        rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
+                    else
+                        rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
+                }
+            }
             else
                 rc = VINF_SUCCESS;