Changeset 13144 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 9, 2008 10:44:11 PM (16 years ago)

Author:

vboxsync

Message:

#1865: Implmented the alternative R0 code for darwin (turned out to be all generic new-phys code). Started renaming the read/write functions: PGMPhysReadGCPtr -> PGMPhysSimpleReadGCPtr, PGMPhysWriteGCPtr -> PGMPhysSimpleWriteGCPtr, PGMPhysWriteGCPtrDirty -> PGMPhysSimpleDirtyWriteGCPtr.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (4 diffs)
• PGMAllPhys.cpp (modified) (27 diffs)
• SELMAll.cpp (modified) (1 diff)
• TRPMAll.cpp (modified) (5 diffs)

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

@@ -116 +116 @@
     PVM           pVM      = (PVM)pCpu->apvUserData[0];
 # ifdef IN_RING0
-    int rc = PGMPhysReadGCPtr(pVM, pDest, pSrc, cb);
-    AssertMsgRC(rc, ("PGMPhysReadGCPtr failed for pSrc=%VGv cb=%x\n", pSrc, cb));
+    int rc = PGMPhysSimpleReadGCPtr(pVM, pDest, pSrc, cb);
+    AssertMsgRC(rc, ("PGMPhysSimpleReadGCPtr failed for pSrc=%VGv cb=%x\n", pSrc, cb));
 # else /* IN_RING3 */
     if (!PATMIsPatchGCAddr(pVM, pSrc))
     {
-        int rc = PGMPhysReadGCPtr(pVM, pDest, pSrc, cb);
+        int rc = PGMPhysSimpleReadGCPtr(pVM, pDest, pSrc, cb);
         AssertRC(rc);
     }
@@ -2577 +2577 @@
 #endif
     default:
-        /* In X2APIC specification this range is reserved for APIC control. */ 
+        /* In X2APIC specification this range is reserved for APIC control. */
         if ((pRegFrame->ecx >= MSR_IA32_APIC_START) && (pRegFrame->ecx < MSR_IA32_APIC_END))
             rc = PDMApicReadMSR(pVM, VMMGetCpuId(pVM), pRegFrame->ecx, &val);
-        else 
+        else
             /* We should actually trigger a #GP here, but don't as that might cause more trouble. */
             val = 0;
@@ -2586 +2586 @@
     }
     Log(("EMInterpretRdmsr %s (%x) -> val=%VX64\n", emMSRtoString(pRegFrame->ecx), pRegFrame->ecx, val));
