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

Timestamp:

Jun 12, 2011 7:28:11 PM (14 years ago)

Author:

vboxsync

Message:

IOM: Moved the inline functions out of IOMInternal.h and into IOMInline.h.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAll.cpp (modified) (9 diffs)
• VMMAll/IOMAllMMIO.cpp (modified) (15 diffs)
• VMMR3/IOM.cpp (modified) (4 diffs)
• include/IOMInline.h (added)
• include/IOMInternal.h (modified) (1 diff)

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

@@ -37 +37 @@
 #include <VBox/log.h>
 #include <iprt/assert.h>
+#include "IOMInline.h"
 
 
@@ -292 +293 @@
         ||   (unsigned)Port - (unsigned)pRange->Port >= (unsigned)pRange->cPorts)
     {
-        pRange = iomIOPortGetRange(&pVM->iom.s, Port);
+        pRange = iomIOPortGetRange(pVM, Port);
         if (pRange)
             pVM->iom.s.CTX_SUFF(pRangeLastRead) = pRange;
@@ -387 +388 @@
      * Handler in ring-3?
      */
-    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(&pVM->iom.s, Port);
+    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(pVM, Port);
     if (pRangeR3)
     {
@@ -488 +489 @@
         ||   (unsigned)Port - (unsigned)pRange->Port >= (unsigned)pRange->cPorts)
     {
-        pRange = iomIOPortGetRange(&pVM->iom.s, Port);
+        pRange = iomIOPortGetRange(pVM, Port);
         if (pRange)
             pVM->iom.s.CTX_SUFF(pRangeLastRead) = pRange;
@@ -569 +570 @@
      * Handler in ring-3?
      */
-    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(&pVM->iom.s, Port);
+    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(pVM, Port);
     if (pRangeR3)
     {
@@ -658 +659 @@
         ||   (unsigned)Port - (unsigned)pRange->Port >= (unsigned)pRange->cPorts)
     {
-        pRange = iomIOPortGetRange(&pVM->iom.s, Port);
+        pRange = iomIOPortGetRange(pVM, Port);
         if (pRange)
             pVM->iom.s.CTX_SUFF(pRangeLastWrite) = pRange;
@@ -738 +739 @@
      * Handler in ring-3?
      */
-    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(&pVM->iom.s, Port);
+    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(pVM, Port);
     if (pRangeR3)
     {
@@ -828 +829 @@
         ||   (unsigned)Port - (unsigned)pRange->Port >= (unsigned)pRange->cPorts)
     {
-        pRange = iomIOPortGetRange(&pVM->iom.s, Port);
+        pRange = iomIOPortGetRange(pVM, Port);
         if (pRange)
             pVM->iom.s.CTX_SUFF(pRangeLastWrite) = pRange;
@@ -909 +910 @@
      * Handler in ring-3?
      */
-    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(&pVM->iom.s, Port);
+    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(pVM, Port);
     if (pRangeR3)
     {

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

@@ -36 +36 @@
 #include <VBox/vmm/vmm.h>
 #include <VBox/vmm/hwaccm.h>
+#include "IOMInline.h"
 
 #include <VBox/dis.h>
@@ -81 +82 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-    PIOMMMIOSTATS pStats = iomMMIOGetStats(&pVM->iom.s, GCPhysFault, pRange);
+    PIOMMMIOSTATS pStats = iomMMIOGetStats(pVM, GCPhysFault, pRange);
     Assert(pStats);
 #endif
@@ -103 +104 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-    PIOMMMIOSTATS pStats = iomMMIOGetStats(&pVM->iom.s, GCPhys, pRange);
+    PIOMMMIOSTATS pStats = iomMMIOGetStats(pVM, GCPhys, pRange);
     Assert(pStats);
 #endif
@@ -455 +456 @@
         PhysDst |= (RTGCUINTPTR)pu8Virt & PAGE_OFFSET_MASK;
         if (    RT_SUCCESS(rc)
-            &&  (pMMIODst = iomMMIOGetRange(&pVM->iom.s, PhysDst)))
+            &&  (pMMIODst = iomMMIOGetRange(pVM, PhysDst)))
         {
             /** @todo implement per-device locks for MMIO access. */
@@ -1076 +1077 @@
     PIOMMMIORANGE pRange = (PIOMMMIORANGE)pvUser;
     Assert(pRange);
-    Assert(pRange == iomMMIOGetRange(&pVM->iom.s, GCPhysFault));
+    Assert(pRange == iomMMIOGetRange(pVM, GCPhysFault));
     /** @todo implement per-device locks for MMIO access. It can replace the IOM
      *        lock for most of the code, provided that we retake the lock while
@@ -1087 +1088 @@
      * Locate the statistics, if > PAGE_SIZE we'll use the first byte for everything.
      */
-    PIOMMMIOSTATS pStats = iomMMIOGetStats(&pVM->iom.s, GCPhysFault, pRange);
+    PIOMMMIOSTATS pStats = iomMMIOGetStats(pVM, GCPhysFault, pRange);
     if (!pStats)
     {
@@ -1309 +1310 @@
         return VINF_IOM_HC_MMIO_READ_WRITE;
 #endif
-    VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, (uint32_t)uErrorCode, pCtxCore, GCPhysFault, iomMMIOGetRange(&pVM->iom.s, GCPhysFault));
+    VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, (uint32_t)uErrorCode, pCtxCore, GCPhysFault, iomMMIOGetRange(pVM, GCPhysFault));
     iomUnlock(pVM);
     return VBOXSTRICTRC_VAL(rcStrict);
@@ -1340 +1341 @@
 
     Assert(pRange);
-    Assert(pRange == iomMMIOGetRange(&pVM->iom.s, GCPhysFault));
+    Assert(pRange == iomMMIOGetRange(pVM, GCPhysFault));
     /** @todo implement per-device locks for MMIO access. It can replace the IOM
      *        lock for most of the code, provided that we retake the lock while
@@ -1384 +1385 @@
      * Lookup the current context range node and statistics.
      */
-    PIOMMMIORANGE pRange = iomMMIOGetRange(&pVM->iom.s, GCPhys);
+    PIOMMMIORANGE pRange = iomMMIOGetRange(pVM, GCPhys);
     AssertMsg(pRange, ("Handlers and page tables are out of sync or something! GCPhys=%RGp cbValue=%d\n", GCPhys, cbValue));
     if (!pRange)
@@ -1394 +1395 @@
     Assert(!pRange->CTX_SUFF(pDevIns) || !pRange->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSect));
 #ifdef VBOX_WITH_STATISTICS
-    PIOMMMIOSTATS pStats = iomMMIOGetStats(&pVM->iom.s, GCPhys, pRange);
+    PIOMMMIOSTATS pStats = iomMMIOGetStats(pVM, GCPhys, pRange);
     if (!pStats)
     {
@@ -1513 +1514 @@
      * Lookup the current context range node.
      */
-    PIOMMMIORANGE pRange = iomMMIOGetRange(&pVM->iom.s, GCPhys);
+    PIOMMMIORANGE pRange = iomMMIOGetRange(pVM, GCPhys);
     AssertMsg(pRange, ("Handlers and page tables are out of sync or something! GCPhys=%RGp cbValue=%d\n", GCPhys, cbValue));
     if (!pRange)
@@ -1523 +1524 @@
     Assert(!pRange->CTX_SUFF(pDevIns) || !pRange->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSect));
 #ifdef VBOX_WITH_STATISTICS
-    PIOMMMIOSTATS pStats = iomMMIOGetStats(&pVM->iom.s, GCPhys, pRange);
+    PIOMMMIOSTATS pStats = iomMMIOGetStats(pVM, GCPhys, pRange);
     if (!pStats)
     {
@@ -1934 +1935 @@
      * Lookup the context range node the page belongs to.
      */
-    PIOMMMIORANGE pRange = iomMMIOGetRange(&pVM->iom.s, GCPhys);
+    PIOMMMIORANGE pRange = iomMMIOGetRange(pVM, GCPhys);
     AssertMsgReturn(pRange,
                     ("Handlers and page tables are out of sync or something! GCPhys=%RGp\n", GCPhys), VERR_IOM_MMIO_RANGE_NOT_FOUND);
@@ -1998 +1999 @@
 #ifdef VBOX_STRICT
     /* Can't lock IOM here due to potential deadlocks in the VGA device; not safe to access. */
-    PIOMMMIORANGE pRange = iomMMIOGetRangeUnsafe(&pVM->iom.s, GCPhys);
+    PIOMMMIORANGE pRange = iomMMIOGetRangeUnsafe(pVM, GCPhys);
     AssertMsgReturn(pRange,
             ("Handlers and page tables are out of sync or something! GCPhys=%RGp\n", GCPhys), VERR_IOM_MMIO_RANGE_NOT_FOUND);
@@ -2051 +2052 @@
 #ifdef VBOX_STRICT
     /* Can't lock IOM here due to potential deadlocks in the VGA device; not safe to access. */
-    PIOMMMIORANGE pRange = iomMMIOGetRangeUnsafe(&pVM->iom.s, GCPhys);
+    PIOMMMIORANGE pRange = iomMMIOGetRangeUnsafe(pVM, GCPhys);
     AssertMsgReturn(pRange,
             ("Handlers and page tables are out of sync or something! GCPhys=%RGp\n", GCPhys), VERR_IOM_MMIO_RANGE_NOT_FOUND);

trunk/src/VBox/VMM/VMMR3/IOM.cpp

@@ -112 +112 @@
 #include <VBox/log.h>
 #include <VBox/err.h>
+
+#include "IOMInline.h"
 
 
@@ -1538 +1540 @@
      */
     iomLock(pVM);
-    PIOMMMIORANGE pRange = iomMMIOGetRange(&pVM->iom.s, GCPhysStart);
+    PIOMMMIORANGE pRange = iomMMIOGetRange(pVM, GCPhysStart);
     AssertReturnStmt(pRange, iomUnlock(pVM), VERR_IOM_MMIO_RANGE_NOT_FOUND);
     AssertReturnStmt(pRange->pDevInsR3 == pDevIns, iomUnlock(pVM), VERR_IOM_NOT_MMIO_RANGE_OWNER);
@@ -1594 +1596 @@
      */
     iomLock(pVM);
-    PIOMMMIORANGE pRange = iomMMIOGetRange(&pVM->iom.s, GCPhysStart);
+    PIOMMMIORANGE pRange = iomMMIOGetRange(pVM, GCPhysStart);
     AssertReturnStmt(pRange, iomUnlock(pVM), VERR_IOM_MMIO_RANGE_NOT_FOUND);
     AssertReturnStmt(pRange->pDevInsR3 == pDevIns, iomUnlock(pVM), VERR_IOM_NOT_MMIO_RANGE_OWNER);
@@ -1648 +1650 @@
     while (GCPhys <= GCPhysLast && GCPhys >= GCPhysStart)
     {
-        PIOMMMIORANGE pRange = iomMMIOGetRange(&pVM->iom.s, GCPhys);
+        PIOMMMIORANGE pRange = iomMMIOGetRange(pVM, GCPhys);
         if (!pRange)
         {

trunk/src/VBox/VMM/include/IOMInternal.h

@@ -428 +428 @@
 #endif
 
-
-/**
- * Gets the I/O port range for the specified I/O port in the current context.
- *
- * @returns Pointer to I/O port range.
- * @returns NULL if no port registered.
- *
- * @param   pIOM    IOM instance data.
- * @param   Port    Port to lookup.
- */
-DECLINLINE(CTX_SUFF(PIOMIOPORTRANGE)) iomIOPortGetRange(PIOM pIOM, RTIOPORT Port)
-{
-#ifdef IN_RING3
-    if (PDMCritSectIsInitialized(&pIOM->EmtLock))
-#endif
-        Assert(IOMIsLockOwner(IOM2VM(pIOM)));
-    CTX_SUFF(PIOMIOPORTRANGE) pRange = (CTX_SUFF(PIOMIOPORTRANGE))RTAvlroIOPortRangeGet(&pIOM->CTX_SUFF(pTrees)->CTX_SUFF(IOPortTree), Port);
-    return pRange;
-}
-
-
-/**
- * Gets the I/O port range for the specified I/O port in the HC.
- *
- * @returns Pointer to I/O port range.
- * @returns NULL if no port registered.
- *
- * @param   pIOM    IOM instance data.
- * @param   Port    Port to lookup.
- */
-DECLINLINE(PIOMIOPORTRANGER3) iomIOPortGetRangeR3(PIOM pIOM, RTIOPORT Port)
-{
-#ifdef IN_RING3
-    if (PDMCritSectIsInitialized(&pIOM->EmtLock))
-#endif
-        Assert(IOMIsLockOwner(IOM2VM(pIOM)));
-    PIOMIOPORTRANGER3 pRange = (PIOMIOPORTRANGER3)RTAvlroIOPortRangeGet(&pIOM->CTX_SUFF(pTrees)->IOPortTreeR3, Port);
-    return pRange;
-}
-
-
-/**
- * Gets the MMIO range for the specified physical address in the current context.
- *
- * @returns Pointer to MMIO range.
- * @returns NULL if address not in a MMIO range.
- *
- * @param   pIOM    IOM instance data.
- * @param   GCPhys  Physical address to lookup.
- */
-DECLINLINE(PIOMMMIORANGE) iomMMIOGetRange(PIOM pIOM, RTGCPHYS GCPhys)
-{
-#ifdef IN_RING3
-    if (PDMCritSectIsInitialized(&pIOM->EmtLock))
-#endif
-        Assert(IOMIsLockOwner(IOM2VM(pIOM)));
-    PIOMMMIORANGE pRange = pIOM->CTX_SUFF(pMMIORangeLast);
-    if (    !pRange
-        ||  GCPhys - pRange->GCPhys >= pRange->cb)
-        pIOM->CTX_SUFF(pMMIORangeLast) = pRange = (PIOMMMIORANGE)RTAvlroGCPhysRangeGet(&pIOM->CTX_SUFF(pTrees)->MMIOTree, GCPhys);
-    return pRange;
-}
-
-#ifdef VBOX_STRICT
-/**
- * Gets the MMIO range for the specified physical address in the current context.
- *
- * @returns Pointer to MMIO range.
- * @returns NULL if address not in a MMIO range.
- *
- * @param   pIOM    IOM instance data.
- * @param   GCPhys  Physical address to lookup.
- */
-DECLINLINE(PIOMMMIORANGE) iomMMIOGetRangeUnsafe(PIOM pIOM, RTGCPHYS GCPhys)
-{
-    PIOMMMIORANGE pRange = pIOM->CTX_SUFF(pMMIORangeLast);
-    if (    !pRange
-        ||  GCPhys - pRange->GCPhys >= pRange->cb)
-        pIOM->CTX_SUFF(pMMIORangeLast) = pRange = (PIOMMMIORANGE)RTAvlroGCPhysRangeGet(&pIOM->CTX_SUFF(pTrees)->MMIOTree, GCPhys);
-    return pRange;
-}
-#endif
-
-
-#ifdef VBOX_WITH_STATISTICS
-/**
- * Gets the MMIO statistics record.
- *
- * In ring-3 this will lazily create missing records, while in GC/R0 the caller has to
- * return the appropriate status to defer the operation to ring-3.
- *
- * @returns Pointer to MMIO stats.
- * @returns NULL if not found (R0/GC), or out of memory (R3).
- *
- * @param   pIOM        IOM instance data.
- * @param   GCPhys      Physical address to lookup.
- * @param   pRange      The MMIO range.
- */
-DECLINLINE(PIOMMMIOSTATS) iomMMIOGetStats(PIOM pIOM, RTGCPHYS GCPhys, PIOMMMIORANGE pRange)
-{
-    Assert(IOMIsLockOwner(IOM2VM(pIOM)));
-    /* For large ranges, we'll put everything on the first byte. */
-    if (pRange->cb > PAGE_SIZE)
-        GCPhys = pRange->GCPhys;
-
-    PIOMMMIOSTATS pStats = pIOM->CTX_SUFF(pMMIOStatsLast);
-    if (    !pStats
-        ||  pStats->Core.Key != GCPhys)
-    {
-        pStats = (PIOMMMIOSTATS)RTAvloGCPhysGet(&pIOM->CTX_SUFF(pTrees)->MMIOStatTree, GCPhys);
-# ifdef IN_RING3
-        if (!pStats)
-            pStats = iomR3MMIOStatsCreate(IOM2VM(pIOM), GCPhys, pRange->pszDesc);
-# endif
-    }
-    return pStats;
-}
-#endif
-
 /* IOM locking helpers. */
 int     iomLock(PVM pVM);