Changeset 15226 in vbox

Timestamp:

Dec 10, 2008 4:25:34 AM (16 years ago)

Author:

vboxsync

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

40640

Message:

PGM: Inlined PGMDynMapHCPageOff (get rid of it perhaps?).

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)

trunk/include/VBox/pgm.h

@@ -37 +37 @@
 #include <VBox/x86.h>
 #include <VBox/hwacc_vmx.h>
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE)
+# include <iprt/err.h>
+# include <VBox/param.h>
+#endif
 
 __BEGIN_DECLS
@@ -423 +427 @@
 #define PGMPHYS_TRANSLATION_FLAG_DEFAULT           0
 /** Indicates that for monitored pages with physical handlers
- * VERR_PGM_PHYS_PAGE_RESERVED error code should be returned, 
- * so address translation routines must fallback to PGM functions for 
+ * VERR_PGM_PHYS_PAGE_RESERVED error code should be returned,
+ * so address translation routines must fallback to PGM functions for
  * access memory. */
 #define PGMPHYS_TRANSLATION_FLAG_CHECK_PHYS_MONITORED   RT_BIT_32(0)
 /** Indicates that for monitored pages with virtual handlers
- * VERR_PGM_PHYS_PAGE_RESERVED error code should be returned, 
- * so address translation routines must fallback to PGM functions for 
+ * VERR_PGM_PHYS_PAGE_RESERVED error code should be returned,
+ * so address translation routines must fallback to PGM functions for
  * access memory. */
 #define PGMPHYS_TRANSLATION_FLAG_CHECK_VIRT_MONITORED   RT_BIT_32(1)
@@ -458 +462 @@
 VMMDECL(int)        PGMDynMapGCPageOff(PVM pVM, RTGCPHYS GCPhys, void **ppv);
 VMMDECL(int)        PGMDynMapHCPage(PVM pVM, RTHCPHYS HCPhys, void **ppv);
-VMMDECL(int)        PGMDynMapHCPageOff(PVM pVM, RTHCPHYS HCPhys, void **ppv);
 VMMDECL(void)       PGMDynMapStartAutoSet(PVMCPU pVCpu);
 VMMDECL(void)       PGMDynMapReleaseAutoSet(PVMCPU pVCpu);
 VMMDECL(void)       PGMDynMapMigrateAutoSet(PVMCPU pVCpu);
+
+/**
+ * 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 VBox status.
+ * @param   pVM         VM handle.
+ * @param   HCPhys      HC Physical address of the page.
+ * @param   ppv         Where to store the address corresponding to HCPhys.
+ */
+DECLINLINE(int) PGMDynMapHCPageOff(PVM pVM, RTHCPHYS HCPhys, void **ppv)
+{
+    int rc = PGMDynMapHCPage(pVM, HCPhys & ~(RTHCPHYS)PAGE_OFFSET_MASK, ppv);
+    if (RT_SUCCESS(rc))
+        *ppv = (void *)((uintptr_t)*ppv | (HCPhys & PAGE_OFFSET_MASK));
+    return rc;
+}
 #endif
 

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

@@ -1964 +1964 @@
 # endif /* 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 VBox status.
- * @param   pVM         VM handle.
- * @param   HCPhys      HC Physical address of the page.
- * @param   ppv         Where to store the address corresponding to HCPhys.
- */
-VMMDECL(int) PGMDynMapHCPageOff(PVM pVM, RTHCPHYS HCPhys, void **ppv)
-{
-    int rc = PGMDynMapHCPage(pVM, HCPhys & ~(RTHCPHYS)PAGE_OFFSET_MASK, ppv);
-    if (RT_SUCCESS(rc))
-        *ppv = (void *)((uintptr_t)*ppv | (HCPhys & PAGE_OFFSET_MASK));
-    return rc;
-}
-
 #endif /* IN_RC || VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
 #ifdef VBOX_STRICT