-    if (rc == VINF_SUCCESS) 
+    if (rc == VINF_SUCCESS)
     {
         pRegFrame->eax = (uint32_t) val;
@@ -2722 +2722 @@
 
     default:
-        /* In X2APIC specification this range is reserved for APIC control. */ 
+        /* In X2APIC specification this range is reserved for APIC control. */
         if ((pRegFrame->ecx >=  MSR_IA32_APIC_START) && (pRegFrame->ecx <  MSR_IA32_APIC_END))
             return PDMApicWriteMSR(pVM, VMMGetCpuId(pVM), pRegFrame->ecx, val);

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

@@ -644 +644 @@
 {
 #ifdef VBOX_WITH_NEW_PHYS_CODE
-# if defined(IN_GC) && defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+# if defined(IN_GC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+/** @todo this needs to be fixed, it really ain't right. */
     /* Until a physical TLB is implemented for GC or/and R0-darwin, let PGMDynMapGCPageEx handle it. */
     return PGMDynMapGCPageOff(pVM, GCPhys, ppv);
@@ -699 +700 @@
      */
 # if defined(IN_GC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+/** @todo @bugref{3202}: check up this path. */
     return PGMDynMapGCPageOff(pVM, GCPhys, ppv);
 # else
@@ -1717 +1719 @@
 }
 
-#ifndef IN_GC /* Ring 0 & 3 only */
+#ifndef IN_GC /* Ring 0 & 3 only. (Just not needed in GC.) */
 
 /**
@@ -1731 +1733 @@
 VMMDECL(int) PGMPhysReadGCPhys(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)
+    /*
+     * Treat the first page as a special case.
+     */
+    if (!cb)
+        return VINF_SUCCESS;
+
+    /* map the 1st page */
+    void const *pvSrc;
+    PGMPAGEMAPLOCK Lock;
+    int rc = PGMPhysGCPhys2CCPtrReadOnly(pVM, GCPhysSrc, &pvSrc, &Lock);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* optimize for the case where access is completely within the first page. */
+    size_t cbPage = PAGE_SIZE - (GCPhysSrc & PAGE_OFFSET_MASK);
+    if (RT_LIKELY(cb < cbPage))
+    {
+        memcpy(pvDst, pvSrc, cb);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        return VINF_SUCCESS;
+    }
+
+    /* copy to the end of the page. */
+    memcpy(pvDst, pvSrc, cbPage);
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
+    GCPhysSrc += cbPage;
+    pvDst = (uint8_t *)pvDst + cbPage;
+    cb -= cbPage;
+
+    /*
+     * Page by page.
+     */
+    for (;;)
+    {
+        /* map the page */
+        rc = PGMPhysGCPhys2CCPtrReadOnly(pVM, GCPhysSrc, &pvSrc, &Lock);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        /* last page? */
+        if (cb < PAGE_SIZE)
+        {
+            memcpy(pvDst, pvSrc, cb);
+            PGMPhysReleasePageMappingLock(pVM, &Lock);
+            return VINF_SUCCESS;
+        }
+
+        /* copy the entire page and advance */
+        memcpy(pvDst, pvSrc, PAGE_SIZE);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        GCPhysSrc += PAGE_SIZE;
+        pvDst = (uint8_t *)pvDst + PAGE_SIZE;
+        cb -= PAGE_SIZE;
+    }
+    /* won't ever get here. */
+
+# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE*/
+
     /*
      * Anything to be done?
@@ -1747 +1808 @@
         if (off < pRam->cb)
         {
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-            /* map hcphys and copy */
-            AssertFailedReturn(VERR_NOT_IMPLEMENTED); /** @todo @bugref{3202} */
-
-# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
             if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
             {
@@ -1796 +1852 @@
             else
                 return VERR_PGM_PHYS_PAGE_RESERVED;
-# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
         }
         else if (GCPhysSrc < pRam->GCPhysLast)
@@ -1802 +1857 @@
     }
     return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
+# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE*/
 }
 
@@ -1819 +1875 @@
 VMMDECL(int) PGMPhysWriteGCPhys(PVM pVM, RTGCPHYS GCPhysDst, const void *pvSrc, size_t cb)
 {
-    /*
-     * Anything to be done?
+# if defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) || defined(VBOX_WITH_NEW_PHYS_CODE)
+    LogFlow(("PGMPhysWriteGCPhys: %RGp %zu\n", GCPhysDst, cb));
+
+    /*
+     * Treat the first page as a special case.
      */
     if (!cb)
         return VINF_SUCCESS;
 
-    LogFlow(("PGMPhysWriteGCPhys: %VGp %d\n", GCPhysDst, cb));
+    /* map the 1st page */
+    void *pvDst;
+    PGMPAGEMAPLOCK Lock;
+    int rc = PGMPhysGCPhys2CCPtr(pVM, GCPhysDst, &pvDst, &Lock);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* optimize for the case where access is completely within the first page. */
+    size_t cbPage = PAGE_SIZE - (GCPhysDst & PAGE_OFFSET_MASK);
+    if (RT_LIKELY(cb < cbPage))
+    {
+        memcpy(pvDst, pvSrc, cb);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        return VINF_SUCCESS;
+    }
+
+    /* copy to the end of the page. */
+    memcpy(pvDst, pvSrc, cbPage);
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
+    GCPhysDst += cbPage;
+    pvSrc = (const uint8_t *)pvSrc + cbPage;
+    cb -= cbPage;
+
+    /*
+     * Page by page.
+     */
+    for (;;)
+    {
+        /* map the page */
+        rc = PGMPhysGCPhys2CCPtr(pVM, GCPhysDst, &pvDst, &Lock);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        /* last page? */
+        if (cb < PAGE_SIZE)
+        {
+            memcpy(pvDst, pvSrc, cb);
+            PGMPhysReleasePageMappingLock(pVM, &Lock);
+            return VINF_SUCCESS;
+        }
+
+        /* copy the entire page and advance */
+        memcpy(pvDst, pvSrc, PAGE_SIZE);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        GCPhysDst += PAGE_SIZE;
+        pvSrc = (const uint8_t *)pvSrc + PAGE_SIZE;
+        cb -= PAGE_SIZE;
+    }
+    /* won't ever get here. */
+
+
+# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE*/
+
+    /*
+     * Anything to be done?
+     */
+    if (!cb)
+        return VINF_SUCCESS;
+
+    LogFlow(("PGMPhysWriteGCPhys: %RGp %zu\n", GCPhysDst, cb));
 
     /*
@@ -1837 +1955 @@
         if (off < pRam->cb)
         {
-# ifdef VBOX_WITH_NEW_PHYS_CODE
-/** @todo PGMRamGCPhys2HCPtrWithRange. */
-# endif
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-            /* map hcphys and copy */
-            AssertFailedReturn(VERR_NOT_IMPLEMENTED); /** @todo @bugref{3202} */
-
-# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
             if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
             {
@@ -1889 +1999 @@
             else
                 return VERR_PGM_PHYS_PAGE_RESERVED;
-# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
         }
         else if (GCPhysDst < pRam->GCPhysLast)
@@ -1895 +2004 @@
     }
     return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
+# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE*/
 }
 
@@ -1910 +2020 @@
  * @param   cb          The number of bytes to read.
  */
-VMMDECL(int) PGMPhysReadGCPtr(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
-{
-    /*
-     * Anything to do?
+VMMDECL(int) PGMPhysSimpleReadGCPtr(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb)
+{
+# if defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) || defined(VBOX_WITH_NEW_PHYS_CODE)
+    /*
+     * Treat the first page as a special case.
      */
     if (!cb)
         return VINF_SUCCESS;
 
+    /* map the 1st page */
+    void const *pvSrc;
+    PGMPAGEMAPLOCK Lock;
+    int rc = PGMPhysGCPtr2CCPtrReadOnly(pVM, GCPtrSrc, &pvSrc, &Lock);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* optimize for the case where access is completely within the first page. */
+    size_t cbPage = PAGE_SIZE - ((RTGCUINTPTR)GCPtrSrc & PAGE_OFFSET_MASK);
+    if (RT_LIKELY(cb < cbPage))
+    {
+        memcpy(pvDst, pvSrc, cb);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        return VINF_SUCCESS;
+    }
+
+    /* copy to the end of the page. */
+    memcpy(pvDst, pvSrc, cbPage);
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
+    GCPtrSrc = (RTGCPTR)((RTGCUINTPTR)GCPtrSrc + cbPage);
+    pvDst = (uint8_t *)pvDst + cbPage;
+    cb -= cbPage;
+
+    /*
+     * Page by page.
+     */
+    for (;;)
+    {
+        /* map the page */
+        rc = PGMPhysGCPtr2CCPtrReadOnly(pVM, GCPtrSrc, &pvSrc, &Lock);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        /* last page? */
+        if (cb < PAGE_SIZE)
+        {
+            memcpy(pvDst, pvSrc, cb);
+            PGMPhysReleasePageMappingLock(pVM, &Lock);
+            return VINF_SUCCESS;
+        }
+
+        /* copy the entire page and advance */
+        memcpy(pvDst, pvSrc, PAGE_SIZE);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        GCPtrSrc = (RTGCPTR)((RTGCUINTPTR)GCPtrSrc + PAGE_SIZE);
+        pvDst = (uint8_t *)pvDst + PAGE_SIZE;
+        cb -= PAGE_SIZE;
+    }
+    /* won't ever get here. */
+
+# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE */
+
+    /*
+     * Anything to do?
+     */
+    if (!cb)
+        return VINF_SUCCESS;
+
     /*
      * Optimize reads within a single page.
@@ -1924 +2093 @@
     {
         void *pvSrc;
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        /* map hcphys and copy */
-        AssertFailedReturn(VERR_NOT_IMPLEMENTED); /** @todo @bugref{3202} */
-
-# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
         int rc = PGMPhysGCPtr2HCPtr(pVM, GCPtrSrc, &pvSrc);
         if (VBOX_FAILURE(rc))
@@ -1934 +2098 @@
         memcpy(pvDst, pvSrc, cb);
         return VINF_SUCCESS;
-# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
     }
 
@@ -1944 +2107 @@
         /* convert */
         void *pvSrc;
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        /* map hcphys and copy */
-        AssertFailedReturn(VERR_NOT_IMPLEMENTED); /** @todo @bugref{3202} */
-
-# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
         int rc = PGMPhysGCPtr2HCPtr(pVM, GCPtrSrc, &pvSrc);
         if (VBOX_FAILURE(rc))
             return rc;
-# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
 
         /* copy */
@@ -1968 +2125 @@
         GCPtrSrc   += cbRead;
     }
+# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE */
 }
 
@@ -1983 +2141 @@
  * @param   cb          The number of bytes to write.
  */
-VMMDECL(int) PGMPhysWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
-{
-    /*
-     * Anything to do?
+VMMDECL(int) PGMPhysSimpleWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
+{
+# if defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) || defined(VBOX_WITH_NEW_PHYS_CODE)
+    /*
+     * Treat the first page as a special case.
      */
     if (!cb)
         return VINF_SUCCESS;
 
-    LogFlow(("PGMPhysWriteGCPtr: %VGv %d\n", GCPtrDst, cb));
+    /* map the 1st page */
+    void *pvDst;
+    PGMPAGEMAPLOCK Lock;
+    int rc = PGMPhysGCPtr2CCPtr(pVM, GCPtrDst, &pvDst, &Lock);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* optimize for the case where access is completely within the first page. */
+    size_t cbPage = PAGE_SIZE - ((RTGCUINTPTR)GCPtrDst & PAGE_OFFSET_MASK);
+    if (RT_LIKELY(cb < cbPage))
+    {
+        memcpy(pvDst, pvSrc, cb);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        return VINF_SUCCESS;
+    }
+
+    /* copy to the end of the page. */
+    memcpy(pvDst, pvSrc, cbPage);
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
+    GCPtrDst = (RTGCPTR)((RTGCUINTPTR)GCPtrDst + cbPage);
+    pvSrc = (const uint8_t *)pvSrc + cbPage;
+    cb -= cbPage;
+
+    /*
+     * Page by page.
+     */
+    for (;;)
+    {
+        /* map the page */
+        rc = PGMPhysGCPtr2CCPtr(pVM, GCPtrDst, &pvDst, &Lock);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        /* last page? */
+        if (cb < PAGE_SIZE)
+        {
+            memcpy(pvDst, pvSrc, cb);
+            PGMPhysReleasePageMappingLock(pVM, &Lock);
+            return VINF_SUCCESS;
+        }
+
+        /* copy the entire page and advance */
+        memcpy(pvDst, pvSrc, PAGE_SIZE);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        GCPtrDst = (RTGCPTR)((RTGCUINTPTR)GCPtrDst + PAGE_SIZE);
+        pvSrc = (const uint8_t *)pvSrc + PAGE_SIZE;
+        cb -= PAGE_SIZE;
+    }
+    /* won't ever get here. */
+
+# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE */
+
+    /*
+     * Anything to do?
+     */
+    if (!cb)
+        return VINF_SUCCESS;
+
+    LogFlow(("PGMPhysSimpleWriteGCPtr: %VGv %d\n", GCPtrDst, cb));
 
     /*
@@ -1999 +2216 @@
     {
         void *pvDst;
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        /* map hcphys and copy */
-        AssertFailedReturn(VERR_NOT_IMPLEMENTED); /** @todo @bugref{3202} */
-
-# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
         int rc = PGMPhysGCPtr2HCPtr(pVM, GCPtrDst, &pvDst);
         if (VBOX_FAILURE(rc))
             return rc;
-# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
         memcpy(pvDst, pvSrc, cb);
         return VINF_SUCCESS;
@@ -2019 +2230 @@
         /* convert */
         void *pvDst;
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        /* map hcphys and copy */
-        AssertFailedReturn(VERR_NOT_IMPLEMENTED); /** @todo @bugref{3202} */
-
-# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
         int rc = PGMPhysGCPtr2HCPtr(pVM, GCPtrDst, &pvDst);
         if (VBOX_FAILURE(rc))
             return rc;
-# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
 
         /* copy */
@@ -2043 +2248 @@
         GCPtrDst   += cbWrite;
     }
