Changeset 13146 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 9, 2008 10:58:12 PM (16 years ago)

Author:

vboxsync

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

37655

Message:

#1865: Renamed PGMPhysReadGCPhys -> PGMPhysSimpleReadGCPhys, PGMPhysWriteGCPhys -> PGMPhysSimpleWriteGCPhys, PGMPhysReadGCPtrSafe -> PGMPhysReadGCPtr and PGMPhysWriteGCPtrSafe -> PGMPhysWriteGCPtr. This puts PGMPhysRead/Write and PGMPhysRead/WriteGCPtr in the same group.

Location:

trunk/src/VBox/VMM

Files:

• DBGFMem.cpp (modified) (2 diffs)
• PGM.cpp (modified) (1 diff)
• PGMPhysRWTmpl.h (modified) (2 diffs)
• VM.cpp (modified) (3 diffs)
• VMMAll/EMAll.cpp (modified) (4 diffs)
• VMMAll/IOMAllMMIO.cpp (modified) (2 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (9 diffs)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)

trunk/src/VBox/VMM/DBGFMem.cpp

@@ -145 +145 @@
         ||  enmMode == PGMMODE_PROTECTED
         ||  DBGFADDRESS_IS_PHYS(pAddress) )
-        rc = PGMPhysReadGCPhys(pVM, pvBuf, pAddress->FlatPtr, cbRead);
+        rc = PGMPhysSimpleReadGCPhys(pVM, pvBuf, pAddress->FlatPtr, cbRead);
     else
         rc = PGMPhysSimpleReadGCPtr(pVM, pvBuf, pAddress->FlatPtr, cbRead);
@@ -203 +203 @@
         ||  enmMode == PGMMODE_PROTECTED
         ||  DBGFADDRESS_IS_PHYS(pAddress) )
-        rc = PGMPhysReadGCPhys(pVM, pszBuf, pAddress->FlatPtr, cchBuf);
+        rc = PGMPhysSimpleReadGCPhys(pVM, pszBuf, pAddress->FlatPtr, cchBuf);
     else
         rc = PGMPhysSimpleReadGCPtr(pVM, pszBuf, pAddress->FlatPtr, cchBuf);

trunk/src/VBox/VMM/PGM.cpp

@@ -229 +229 @@
  *
  * Allocation points:
- *      - PGMPhysWriteGCPhys and PGMPhysWrite.
+ *      - PGMPhysSimpleWriteGCPhys and PGMPhysWrite.
  *      - Replacing a zero page mapping at \#PF.
  *      - Replacing a shared page mapping at \#PF.

trunk/src/VBox/VMM/PGMPhysRWTmpl.h

@@ -24 +24 @@
  * Read physical memory. (one byte/word/dword)
  *
- * This API respects access handlers and MMIO. Use PGMPhysReadGCPhys() if you
+ * This API respects access handlers and MMIO. Use PGMPhysSimpleReadGCPhys() if you
  * want to ignore those.
  *
@@ -65 +65 @@
  * Write to physical memory. (one byte/word/dword)
  *
- * This API respects access handlers and MMIO. Use PGMPhysReadGCPhys() if you
+ * This API respects access handlers and MMIO. Use PGMPhysSimpleReadGCPhys() if you
  * want to ignore those.
  *

trunk/src/VBox/VMM/VM.cpp

@@ -1326 +1326 @@
                            "ss:sp=0000:%04x ", esp);
             uint32_t Start = esp & ~(uint32_t)63;
