Changeset 13827 in vbox for trunk/src/VBox/VMM/DBGFDisas.cpp

Timestamp:

Nov 5, 2008 1:31:18 AM (16 years ago)

Author:

vboxsync

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

38818

Message:

MM: Retired MMHyper2HC, MMHyperHC2GC and MMHyperGC2HC.

File:

• trunk/src/VBox/VMM/DBGFDisas.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -62 +62 @@
     /** The guest paging mode. */
     PGMMODE         enmMode;
-    /** Pointer to the current page - HC Ptr. */
-    void const     *pvPageHC;
+    /** Pointer to the current page - R3 Ptr. */
+    void const     *pvPageR3;
     /** Pointer to the current page - GC Ptr. */
     RTGCPTR         pvPageGC;
@@ -101 +101 @@
     pState->enmMode         = enmMode;
     pState->pvPageGC        = 0;
-    pState->pvPageHC        = NULL;
+    pState->pvPageR3        = NULL;
     pState->pVM             = pVM;
     pState->fLocked         = false;
@@ -189 +189 @@
 
         /* Need to update the page translation? */
-        if (    !pState->pvPageHC
+        if (    !pState->pvPageR3
             ||  (GCPtr >> PAGE_SHIFT) != (pState->pvPageGC >> PAGE_SHIFT))
         {
@@ -198 +198 @@
             if (MMHyperIsInsideArea(pState->pVM, pState->pvPageGC))
             {
-                pState->pvPageHC = MMHyperGC2HC(pState->pVM, pState->pvPageGC);
-                if (!pState->pvPageHC)
+                pState->pvPageR3 = MMHyperRCToR3(pState->pVM, (RTRCPTR)pState->pvPageGC);
+                if (!pState->pvPageR3)
                     rc = VERR_INVALID_POINTER;
             }
@@ -208 +208 @@
 
                 if (pState->enmMode <= PGMMODE_PROTECTED)
-                    rc = PGMPhysGCPhys2CCPtrReadOnly(pState->pVM, pState->pvPageGC, &pState->pvPageHC, &pState->PageMapLock);
+                    rc = PGMPhysGCPhys2CCPtrReadOnly(pState->pVM, pState->pvPageGC, &pState->pvPageR3, &pState->PageMapLock);
                 else
-                    rc = PGMPhysGCPtr2CCPtrReadOnly(pState->pVM, pState->pvPageGC, &pState->pvPageHC, &pState->PageMapLock);
+                    rc = PGMPhysGCPtr2CCPtrReadOnly(pState->pVM, pState->pvPageGC, &pState->pvPageR3, &pState->PageMapLock);
                 pState->fLocked = RT_SUCCESS_NP(rc);
             }
             if (RT_FAILURE(rc))
             {
-                pState->pvPageHC = NULL;
+                pState->pvPageR3 = NULL;
                 return rc;
             }
@@ -236 +236 @@
 
         /* read and advance */
-        memcpy(pu8Dst, (char *)pState->pvPageHC + (GCPtr & PAGE_OFFSET_MASK), cb);
+        memcpy(pu8Dst, (char *)pState->pvPageR3 + (GCPtr & PAGE_OFFSET_MASK), cb);
         cbRead -= cb;
         if (!cbRead)