vbox的更動 4561 路徑 trunk/src/VBox/Devices/VMMDev

時間撮記:

2007-9-6 上午09:54:06 (17 年 以前)

作者:

vboxsync

訊息:

Try to minimize gc to hc ptr conversion abuse.

檔案:

• trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp (修改) (10 筆差異)

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -53 +53 @@
     uint32_t cPages;
     
-    /* Pointer to array of the HC addresses for these pages. 
-     * It is assumed that the HC address of the locked resident
-     * guest physical page does not change.
+    /* Pointer to array of the GC physical addresses for these pages. 
+     * It is assumed that the physical address of the locked resident
+     * guest page does not change.
      */
-    RTHCPTR *paPages;
+    RTGCPHYS *paPages;
     
 } VBOXHGCMLINPTR;
@@ -181 +181 @@
                                  uint32_t iLinPtr,
                                  VBOXHGCMLINPTR *paLinPtrs,
-                                 RTHCPTR **ppPages)
+                                 RTGCPHYS **ppPages)
 {
     int rc = VINF_SUCCESS;
@@ -211 +211 @@
     {
         /* convert */
-        RTHCPTR HCPtr;
-        
-        rc = PDMDevHlpPhysGCPtr2HCPtr(pDevIns, GCPtr, &HCPtr);
-        
-        Log(("vmmdevHGCMSaveLinPtr: Page %d: %VGv -> %p. %Vrc\n", iPage, GCPtr, HCPtr, rc));
+        RTGCPHYS GCPhys;
+        
+        rc = PDMDevHlpPhysGCPtr2GCPhys(pDevIns, GCPtr, &GCPhys);
+        
+        Log(("vmmdevHGCMSaveLinPtr: Page %d: %VGv -> %VGp. %Vrc\n", iPage, GCPtr, GCPhys, rc));
     
         if (VBOX_FAILURE (rc))
@@ -223 +223 @@
 
         /* store */
-        pLinPtr->paPages[iPage++] = HCPtr;
+        pLinPtr->paPages[iPage++] = GCPhys;
 
         /* next */
@@ -247 +247 @@
     AssertRelease (u32Size > 0 && iParm == (uint32_t)pLinPtr->iParm);
     
-    uint8_t *pu8Dst = (uint8_t *)pLinPtr->paPages[0] + pLinPtr->cbOffsetFirstPage;
-    uint8_t *pu8Src = (uint8_t *)pvHost;
+    RTGCPHYS GCPhysDst = pLinPtr->paPages[0] + pLinPtr->cbOffsetFirstPage;
+    uint8_t *pu8Src    = (uint8_t *)pvHost;
     
     Log(("vmmdevHGCMWriteLinPtr: parm %d: size %d, cPages = %d\n", iParm, u32Size, pLinPtr->cPages));
@@ -261 +261 @@
                              PAGE_SIZE;
                              
-        Log(("vmmdevHGCMWriteLinPtr: page %d: dst %p, src %p, cbWrite %d\n", iPage, pu8Dst, pu8Src, cbWrite));
+        Log(("vmmdevHGCMWriteLinPtr: page %d: dst %VGp, src %p, cbWrite %d\n", iPage, GCPhysDst, pu8Src, cbWrite));
         
         iPage++;
@@ -267 +267 @@
         if (cbWrite >= u32Size)
         {
-            memcpy (pu8Dst, pu8Src, u32Size);
+            PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, u32Size);
             u32Size = 0;
             break;
         }
         
-        memcpy (pu8Dst, pu8Src, cbWrite);
+        PDMDevHlpPhysWrite(pDevIns, GCPhysDst, pu8Src, cbWrite);
 
         /* next */
@@ -278 +278 @@
         pu8Src     += cbWrite;
         
-        pu8Dst = (uint8_t *)pLinPtr->paPages[iPage];
+        GCPhysDst   = pLinPtr->paPages[iPage];
     }
     
@@ -427 +427 @@
     {
         pCmd->paLinPtrs = (VBOXHGCMLINPTR *)RTMemAlloc (  sizeof (VBOXHGCMLINPTR) * cLinPtrs
-                                                          + sizeof (RTHCPTR) * cLinPtrPages);
+                                                          + sizeof (RTGCPHYS) * cLinPtrPages);
     
         if (pCmd->paLinPtrs == NULL)
@@ -457 +457 @@
 
         uint32_t iLinPtr = 0;
-        RTHCPTR *pPages  = (RTHCPTR *)((uint8_t *)pCmd->paLinPtrs + sizeof (VBOXHGCMLINPTR) *cLinPtrs);
+        RTGCPHYS *pPages  = (RTGCPHYS *)((uint8_t *)pCmd->paLinPtrs + sizeof (VBOXHGCMLINPTR) *cLinPtrs);
 
         for (i = 0; i < cParms && VBOX_SUCCESS(rc); i++, pGuestParm++, pHostParm++)