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

Timestamp:

Oct 7, 2008 1:04:43 PM (16 years ago)

Author:

vboxsync

Message:

#1865: More PGM changes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (4 diffs)
• PGMAllPhys.cpp (modified) (7 diffs)

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

@@ -280 +280 @@
 #  ifdef IN_GC
                     STAM_PROFILE_START(&pCur->Stat, h);
-                    rc = CTXSUFF(pCur->pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr);
+                    rc = pCur->CTX_SUFF(pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr);
                     STAM_PROFILE_STOP(&pCur->Stat, h);
 #  else
@@ -460 +460 @@
 #  ifdef IN_GC
                                 STAM_PROFILE_START(&pCur->Stat, h);
-                                rc = CTXSUFF(pCur->pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr);
+                                rc = pCur->CTX_SUFF(pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr);
                                 STAM_PROFILE_STOP(&pCur->Stat, h);
 #  else
@@ -489 +489 @@
                                 Assert(off < pCur->cb);
                                 STAM_PROFILE_START(&pCur->Stat, h);
-                                rc = CTXSUFF(pCur->pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, off);
+                                rc = pCur->CTX_SUFF(pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, off);
                                 STAM_PROFILE_STOP(&pCur->Stat, h);
 #  else
@@ -567 +567 @@
 #  ifdef IN_GC
                             STAM_PROFILE_START(&pCur->Stat, h);
-                            rc = CTXSUFF(pCur->pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr);
+                            rc = pCur->CTX_SUFF(pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr);
                             STAM_PROFILE_STOP(&pCur->Stat, h);
 #  else

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

@@ -1250 +1250 @@
                     unsigned iPage;
                     int rc2 = pgmHandlerVirtualFindByPhysAddr(pVM, GCPhys, &pNode, &iPage);
-                    if (VBOX_SUCCESS(rc2) && pNode->pfnHandlerHC)
+                    if (VBOX_SUCCESS(rc2) && pNode->pfnHandlerR3)
                     {
                         size_t cbRange = pNode->Core.KeyLast - GCPhys + 1;
@@ -1262 +1262 @@
                         void *pvSrc = PGMRAMRANGE_GETHCPTR(pRam, off)
 
-                        /** @note Dangerous assumption that HC handlers don't do anything that really requires an EMT lock! */
-                        rc = pNode->pfnHandlerHC(pVM, (RTGCPTR)GCPtr, pvSrc, pvBuf, cb, PGMACCESSTYPE_READ, 0);
+                        /* Note: Dangerous assumption that HC handlers don't do anything that really requires an EMT lock! */
+                        rc = pNode->pfnHandlerR3(pVM, (RTGCPTR)GCPtr, pvSrc, pvBuf, cb, PGMACCESSTYPE_READ, 0);
                     }
 #endif /* IN_RING3 */
@@ -1491 +1491 @@
                             void *pvDst = PGMRAMRANGE_GETHCPTR(pRam, off)
 
-                            /** @note Dangerous assumption that HC handlers don't do anything that really requires an EMT lock! */
+                            /* Note! Dangerous assumption that R3 handlers don't do anything that really requires an EMT lock! */
                             rc = pPhysNode->pfnHandlerR3(pVM, GCPhys, pvDst, (void *)pvBuf, cb, PGMACCESSTYPE_WRITE, pPhysNode->pvUserR3);
                         }
@@ -1499 +1499 @@
                         unsigned iPage;
                         int rc2 = pgmHandlerVirtualFindByPhysAddr(pVM, GCPhys, &pVirtNode, &iPage);
-                        if (VBOX_SUCCESS(rc2) && pVirtNode->pfnHandlerHC)
+                        if (VBOX_SUCCESS(rc2) && pVirtNode->pfnHandlerR3)
                         {
                             size_t cbRange = pVirtNode->Core.KeyLast - GCPhys + 1;
@@ -1511 +1511 @@
                             void *pvDst = PGMRAMRANGE_GETHCPTR(pRam, off)
 
-                            /** @note Dangerous assumption that HC handlers don't do anything that really requires an EMT lock! */
-                            rc2 = pVirtNode->pfnHandlerHC(pVM, (RTGCPTR)GCPtr, pvDst, (void *)pvBuf, cb, PGMACCESSTYPE_WRITE, 0);
+                            /* Note! Dangerous assumption that R3 handlers don't do anything that really requires an EMT lock! */
+                            rc2 = pVirtNode->pfnHandlerR3(pVM, (RTGCPTR)GCPtr, pvDst, (void *)pvBuf, cb, PGMACCESSTYPE_WRITE, 0);
                             if (    (   rc2 != VINF_PGM_HANDLER_DO_DEFAULT
                                      && rc == VINF_PGM_HANDLER_DO_DEFAULT)
@@ -1549 +1549 @@
                         unsigned iPage;
                         int rc2 = pgmHandlerVirtualFindByPhysAddr(pVM, GCPhys, &pNode, &iPage);
-                        if (VBOX_SUCCESS(rc2) && pNode->pfnHandlerHC)
+                        if (VBOX_SUCCESS(rc2) && pNode->pfnHandlerR3)
                         {
                             size_t cbRange = pNode->Core.KeyLast - GCPhys + 1;
@@ -1561 +1561 @@
                             void *pvDst = PGMRAMRANGE_GETHCPTR(pRam, off)
 
-                            /** @tode Dangerous assumption that HC handlers don't do anything that really requires an EMT lock! */
-                            rc = pNode->pfnHandlerHC(pVM, (RTGCPTR)GCPtr, pvDst, (void *)pvBuf, cb, PGMACCESSTYPE_WRITE, 0);
+                            /* Note! Dangerous assumption that R3 handlers don't do anything that really requires an EMT lock! */
+                            rc = pNode->pfnHandlerR3(pVM, (RTGCPTR)GCPtr, pvDst, (void *)pvBuf, cb, PGMACCESSTYPE_WRITE, 0);
                         }
 #endif /* IN_RING3 */