Changeset 15428 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 13, 2008 10:02:55 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40879

Message:

PGM: PGMDynMapHCPageOff -> pgmDynMapHCPageOff, making it internal and faster.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllPhys.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3362 +3362 @@
 #endif /* VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
 
+#if defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) || defined(IN_RC)
+/**
+ * Temporarily maps one host page specified by HC physical address, returning
+ * pointer within the page.
+ *
+ * Be WARNED that the dynamic page mapping area is small, 8 pages, thus the space is
+ * reused after 8 mappings (or perhaps a few more if you score with the cache).
+ *
+ * @returns The address corresponding to HCPhys.
+ * @param   pPGM        Pointer to the PVM instance data.
+ * @param   HCPhys      HC Physical address of the page.
+ */
+DECLINLINE(void *) pgmDynMapHCPageOff(PPGM pPGM, RTHCPHYS HCPhys)
+{
+    void *pv;
+# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+    pgmR0DynMapHCPageInlined(pPGM, HCPhys & ~(RTHCPHYS)PAGE_OFFSET_MASK, &pv);
+# else
+    PGMDynMapHCPage(PGM2VM(pPGM), HCPhys & ~(RTHCPHYS)PAGE_OFFSET_MASK, &pv);
+# endif
+    pv = (void *)((uintptr_t)pv | (HCPhys & PAGE_OFFSET_MASK));
+    return pv;
+}
+#endif /*  VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 || IN_RC */
+
+
 #ifndef IN_RC
 /**

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

@@ -1236 +1236 @@
                     {
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-                        void *pvSrc = NULL;
-                        PGMDynMapHCPageOff(pVM, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK), &pvSrc);
+                        void *pvSrc = pgmDynMapHCPageOff(&pVM->pgm.s, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK));
 #else
                         void *pvSrc = PGMRAMRANGE_GETHCPTR(pRam, off)
@@ -1284 +1283 @@
                     {
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-                        void *pvSrc = NULL;
-                        PGMDynMapHCPageOff(pVM, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK), &pvSrc);
+                        void *pvSrc = pgmDynMapHCPageOff(&pVM->pgm.s, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK));
 #else
                         void *pvSrc = PGMRAMRANGE_GETHCPTR(pRam, off)
@@ -1313 +1311 @@
                         {
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-                            void *pvSrc = NULL;
-                            PGMDynMapHCPageOff(pVM, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK), &pvSrc);
+                            void *pvSrc = pgmDynMapHCPageOff(&pVM->pgm.s, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK));
 #else
                             void *pvSrc = PGMRAMRANGE_GETHCPTR(pRam, off)
@@ -1537 +1534 @@
                         {
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-                            void *pvDst = NULL;
-                            PGMDynMapHCPageOff(pVM, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK), &pvDst);
+                            void *pvDst = pgmDynMapHCPageOff(&pVM->pgm.s, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK));
 #else
                             void *pvDst = PGMRAMRANGE_GETHCPTR(pRam, off)
@@ -1581 +1577 @@
                         {
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-                            void *pvDst = NULL;
-                            PGMDynMapHCPageOff(pVM, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK), &pvDst);
+                            void *pvDst = pgmDynMapHCPageOff(&pVM->pgm.s, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK));
 #else
                             void *pvDst = PGMRAMRANGE_GETHCPTR(pRam, off)
@@ -1625 +1620 @@
                     {
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-                        void *pvDst = NULL;
-                        PGMDynMapHCPageOff(pVM, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK), &pvDst);
+                        void *pvDst = pgmDynMapHCPageOff(&pVM->pgm.s, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK));
 #else
                         void *pvDst = PGMRAMRANGE_GETHCPTR(pRam, off)
@@ -1653 +1647 @@
                         {
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-                            void *pvDst = NULL;
-                            PGMDynMapHCPageOff(pVM, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK), &pvDst);
+                            void *pvDst = pgmDynMapHCPageOff(&pVM->pgm.s, PGM_PAGE_GET_HCPHYS(pPage) + (off & PAGE_OFFSET_MASK));
 #else
                             void *pvDst = PGMRAMRANGE_GETHCPTR(pRam, off)