Changeset 14755 in vbox for trunk/src/VBox/VMM/PATM

Timestamp:

Nov 28, 2008 2:58:01 AM (16 years ago)

Author:

vboxsync

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

40070

Message:

#1865: Converted 4 PGM*2HC* conversion functions to RTR3PTR.

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (3 diffs)
• PATM.cpp (modified) (7 diffs)
• PATMSSM.cpp (modified) (1 diff)

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

@@ -578 +578 @@
     }
 
-    rc = PGMPhysGCPtr2HCPtr(pVM, pGCPtr, &pHCPtr);
+    rc = PGMPhysGCPtr2R3Ptr(pVM, pGCPtr, &pHCPtr);
     if (rc != VINF_SUCCESS)
     {
@@ -1279 +1279 @@
             Log(("Jump through jump table\n"));
 
-            rc2 = PGMPhysGCPtr2HCPtr(pVM, pJumpTableGC, (PRTHCPTR)&pJumpTableHC);
+            rc2 = PGMPhysGCPtr2R3Ptr(pVM, pJumpTableGC, (PRTHCPTR)&pJumpTableHC);
             if (rc2 == VINF_SUCCESS)
             {
@@ -2328 +2328 @@
     if (PAGE_ADDRESS(GCPtrIDT) == PAGE_ADDRESS(GCPtrIDT+cGates*sizeof(VBOXIDTE)))
     {
-        /* Just convert the IDT address to a HC pointer. The whole IDT fits in one page. */
-        rc = PGMPhysGCPtr2HCPtr(pVM, GCPtrIDT, (PRTHCPTR)&pGuestIdte);
+        /* Just convert the IDT address to a R3 pointer. The whole IDT fits in one page. */
+        rc = PGMPhysGCPtr2R3Ptr(pVM, GCPtrIDT, (PRTR3PTR)&pGuestIdte);
         if (RT_FAILURE(rc))
         {

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

@@ -604 +604 @@
     {
         /** @note pPrivInstrHC is probably not valid anymore */
-        rc = PGMPhysGCPtr2HCPtr(pVM, pPatch->patch.pPrivInstrGC, (PRTHCPTR)&pPatch->patch.pPrivInstrHC);
+        rc = PGMPhysGCPtr2R3Ptr(pVM, pPatch->patch.pPrivInstrGC, (PRTR3PTR)&pPatch->patch.pPrivInstrHC);
         if (rc == VINF_SUCCESS)
         {
@@ -790 +790 @@
     {
         /** @note pPrivInstrHC is probably not valid anymore */
-        rc = PGMPhysGCPtr2HCPtr(pVM, pPatch->patch.pPrivInstrGC, (PRTHCPTR)&pPatch->patch.pPrivInstrHC);
+        rc = PGMPhysGCPtr2R3Ptr(pVM, pPatch->patch.pPrivInstrGC, (PRTR3PTR)&pPatch->patch.pPrivInstrHC);
         if (rc == VINF_SUCCESS)
         {
@@ -995 +995 @@
     }
 
-    rc = PGMPhysGCPtr2HCPtr(pVM, pGCPtr, (void **)&pHCPtr);
+    rc = PGMPhysGCPtr2R3Ptr(pVM, pGCPtr, (void **)&pHCPtr);
     if (rc != VINF_SUCCESS)
     {
@@ -4121 +4121 @@
     }
     GCPhys = GCPhys + (pInstrGC & PAGE_OFFSET_MASK);
-    rc = PGMPhysGCPhys2HCPtr(pVM, GCPhys, MAX_INSTR_SIZE, (void **)&pInstrHC);
+    rc = PGMPhysGCPhys2R3Ptr(pVM, GCPhys, MAX_INSTR_SIZE, (void **)&pInstrHC);
     AssertRCReturn(rc, rc);
 
@@ -4402 +4402 @@
     uint8_t *pInstrHC;
 
-    int rc = PGMPhysGCPtr2HCPtr(pVM, pInstrGC, (RTHCPTR *)&pInstrHC);
+    int rc = PGMPhysGCPtr2R3Ptr(pVM, pInstrGC, (PRTR3PTR)&pInstrHC);
     if (rc == VINF_SUCCESS)
     {
@@ -4999 +4999 @@
 
                 /** pPrivInstrHC is probably not valid anymore */
-                rc = PGMPhysGCPtr2HCPtr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTHCPTR)&pPatchRec->patch.pPrivInstrHC);
+                rc = PGMPhysGCPtr2R3Ptr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTR3PTR)&pPatchRec->patch.pPrivInstrHC);
                 if (rc == VINF_SUCCESS)
                 {
@@ -5218 +5218 @@
                 Assert(!(pPatch->flags & PATMFL_PATCHED_GUEST_CODE));
                 /** @todo -> pPrivInstrHC is probably not valid anymore */
-                rc = PGMPhysGCPtr2HCPtr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTHCPTR)&pPatchRec->patch.pPrivInstrHC);
+                rc = PGMPhysGCPtr2R3Ptr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTR3PTR)&pPatchRec->patch.pPrivInstrHC);
                 if (rc == VINF_SUCCESS)
                 {

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

@@ -582 +582 @@
         pPatchRec->patch.pPrivInstrHC   = 0;
         /* The GC virtual ptr is fixed, but we must convert it manually again to HC. */
-        rc = PGMPhysGCPtr2HCPtr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTHCPTR)&pPatchRec->patch.pPrivInstrHC);
+        rc = PGMPhysGCPtr2R3Ptr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTR3PTR)&pPatchRec->patch.pPrivInstrHC);
         /* Can fail due to page or page table not present. */