Changeset 30495 in vbox

Timestamp:

Jun 29, 2010 12:44:34 PM (15 years ago)

Author:

vboxsync

Message:

Drop PGMPhysGCPtr2R3Ptr usage

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (1 diff)
• PATM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -2481 +2481 @@
      * Get IDT entries.
      */
-    if (PAGE_ADDRESS(GCPtrIDT) == PAGE_ADDRESS(GCPtrIDT+cGates*sizeof(VBOXIDTE)))
-    {
-        /* Just convert the IDT address to a R3 pointer. The whole IDT fits in one page. */
-        rc = PGMPhysGCPtr2R3Ptr(pVCpu, GCPtrIDT, (PRTR3PTR)&pGuestIdte);
-        if (RT_FAILURE(rc))
-        {
-            AssertMsgRC(rc, ("Failed to read IDTE! rc=%Rrc\n", rc));
-            STAM_PROFILE_STOP(&pVM->csam.s.StatCheckGates, a);
-            return rc;
-        }
-    }
-    else
-    {
-        /* Slow method when it crosses a page boundary. */
-        rc = PGMPhysSimpleReadGCPtr(pVCpu, aIDT, GCPtrIDT,  cGates*sizeof(VBOXIDTE));
-        if (RT_FAILURE(rc))
-        {
-            AssertMsgRC(rc, ("Failed to read IDTE! rc=%Rrc\n", rc));
-            STAM_PROFILE_STOP(&pVM->csam.s.StatCheckGates, a);
-            return rc;
-        }
-        pGuestIdte = &aIDT[0];
-    }
+    rc = PGMPhysSimpleReadGCPtr(pVCpu, aIDT, GCPtrIDT,  cGates*sizeof(VBOXIDTE));
+    if (RT_FAILURE(rc))
+    {
+        AssertMsgRC(rc, ("Failed to read IDTE! rc=%Rrc\n", rc));
+        STAM_PROFILE_STOP(&pVM->csam.s.StatCheckGates, a);
+        return rc;
+    }
+    pGuestIdte = &aIDT[0];
 
     for (/*iGate*/; iGate<iGateEnd; iGate++, pGuestIdte++)

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -600 +600 @@
     if (pPatch->patch.flags & PATMFL_PATCHED_GUEST_CODE)
     {
+        PGMPAGEMAPLOCK PageLock;
+
         /** @note pPrivInstrHC is probably not valid anymore */
-        rc = PGMPhysGCPtr2R3Ptr(VMMGetCpu0(pVM), pPatch->patch.pPrivInstrGC, (PRTR3PTR)&pPatch->patch.pPrivInstrHC);
+        rc = PGMPhysGCPhys2CCPtrReadOnly(pVM, pPatch->patch.pPrivInstrGC, (const void **)&pPatch->patch.pPrivInstrHC, &PageLock);
         if (rc == VINF_SUCCESS)
         {
@@ -607 +609 @@
             disret = PATMR3DISInstr(pVM, &pPatch->patch, &cpu, pPatch->patch.pPrivInstrGC, pPatch->patch.pPrivInstrHC, &opsize, szOutput, PATMREAD_RAWCODE);
             Log(("Org patch jump: %s", szOutput));
+
+            PGMPhysReleasePageMappingLock(pVM, &PageLock);
         }
     }
@@ -786 +790 @@
     if (pPatch->patch.flags & PATMFL_PATCHED_GUEST_CODE)
     {
+        PGMPAGEMAPLOCK PageLock;
+
         /** @note pPrivInstrHC is probably not valid anymore */
-        rc = PGMPhysGCPtr2R3Ptr(VMMGetCpu0(pVM), pPatch->patch.pPrivInstrGC, (PRTR3PTR)&pPatch->patch.pPrivInstrHC);
+        rc = PGMPhysGCPhys2CCPtrReadOnly(pVM, pPatch->patch.pPrivInstrGC, (const void **)&pPatch->patch.pPrivInstrHC, &PageLock);
         if (rc == VINF_SUCCESS)
         {
@@ -793 +799 @@
             disret = PATMR3DISInstr(pVM, &pPatch->patch, &cpu, pPatch->patch.pPrivInstrGC, pPatch->patch.pPrivInstrHC, &opsize, szOutput, PATMREAD_RAWCODE);
             Log(("Rel patch jump: %s", szOutput));
+
+            PGMPhysReleasePageMappingLock(pVM, &PageLock);
         }
     }