Changeset 4417 in vbox for trunk/src

Timestamp:

Aug 29, 2007 9:12:42 AM (17 years ago)

Author:

vboxsync

Message:

Forgot to convert addresses

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (6 diffs)

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

@@ -1564 +1564 @@
 PGMDECL(int) PGMPhysReadGCPtrSafe(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
 {
+    RTGCPHYS    GCPhys;
+    RTGCUINTPTR offset;
+    int         rc;
+
     /*
      * Anything to do?
@@ -1577 +1581 @@
     if (((RTGCUINTPTR)GCPtrSrc & PAGE_OFFSET_MASK) + cb <= PAGE_SIZE)
     {
+        /* Convert virtual to physical address */
+        offset = GCPtrSrc & PAGE_OFFSET_MASK;
+        rc = PGMPhysGCPtr2GCPhys(pVM, GCPtrSrc, &GCPhys);
+        AssertRCReturn(rc, rc);
+
+        /* mark the guest page as accessed. */
+        rc = PGMGstModifyPage(pVM, GCPtrSrc, 1, X86_PTE_A, ~(uint64_t)(X86_PTE_A));
+        AssertRC(rc);
+
+        PGMPhysRead(pVM, GCPhys + offset, pvDst, cb);
+        return VINF_SUCCESS;
+    }
+
+    /*
+     * Page by page.
+     */
+    for (;;)
+    {
+        /* Convert virtual to physical address */
+        offset = GCPtrSrc & PAGE_OFFSET_MASK;
+        rc = PGMPhysGCPtr2GCPhys(pVM, GCPtrSrc, &GCPhys);
+        AssertRCReturn(rc, rc);
+
         /* mark the guest page as accessed. */
         int rc = PGMGstModifyPage(pVM, GCPtrSrc, 1, X86_PTE_A, ~(uint64_t)(X86_PTE_A));
         AssertRC(rc);
 
-        PGMPhysRead(pVM, GCPtrSrc, pvDst, cb);
-        return VINF_SUCCESS;
-    }
-
-    /*
-     * Page by page.
-     */
-    for (;;)
-    {
-        /* mark the guest page as accessed. */
-        int rc = PGMGstModifyPage(pVM, GCPtrSrc, 1, X86_PTE_A, ~(uint64_t)(X86_PTE_A));
-        AssertRC(rc);
-
         /* copy */
         size_t cbRead = PAGE_SIZE - ((RTGCUINTPTR)GCPtrSrc & PAGE_OFFSET_MASK);
         if (cbRead >= cb)
         {
-            PGMPhysRead(pVM, GCPtrSrc, pvDst, cb);
+            PGMPhysRead(pVM, GCPhys + offset, pvDst, cb);
             return VINF_SUCCESS;
         }
-        PGMPhysRead(pVM, GCPtrSrc, pvDst, cbRead);
+        PGMPhysRead(pVM, GCPhys + offset, pvDst, cbRead);
 
         /* next */
@@ -1626 +1640 @@
 PGMDECL(int) PGMPhysWriteGCPtrSafe(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
 {
+    RTGCPHYS    GCPhys;
+    RTGCUINTPTR offset;
+    int         rc;
+
     /*
      * Anything to do?
@@ -1639 +1657 @@
     if (((RTGCUINTPTR)GCPtrDst & PAGE_OFFSET_MASK) + cb <= PAGE_SIZE)
     {
+        /* Convert virtual to physical address */
+        offset = GCPtrDst & PAGE_OFFSET_MASK;
+        rc = PGMPhysGCPtr2GCPhys(pVM, GCPtrDst, &GCPhys);
+        AssertRCReturn(rc, rc);
+
         /* mark the guest page as accessed and dirty. */
-        int rc = PGMGstModifyPage(pVM, GCPtrDst, 1, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D));
+        rc = PGMGstModifyPage(pVM, GCPtrDst, 1, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D));
         AssertRC(rc);
 
-        PGMPhysWrite(pVM, GCPtrDst, pvSrc, cb);
+        PGMPhysWrite(pVM, GCPhys + offset, pvSrc, cb);
         return VINF_SUCCESS;
     }
@@ -1652 +1675 @@
     for (;;)
     {
+        /* Convert virtual to physical address */
+        offset = GCPtrDst & PAGE_OFFSET_MASK;
+        rc = PGMPhysGCPtr2GCPhys(pVM, GCPtrDst, &GCPhys);
+        AssertRCReturn(rc, rc);
+
         /* mark the guest page as accessed and dirty. */
-        int rc = PGMGstModifyPage(pVM, GCPtrDst, 1, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D));
+        rc = PGMGstModifyPage(pVM, GCPtrDst, 1, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D));
         AssertRC(rc);
 
@@ -1660 +1688 @@
         if (cbWrite >= cb)
         {
-            PGMPhysWrite(pVM, GCPtrDst, pvSrc, cb);
+            PGMPhysWrite(pVM, GCPhys + offset, pvSrc, cb);
             return VINF_SUCCESS;
         }
-        PGMPhysWrite(pVM, GCPtrDst, pvSrc, cbWrite);
+        PGMPhysWrite(pVM, GCPhys + offset, pvSrc, cbWrite);
 
         /* next */