-}
+# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE */
+}
+
 
 /**
@@ -2057 +2264 @@
  * @param   cb          The number of bytes to read.
  */
-/** @todo use the PGMPhysReadGCPtr name and rename the unsafe one to something appropriate */
+/** @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)
 {
@@ -2190 +2397 @@
 }
 
+
 /**
  * Write to guest physical memory referenced by GC pointer and update the PTE.
  *
  * This function uses the current CR3/CR0/CR4 of the guest and will
- * bypass access handlers and set any dirty and accessed bits in the PTE.
- *
- * If you don't want to set the dirty bit, use PGMPhysWriteGCPtr().
+ * bypass access handlers but will set any dirty and accessed bits in the PTE.
+ *
+ * If you don't want to set the dirty bit, use PGMPhysSimpleWriteGCPtr().
  *
  * @returns VBox status.
@@ -2204 +2412 @@
  * @param   cb          The number of bytes to write.
  */
-VMMDECL(int) PGMPhysWriteGCPtrDirty(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
-{
+VMMDECL(int) PGMPhysSimpleDirtyWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb)
+{
+# if defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) || defined(VBOX_WITH_NEW_PHYS_CODE)
+    /*
+     * Treat the first page as a special case.
+     * Btw. this is the same code as in PGMPhyssimpleWriteGCPtr excep for the PGMGstModifyPage.
+     */
+    if (!cb)
+        return VINF_SUCCESS;
+
+    /* map the 1st page */
+    void *pvDst;
+    PGMPAGEMAPLOCK Lock;
+    int rc = PGMPhysGCPtr2CCPtr(pVM, GCPtrDst, &pvDst, &Lock);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* optimize for the case where access is completely within the first page. */
+    size_t cbPage = PAGE_SIZE - ((RTGCUINTPTR)GCPtrDst & PAGE_OFFSET_MASK);
+    if (RT_LIKELY(cb < cbPage))
+    {
+        memcpy(pvDst, pvSrc, cb);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        rc = PGMGstModifyPage(pVM, GCPtrDst, 1, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D)); AssertRC(rc);
+        return VINF_SUCCESS;
+    }
+
+    /* copy to the end of the page. */
+    memcpy(pvDst, pvSrc, cbPage);
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
+    rc = PGMGstModifyPage(pVM, GCPtrDst, 1, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D)); AssertRC(rc);
+    GCPtrDst = (RTGCPTR)((RTGCUINTPTR)GCPtrDst + cbPage);
+    pvSrc = (const uint8_t *)pvSrc + cbPage;
+    cb -= cbPage;
+
+    /*
+     * Page by page.
+     */
+    for (;;)
+    {
+        /* map the page */
+        rc = PGMPhysGCPtr2CCPtr(pVM, GCPtrDst, &pvDst, &Lock);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        /* last page? */
+        if (cb < PAGE_SIZE)
+        {
+            memcpy(pvDst, pvSrc, cb);
+            PGMPhysReleasePageMappingLock(pVM, &Lock);
+            rc = PGMGstModifyPage(pVM, GCPtrDst, 1, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D)); AssertRC(rc);
+            return VINF_SUCCESS;
+        }
+
+        /* copy the entire page and advance */
+        memcpy(pvDst, pvSrc, PAGE_SIZE);
+        PGMPhysReleasePageMappingLock(pVM, &Lock);
+        rc = PGMGstModifyPage(pVM, GCPtrDst, 1, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D)); AssertRC(rc);
+        GCPtrDst = (RTGCPTR)((RTGCUINTPTR)GCPtrDst + PAGE_SIZE);
+        pvSrc = (const uint8_t *)pvSrc + PAGE_SIZE;
+        cb -= PAGE_SIZE;
+    }
+    /* won't ever get here. */
+
+# else  /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE */
+
     /*
      * Anything to do?
@@ -2256 +2528 @@
         pvSrc       = (char *)pvSrc + cbWrite;
     }
+# endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 && !VBOX_WITH_NEW_PHYS_CODE */
 }
 
