vbox的更動 12561 路徑 trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

時間撮記:

2008-9-18 上午11:54:34 (16 年 以前)

作者:

vboxsync

訊息:

IOM: Made some minor adjustments to the MMIO CPU registration context stuff and added some TODOs for what needs to be done.

檔案:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (修改) (9 筆差異)

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

@@ -84 +84 @@
 #endif
 
-    unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
-    Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+    unsigned idCPU = (pRange->enmCtx == IOMMMIOCTX_GLOBAL) ? 0 : pVM->idCPU;
+    Assert(pRange->a[idCPU].CTXALLSUFF(pDevIns)); /** @todo SMP */
 
     int rc;
     if (RT_LIKELY(pRange->CTXALLSUFF(pfnWriteCallback)))
-        rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), GCPhysFault, (void *)pvData, cb); /* @todo fix const!! */
+        rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->a[idCPU].CTXALLSUFF(pDevIns), pRange->a[idCPU].CTXALLSUFF(pvUser), GCPhysFault, (void *)pvData, cb); /* @todo fix const!! */
     else
         rc = VINF_SUCCESS;
@@ -107 +107 @@
 #endif
 
-    unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
-    Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+    unsigned idCPU = (pRange->enmCtx == IOMMMIOCTX_GLOBAL) ? 0 : pVM->idCPU;
+    Assert(pRange->a[idCPU].CTXALLSUFF(pDevIns)); /** @todo SMP */
 
     int rc;
     if (RT_LIKELY(pRange->CTXALLSUFF(pfnReadCallback)))
-        rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), GCPhysFault, pvData, cb);
+        rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->a[idCPU].CTXALLSUFF(pDevIns), pRange->a[idCPU].CTXALLSUFF(pvUser), GCPhysFault, pvData, cb);
     else
     {
@@ -589 +589 @@
     if (pRange->CTXALLSUFF(pfnFillCallback))
     {
-        unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
-        Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+        unsigned idCPU = (pRange->enmCtx == IOMMMIOCTX_GLOBAL) ? 0 : pVM->idCPU;
+        Assert(pRange->a[idCPU].CTXALLSUFF(pDevIns));  /** @todo SMP */
 
         /*
@@ -599 +599 @@
         {
             /* addr++ variant. */
-            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), Phys, u32Data, cb, cTransfers);
+            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->a[idCPU].CTXALLSUFF(pDevIns), pRange->a[idCPU].CTXALLSUFF(pvUser), Phys, u32Data, cb, cTransfers);
             if (rc == VINF_SUCCESS)
             {
@@ -611 +611 @@
         {
             /* addr-- variant. */
-            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), (Phys - (cTransfers - 1)) << SIZE_2_SHIFT(cb), u32Data, cb, cTransfers);
+            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->a[idCPU].CTXALLSUFF(pDevIns), pRange->a[idCPU].CTXALLSUFF(pvUser), (Phys - (cTransfers - 1)) << SIZE_2_SHIFT(cb), u32Data, cb, cTransfers);
             if (rc == VINF_SUCCESS)
             {
@@ -1277 +1277 @@
          * Perform the read and deal with the result.
          */
-        unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
-        Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+        unsigned idCPU = (pRange->enmCtx == IOMMMIOCTX_GLOBAL) ? 0 : pVM->idCPU;
+        Assert(pRange->a[idCPU].CTXALLSUFF(pDevIns)); /** @todo SMP */
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1284 +1284 @@
             STAM_PROFILE_ADV_START(&pStats->CTXALLSUFF(ProfRead), a);
 #endif
-        int rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), GCPhys, pu32Value, cbValue);
+        int rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->a[idCPU].CTXALLSUFF(pDevIns), pRange->a[idCPU].CTXALLSUFF(pvUser), GCPhys, pu32Value, cbValue);
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)
@@ -1387 +1387 @@
     if (pRange->CTXALLSUFF(pfnWriteCallback))
     {
-        unsigned idCPU = (pRange->enmCtx == MMIO_REGCTX_GLOBAL) ? 0 : pVM->idCPU;
-        Assert(pRange->u[idCPU].CTXALLSUFF(pDevIns));
+        unsigned idCPU = (pRange->enmCtx == IOMMMIOCTX_GLOBAL) ? 0 : pVM->idCPU;
+        Assert(pRange->a[idCPU].CTXALLSUFF(pDevIns)); /** @todo SMP */
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1394 +1394 @@
             STAM_PROFILE_ADV_START(&pStats->CTXALLSUFF(ProfWrite), a);
 #endif
-        int rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->u[idCPU].CTXALLSUFF(pDevIns), pRange->u[idCPU].CTXALLSUFF(pvUser), GCPhys, &u32Value, cbValue);
+        int rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->a[idCPU].CTXALLSUFF(pDevIns), pRange->a[idCPU].CTXALLSUFF(pvUser), GCPhys, &u32Value, cbValue);
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)