-            int rc = PGMPhysReadGCPhys(pVM, abBuf, Start, 0x100);
+            int rc = PGMPhysSimpleReadGCPhys(pVM, abBuf, Start, 0x100);
             if (VBOX_SUCCESS(rc))
                 RTLogRelPrintf("0000:%04x TO 0000:%04x:\n"
@@ -1338 +1338 @@
             if (esp < 0x2000 && esp > 0x1fc0)
             {
-                rc = PGMPhysReadGCPhys(pVM, abBuf, 0x8000, 0x800);
+                rc = PGMPhysSimpleReadGCPhys(pVM, abBuf, 0x8000, 0x800);
                 if (VBOX_SUCCESS(rc))
                     RTLogRelPrintf("0000:8000 TO 0000:87ff:\n"
@@ -1347 +1347 @@
             if (true)
             {
-                rc = PGMPhysReadGCPhys(pVM, abBuf, 0x8000, 0x200);
+                rc = PGMPhysSimpleReadGCPhys(pVM, abBuf, 0x8000, 0x200);
                 if (VBOX_SUCCESS(rc))
                     RTLogRelPrintf("2000:0000 TO 2000:01ff:\n"

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

@@ -330 +330 @@
     return VINF_SUCCESS;
 #else
-    return PGMPhysReadGCPtrSafe(pVM, pDest, GCSrc, cb);
+    return PGMPhysReadGCPtr(pVM, pDest, GCSrc, cb);
 #endif
 }
@@ -361 +361 @@
 
 #else
-    return PGMPhysWriteGCPtrSafe(pVM, GCDest, pSrc, cb);
+    return PGMPhysWriteGCPtr(pVM, GCDest, pSrc, cb);
 #endif
 }
@@ -1340 +1340 @@
         LogFlow(("emInterpretStosWD dest=%04X:%VGv (%VGv) cbSize=%d\n", pRegFrame->es, GCOffset, GCDest, cbSize));
 
-        rc = PGMPhysWriteGCPtrSafe(pVM, GCDest, &pRegFrame->rax, cbSize);
+        rc = PGMPhysWriteGCPtr(pVM, GCDest, &pRegFrame->rax, cbSize);
         if (VBOX_FAILURE(rc))
             return VERR_EM_INTERPRETER;
@@ -1381 +1381 @@
         while (cTransfers)
         {
-            rc = PGMPhysWriteGCPtrSafe(pVM, GCDest, &pRegFrame->rax, cbSize);
+            rc = PGMPhysWriteGCPtr(pVM, GCDest, &pRegFrame->rax, cbSize);
             if (VBOX_FAILURE(rc))
             {

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

@@ -258 +258 @@
     return MMGCRamReadNoTrapHandler(pDest, (void *)GCSrc, cb);
 #else
-    return PGMPhysReadGCPtrSafe(pVM, pDest, GCSrc, cb);
+    return PGMPhysReadGCPtr(pVM, pDest, GCSrc, cb);
 #endif
 }
@@ -269 +269 @@
     return MMGCRamWriteNoTrapHandler((void *)GCDest, pSrc, cb);
 #else
-    return PGMPhysWriteGCPtrSafe(pVM, GCDest, pSrc, cb);
+    return PGMPhysWriteGCPtr(pVM, GCDest, pSrc, cb);
 #endif
 }

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

@@ -1131 +1131 @@
  * Read physical memory.
  *
- * This API respects access handlers and MMIO. Use PGMPhysReadGCPhys() if you
+ * This API respects access handlers and MMIO. Use PGMPhysSimpleReadGCPhys() if you
  * want to ignore those.
  *
@@ -1389 +1389 @@
  * Write to physical memory.
  *
- * This API respects access handlers and MMIO. Use PGMPhysReadGCPhys() if you
+ * This API respects access handlers and MMIO. Use PGMPhysSimpleReadGCPhys() if you
  * want to ignore those.
  *
@@ -1731 +1731 @@
  * @param   cb          The number of bytes to read.
  */
-VMMDECL(int) PGMPhysReadGCPhys(PVM pVM, void *pvDst, RTGCPHYS GCPhysSrc, size_t cb)
+VMMDECL(int) PGMPhysSimpleReadGCPhys(PVM pVM, void *pvDst, RTGCPHYS GCPhysSrc, size_t cb)
 {
 # if defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) || defined(VBOX_WITH_NEW_PHYS_CODE)
@@ -1873 +1873 @@
  * @param   cb          The number of bytes to write.
  */
-VMMDECL(int) PGMPhysWriteGCPhys(PVM pVM, RTGCPHYS GCPhysDst, const void *pvSrc, size_t cb)
+VMMDECL(int) PGMPhysSimpleWriteGCPhys(PVM pVM, RTGCPHYS GCPhysDst, const void *pvSrc, size_t cb)
 {
 # if defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) || defined(VBOX_WITH_NEW_PHYS_CODE)
-    LogFlow(("PGMPhysWriteGCPhys: %RGp %zu\n", GCPhysDst, cb));
+    LogFlow(("PGMPhysSimpleWriteGCPhys: %RGp %zu\n", GCPhysDst, cb));
 
     /*
@@ -1943 +1943 @@
         return VINF_SUCCESS;
 
-    LogFlow(("PGMPhysWriteGCPhys: %RGp %zu\n", GCPhysDst, cb));
+    LogFlow(("PGMPhysSimpleWriteGCPhys: %RGp %zu\n", GCPhysDst, cb));
 
     /*
@@ -2398 +2398 @@
  * @param   cb          The number of bytes to read.
  */
-/** @todo use the PGMPhysSimpleReadGCPtr name and rename the unsafe one to something appropriate */
-VMMDECL(int) PGMPhysReadGCPtrSafe(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
+VMMDECL(int) PGMPhysReadGCPtr(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
 {
     RTGCPHYS    GCPhys;
@@ -2410 +2409 @@
         return VINF_SUCCESS;
 
-    LogFlow(("PGMPhysReadGCPtrSafe: %VGv %d\n", GCPtrSrc, cb));
+    LogFlow(("PGMPhysReadGCPtr: %VGv %d\n", GCPtrSrc, cb));
 
     /*
@@ -2472 +2471 @@
  */
 /** @todo use the PGMPhysWriteGCPtr name and rename the unsafe one to something appropriate */
-VMMDECL(int) PGMPhysWriteGCPtrSafe(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
+VMMDECL(int) PGMPhysWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
 {
     RTGCPHYS    GCPhys;
@@ -2483 +2482 @@
         return VINF_SUCCESS;
 
-    LogFlow(("PGMPhysWriteGCPtrSafe: %VGv %d\n", GCPtrDst, cb));
+    LogFlow(("PGMPhysWriteGCPtr: %VGv %d\n", GCPtrDst, cb));
 
     /*

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

@@ -898 +898 @@
         *(uint32_t *)pu32 = pRegFrame->eax;
 #else
-        PGMPhysWriteGCPhys(pVM, GCPhysFault, &pRegFrame->eax, 4);
+        PGMPhysSimpleWriteGCPhys(pVM, GCPhysFault, &pRegFrame->eax, 4);
 #endif
         pu32           += 4;