儲存庫 vbox 的更動 4679

時間撮記:

2007-9-10 下午04:04:46 (17 年 以前)

作者:

vboxsync

訊息:

Corrected PGMPhysGCPtr2GCPhys to respect the page offset.

位置:

trunk

檔案:

• include/VBox/pgm.h (修改) (1 筆差異)
• src/VBox/VMM/VMMAll/EMAll.cpp (修改) (1 筆差異)
• src/VBox/VMM/VMMAll/PGMAllPhys.cpp (修改) (9 筆差異)

trunk/include/VBox/pgm.h

@@ -838 +838 @@
  * @param   pVM         The VM Handle
  * @param   GCPtr       The guest pointer to convert.
- * @param   pGCPhys     Where to store the HC physical address.
+ * @param   pGCPhys     Where to store the GC physical address.
  */
 PGMDECL(int) PGMPhysGCPtr2GCPhys(PVM pVM, RTGCPTR GCPtr, PRTGCPHYS pGCPhys);

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

@@ -290 +290 @@
      * instruction and it either flushed the TLB or the CPU reused it.
      */
-    RTGCPHYS    GCPhys;
-    RTGCUINTPTR offset;
-
-    offset = (RTGCUINTPTR)GCSrc & PAGE_OFFSET_MASK;
-
+    RTGCPHYS GCPhys;
     rc = PGMPhysGCPtr2GCPhys(pVM, GCSrc, &GCPhys);
     AssertRCReturn(rc, rc);
-    PGMPhysRead(pVM, GCPhys + offset, pDest, cb);
+    PGMPhysRead(pVM, GCPhys, pDest, cb);
     return VINF_SUCCESS;
 #else

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

@@ -830 +830 @@
  * @param   pVM         The VM Handle
  * @param   GCPtr       The guest pointer to convert.
- * @param   pGCPhys     Where to store the HC physical address.
+ * @param   pGCPhys     Where to store the GC physical address.
  */
 PGMDECL(int) PGMPhysGCPtr2GCPhys(PVM pVM, RTGCPTR GCPtr, PRTGCPHYS pGCPhys)
 {
-    return PGM_GST_PFN(GetPage,pVM)(pVM, (RTGCUINTPTR)GCPtr, NULL, pGCPhys);
+    int rc = PGM_GST_PFN(GetPage,pVM)(pVM, (RTGCUINTPTR)GCPtr, NULL, pGCPhys);
+    if (pGCPhys && VBOX_SUCCESS(rc))
+        *pGCPhys |= (RTGCUINTPTR)GCPtr & PAGE_OFFSET_MASK;
+    return rc;
 }
 
@@ -1927 +1930 @@
     {
         /* Convert virtual to physical address */
-        offset = GCPtrSrc & PAGE_OFFSET_MASK;
         rc = PGMPhysGCPtr2GCPhys(pVM, GCPtrSrc, &GCPhys);
         AssertRCReturn(rc, rc);
@@ -1935 +1937 @@
         AssertRC(rc);
 
-        PGMPhysRead(pVM, GCPhys + offset, pvDst, cb);
+        PGMPhysRead(pVM, GCPhys, pvDst, cb);
         return VINF_SUCCESS;
     }
@@ -1945 +1947 @@
     {
         /* Convert virtual to physical address */
-        offset = GCPtrSrc & PAGE_OFFSET_MASK;
         rc = PGMPhysGCPtr2GCPhys(pVM, GCPtrSrc, &GCPhys);
         AssertRCReturn(rc, rc);
@@ -1957 +1958 @@
         if (cbRead >= cb)
         {
-            PGMPhysRead(pVM, GCPhys + offset, pvDst, cb);
+            PGMPhysRead(pVM, GCPhys, pvDst, cb);
             return VINF_SUCCESS;
         }
-        PGMPhysRead(pVM, GCPhys + offset, pvDst, cbRead);
+        PGMPhysRead(pVM, GCPhys, pvDst, cbRead);
 
         /* next */
@@ -2003 +2004 @@
     {
         /* Convert virtual to physical address */
-        offset = GCPtrDst & PAGE_OFFSET_MASK;
         rc = PGMPhysGCPtr2GCPhys(pVM, GCPtrDst, &GCPhys);
         AssertRCReturn(rc, rc);
@@ -2011 +2011 @@
         AssertRC(rc);
 
-        PGMPhysWrite(pVM, GCPhys + offset, pvSrc, cb);
+        PGMPhysWrite(pVM, GCPhys, pvSrc, cb);
         return VINF_SUCCESS;
     }
@@ -2021 +2021 @@
     {
         /* Convert virtual to physical address */
-        offset = GCPtrDst & PAGE_OFFSET_MASK;
         rc = PGMPhysGCPtr2GCPhys(pVM, GCPtrDst, &GCPhys);
         AssertRCReturn(rc, rc);
@@ -2033 +2032 @@
         if (cbWrite >= cb)
         {
-            PGMPhysWrite(pVM, GCPhys + offset, pvSrc, cb);
+            PGMPhysWrite(pVM, GCPhys, pvSrc, cb);
             return VINF_SUCCESS;
         }
-        PGMPhysWrite(pVM, GCPhys + offset, pvSrc, cbWrite);
+        PGMPhysWrite(pVM, GCPhys, pvSrc, cbWrite);
 
         /* next */