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

Timestamp:

Dec 13, 2008 8:56:44 AM (16 years ago)

Author:

vboxsync

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

40873

Message:

PGM: pgmR0DynMapHCPageInlined won't fail.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (11 diffs)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1821 +1821 @@
 
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-DECLINLINE(void *) pgmPoolMapPageInlined(PVM pVM, PPGMPOOLPAGE pPage, int iLine, const char *pszFile);
+DECLINLINE(void *) pgmPoolMapPageInlined(PVM pVM, PPGMPOOLPAGE pPage);
 #endif
 
@@ -1836 +1836 @@
  */
 #if defined(IN_RC)
-# define PGMPOOL_PAGE_2_PTR(pVM, pPage)  pgmPoolMapPageInlined(&(pVM)->pgm.s, (pPage), __LINE__, 0)
+# define PGMPOOL_PAGE_2_PTR(pVM, pPage)  pgmPoolMapPageInlined(&(pVM)->pgm.s, (pPage))
 #elif defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-# define PGMPOOL_PAGE_2_PTR(pVM, pPage)  pgmPoolMapPageInlined(&(pVM)->pgm.s, (pPage), __LINE__, __PRETTY_FUNCTION__)
+# define PGMPOOL_PAGE_2_PTR(pVM, pPage)  pgmPoolMapPageInlined(&(pVM)->pgm.s, (pPage))
 #elif defined(VBOX_STRICT)
 # define PGMPOOL_PAGE_2_PTR(pVM, pPage)  pgmPoolMapPageStrict(pPage)
@@ -1862 +1862 @@
  */
 #if defined(IN_RC)
-# define PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPage)  pgmPoolMapPageInlined((pPGM), (pPage), __LINE__, 0)
+# 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), __LINE__, __PRETTY_FUNCTION__)
+# 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)
@@ -3274 +3274 @@
  * optimizes access to pages already in the set.
  *
- * @returns See pgmR0DynMapHCPageCommon.
+ * @returns VINF_SUCCESS. Will bail out to ring-3 on failure.
  * @param   pPGM        Pointer to the PVM instance data.
  * @param   HCPhys      The physical address of the page.
@@ -3285 +3285 @@
     Assert(!(HCPhys & PAGE_OFFSET_MASK));
     Assert(pSet->cEntries <= RT_ELEMENTS(pSet->aEntries));
-    int         rc;
 
     unsigned    iHash   = PGMMAPSET_HASH(HCPhys);
@@ -3294 +3293 @@
         *ppv = pSet->aEntries[iEntry].pvPage;
         STAM_COUNTER_INC(&pPGM->StatR0DynMapHCPageInlHits);
-        rc = VINF_SUCCESS;
     }
     else
     {
         STAM_COUNTER_INC(&pPGM->StatR0DynMapHCPageInlMisses);
-        rc = pgmR0DynMapHCPageCommon(PGM2VM(pPGM), pSet, HCPhys, ppv);
+        pgmR0DynMapHCPageCommon(PGM2VM(pPGM), pSet, HCPhys, ppv);
     }
 
     STAM_PROFILE_STOP(&pPGM->StatR0DynMapHCPageInl, a);
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -3311 +3309 @@
  * access to pages already in the set.
  *
- * @returns See pgmR0DynMapHCPageCommon.
+ * @returns See PGMDynMapGCPage.
  * @param   pPGM        Pointer to the PVM instance data.
  * @param   HCPhys      The physical address of the page.
@@ -3343 +3341 @@
     Assert(!(HCPhys & PAGE_OFFSET_MASK));
     Assert(pSet->cEntries <= RT_ELEMENTS(pSet->aEntries));
-    int         rc;
 
     unsigned    iHash   = PGMMAPSET_HASH(HCPhys);
@@ -3352 +3349 @@
         *ppv = pSet->aEntries[iEntry].pvPage;
         STAM_COUNTER_INC(&pPGM->StatR0DynMapGCPageInlHits);
-        rc = VINF_SUCCESS;
     }
     else
     {
         STAM_COUNTER_INC(&pPGM->StatR0DynMapGCPageInlMisses);
-        rc = pgmR0DynMapHCPageCommon(PGM2VM(pPGM), pSet, HCPhys, ppv);
+        pgmR0DynMapHCPageCommon(PGM2VM(pPGM), pSet, HCPhys, ppv);
     }
 
     STAM_PROFILE_STOP(&pPGM->StatR0DynMapGCPageInl, a);
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -4631 +4627 @@
  * @param   pPage       The page.
  */
-DECLINLINE(void *) pgmPoolMapPageInlined(PPGM pPGM, PPGMPOOLPAGE pPage, int iLine, const char *pszFile)
+DECLINLINE(void *) pgmPoolMapPageInlined(PPGM pPGM, PPGMPOOLPAGE pPage)
 {
     if (pPage->idx >= PGMPOOL_IDX_FIRST)
@@ -4638 +4634 @@
         void *pv;
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        int rc = pgmR0DynMapHCPageInlined(pPGM, pPage->Core.Key, &pv);
+        pgmR0DynMapHCPageInlined(pPGM, pPage->Core.Key, &pv);
 # else
         int rc = PGMDynMapHCPage(PGM2VM(pPGM), pPage->Core.Key, &pv);
+        if (RT_SUCCESS(rc))
 # endif
-        if (RT_SUCCESS(rc))
             return pv;
-        AssertMsgFailed(("%Rrc: %s(%d)\n", rc, pszFile, iLine));
     }
     return pgmPoolMapPageFallback(pPGM, pPage);

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

@@ -159 +159 @@
 
     void *pv;
-    int rc = pgmR0DynMapHCPageInlined(pPGM, HCPhys, &pv);
-    AssertReleaseRCReturn(rc, NULL);
+    pgmR0DynMapHCPageInlined(pPGM, HCPhys, &pv);
     return pv;
 # endif /* VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */