Changeset 20772 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 22, 2009 12:39:35 PM (15 years ago)

Author:

vboxsync

Message:

More safety

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (1 diff)

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

@@ -435 +435 @@
                             if (pCur->CTX_SUFF(pfnHandler))
                             {
+#  ifdef IN_RING0
+                                PFNPGMR0PHYSHANDLER pfnHandler = pCur->CTX_SUFF(pfnHandler);
+#  else
+                                PFNPGMRCPHYSHANDLER pfnHandler = pCur->CTX_SUFF(pfnHandler);
+#  endif
+                                void *pvUser = pCur->CTX_SUFF(pvUser);
+
                                 STAM_PROFILE_START(&pCur->Stat, h);
                                 pgmUnlock(pVM); /* @todo: Not entirely safe. */
-                                rc = pCur->CTX_SUFF(pfnHandler)(pVM, uErr, pRegFrame, pvFault, GCPhysFault, pCur->CTX_SUFF(pvUser));
+                                rc = pfnHandler(pVM, uErr, pRegFrame, pvFault, GCPhysFault, pvUser);
                                 pgmLock(pVM);
-                                STAM_PROFILE_STOP(&pCur->Stat, h);
+#  ifdef VBOX_WITH_STATISTICS
+                                pCur = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhysFault);
+                                if (pCur)
+                                    STAM_PROFILE_STOP(&pCur->Stat, h);
+#  else
+                                pCur = NULL;    /* might be invalid by now. */
+#  endif
+                                
                             }
                             else