Changeset 18949 in vbox

Timestamp:

Apr 16, 2009 2:19:02 PM (16 years ago)

Author:

vboxsync

Message:

Bug fix

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (6 diffs)
• VMMAll/PGMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1844 +1844 @@
  */
 #if defined(IN_RC)
-# define PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPage)  pgmPoolMapPageInlined((pPGM), (pPage))
+# define PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPage)  pgmPoolMapPageInlined(pPGM, (pPage))
 #elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-# define PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPage)  pgmPoolMapPageInlined((pPGM), (pPage))
+# define PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPage)  pgmPoolMapPageInlined(pPGM, (pPage))
 #else
 # define PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPage)  PGMPOOL_PAGE_2_PTR(PGM2VM(pPGM), pPage)
+#endif
+
+/** @def PGMPOOL_PAGE_2_PTR_BY_PGMCPU
+ * Maps a pool page pool into the current context.
+ *
+ * @returns VBox status code.
+ * @param   pPGM    Pointer to the PGMCPU instance data.
+ * @param   pPage   The pool page.
+ *
+ * @remark  In RC this uses PGMGCDynMapHCPage(), so it will consume of the
+ *          small page window employeed by that function. Be careful.
+ * @remark  There is no need to assert on the result.
+ */
+#if defined(IN_RC)
+# define PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pPage)  pgmPoolMapPageInlined(PGMCPU2PGM(pPGM), (pPage))
+#elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+# define PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pPage)  pgmPoolMapPageInlined(PGMCPU2PGM(pPGM), (pPage))
+#else
+# define PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pPage)  PGMPOOL_PAGE_2_PTR(PGMCPU2VM(pPGM), pPage)
 #endif
 
@@ -3935 +3954 @@
 DECLINLINE(PX86PD) pgmShwGet32BitPDPtr(PPGMCPU pPGM)
 {
-    return (PX86PD)PGMPOOL_PAGE_2_PTR_BY_PGM(PGMCPU2PGM(pPGM), pPGM->CTX_SUFF(pShwPageCR3));
+    return (PX86PD)PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pPGM->CTX_SUFF(pShwPageCR3));
 }
 
@@ -3986 +4005 @@
 DECLINLINE(PX86PDPT) pgmShwGetPaePDPTPtr(PPGMCPU pPGM)
 {
-    return (PX86PDPT)PGMPOOL_PAGE_2_PTR_BY_PGM(PGMCPU2PGM(pPGM), pPGM->CTX_SUFF(pShwPageCR3));
+    return (PX86PDPT)PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pPGM->CTX_SUFF(pShwPageCR3));
 }
 
@@ -4009 +4028 @@
     AssertReturn(pShwPde, NULL);
 
-    return (PX86PDPAE)PGMPOOL_PAGE_2_PTR_BY_PGM(PGMCPU2PGM(pPGM), pShwPde);
+    return (PX86PDPAE)PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pShwPde);
 }
 
@@ -4031 +4050 @@
     AssertReturn(pShwPde, NULL);
 
-    return (PX86PDPAE)PGMPOOL_PAGE_2_PTR_BY_PGM(PGMCPU2PGM(pPGM), pShwPde);
+    return (PX86PDPAE)PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pShwPde);
 }
 
@@ -4082 +4101 @@
 DECLINLINE(PX86PML4) pgmShwGetLongModePML4Ptr(PPGMCPU pPGM)
 {
-    return (PX86PML4)PGMPOOL_PAGE_2_PTR_BY_PGM(PGMCPU2PGM(pPGM), pPGM->CTX_SUFF(pShwPageCR3));
+    return (PX86PML4)PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pPGM->CTX_SUFF(pShwPageCR3));
 }
 

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

@@ -1186 +1186 @@
     Assert(HWACCMIsNestedPagingActive(pVM));
 
-    pPml4 = (PEPTPML4)PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPGM->CTX_SUFF(pShwPageCR3));
+    pPml4 = (PEPTPML4)PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pPGM->CTX_SUFF(pShwPageCR3));
     Assert(pPml4);