@@ -2323 +2596 @@
                 case VERR_PGM_PHYS_PAGE_RESERVED:
                 case VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS:
-                    memset(pvDst, 0, cb);
+                    memset(pvDst, 0, cb); /** @todo this is wrong, it should be 0xff */
                     break;
                 default:
@@ -2363 +2636 @@
                     break;
                 case VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS:
-                    memset(pvDst, 0, cb1);
+                    memset(pvDst, 0, cb1); /** @todo this is wrong, it should be 0xff */
                     break;
                 default:
@@ -2377 +2650 @@
                     break;
                 case VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS:
-                    memset((uint8_t *)pvDst + cb1, 0, cb2);
+                    memset((uint8_t *)pvDst + cb1, 0, cb2);  /** @todo this is wrong, it should be 0xff */
                     break;
                 default:

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

@@ -1008 +1008 @@
 #else /* !IN_GC */
         /* Reading too much. Could be cheaper than two seperate calls though. */
-        rc = PGMPhysReadGCPtr(pVM, &tss, GCPtrTss, sizeof(VBOXTSS));
+        rc = PGMPhysSimpleReadGCPtr(pVM, &tss, GCPtrTss, sizeof(VBOXTSS));
         if (VBOX_FAILURE(rc))
         {

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

@@ -382 +382 @@
             rc = MMGCRamRead(pVM, &pCallerGC, (void *)pRegFrame->esp, sizeof(pCallerGC));
 #else
-            rc = PGMPhysReadGCPtr(pVM, &pCallerGC, (RTGCPTR)pRegFrame->esp, sizeof(pCallerGC));
+            rc = PGMPhysSimpleReadGCPtr(pVM, &pCallerGC, (RTGCPTR)pRegFrame->esp, sizeof(pCallerGC));
 #endif
             if (VBOX_SUCCESS(rc))
@@ -451 +451 @@
         rc = MMGCRamRead(pVM, &GuestIdte, (void *)pIDTEntry, sizeof(GuestIdte));
 #else
-        rc = PGMPhysReadGCPtr(pVM, &GuestIdte, pIDTEntry, sizeof(GuestIdte));
+        rc = PGMPhysSimpleReadGCPtr(pVM, &GuestIdte, pIDTEntry, sizeof(GuestIdte));
 #endif
         if (VBOX_FAILURE(rc))
@@ -466 +466 @@
             rc = MMGCRamRead(pVM, &GuestIdte, (void *)pIDTEntry, sizeof(GuestIdte));
 #else
-            rc = PGMPhysReadGCPtr(pVM, &GuestIdte, pIDTEntry, sizeof(GuestIdte));
+            rc = PGMPhysSimpleReadGCPtr(pVM, &GuestIdte, pIDTEntry, sizeof(GuestIdte));
 #endif
         }
@@ -511 +511 @@
                 rc = MMGCRamRead(pVM, &Desc, (void *)pGdtEntry, sizeof(Desc));
 #else
-                rc = PGMPhysReadGCPtr(pVM, &Desc, pGdtEntry, sizeof(Desc));
+                rc = PGMPhysSimpleReadGCPtr(pVM, &Desc, pGdtEntry, sizeof(Desc));
 #endif
                 if (VBOX_FAILURE(rc))
@@ -526 +526 @@
                     rc = MMGCRamRead(pVM, &Desc, (void *)pGdtEntry, sizeof(Desc));
 #else
-                    rc = PGMPhysReadGCPtr(pVM, &Desc, pGdtEntry, sizeof(Desc));
+                    rc = PGMPhysSimpleReadGCPtr(pVM, &Desc, pGdtEntry, sizeof(Desc));
 #endif
                     if (VBOX_FAILURE(rc))