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

時間撮記:

2008-9-26 下午04:13:09 (16 年 以前)

作者:

vboxsync

訊息:

#1865: IOM.

檔案:

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

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IOM - Input / Output Monitor - Guest Context.
+ * IOM - Input / Output Monitor - Any Context, MMIO & String I/O.
  */
 
@@ -46 +46 @@
 
 
-
 /*******************************************************************************
 *   Global Variables                                                           *
@@ -75 +74 @@
 /**
  * Wrapper which does the write and updates range statistics when such are enabled.
- * @warning VBOX_SUCCESS(rc=VINF_IOM_HC_MMIO_WRITE) is TRUE!
+ * @warning RT_SUCCESS(rc=VINF_IOM_HC_MMIO_WRITE) is TRUE!
  */
 DECLINLINE(int) iomMMIODoWrite(PVM pVM, PIOMMMIORANGE pRange, RTGCPHYS GCPhysFault, const void *pvData, unsigned cb)
@@ -85 +84 @@
 
     int rc;
-    if (RT_LIKELY(pRange->CTXALLSUFF(pfnWriteCallback)))
-        rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), GCPhysFault, (void *)pvData, cb); /* @todo fix const!! */
+    if (RT_LIKELY(pRange->CTX_SUFF(pfnWriteCallback)))
+        rc = pRange->CTX_SUFF(pfnWriteCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), GCPhysFault, (void *)pvData, cb); /* @todo fix const!! */
     else
         rc = VINF_SUCCESS;
     if (rc != VINF_IOM_HC_MMIO_WRITE)
-        STAM_COUNTER_INC(&pStats->CTXALLSUFF(Write));
+        STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Write));
     return rc;
 }
+
 
 /**
@@ -105 +105 @@
 
     int rc;
-    if (RT_LIKELY(pRange->CTXALLSUFF(pfnReadCallback)))
-        rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), GCPhysFault, pvData, cb);
+    if (RT_LIKELY(pRange->CTX_SUFF(pfnReadCallback)))
+        rc = pRange->CTX_SUFF(pfnReadCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), GCPhysFault, pvData, cb);
     else
     {
+/** @todo r=bird: this is (probably) wrong, all bits should be set here I
+ *        think. */
         switch (cb)
         {
@@ -122 +124 @@
     }
     if (rc != VINF_IOM_HC_MMIO_READ)
-        STAM_COUNTER_INC(&pStats->CTXALLSUFF(Read));
+        STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Read));
     return rc;
 }
 
-/*
+
+/**
  * Internal - statistics only.
  */
@@ -135 +138 @@
     {
         case 1:
-            STAM_COUNTER_INC(&pVM->iom.s.StatGCMMIO1Byte);
+            STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIO1Byte);
             break;
         case 2:
-            STAM_COUNTER_INC(&pVM->iom.s.StatGCMMIO2Bytes);
+            STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIO2Bytes);
             break;
         case 4:
-            STAM_COUNTER_INC(&pVM->iom.s.StatGCMMIO4Bytes);
+            STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIO4Bytes);
             break;
         case 8:
-            STAM_COUNTER_INC(&pVM->iom.s.StatGCMMIO8Bytes);
+            STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIO8Bytes);
             break;
         default:
@@ -172 +175 @@
 static int iomInterpretMOVxXRead(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange, RTGCPHYS GCPhysFault)
 {
-    Assert(pRange->CTXALLSUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
+    Assert(pRange->CTX_SUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
 
     /*
@@ -231 +234 @@
 static int iomInterpretMOVxXWrite(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange, RTGCPHYS GCPhysFault)
 {
-    Assert(pRange->CTXALLSUFF(pfnWriteCallback) || !pRange->pfnWriteCallbackR3);
+    Assert(pRange->CTX_SUFF(pfnWriteCallback) || !pRange->pfnWriteCallbackR3);
 
     /*
@@ -271 +274 @@
 
 
-#ifdef iom_MOVS_SUPPORT
+#ifdef IOM_WITH_MOVS_SUPPORT
 /**
  * [REP] MOVSB
@@ -288 +291 @@
  * @param   pCpu        Disassembler CPU state.
  * @param   pRange      Pointer MMIO range.
- */
-static int iomInterpretMOVS(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange)
+ * @param   ppStat      Which sub-sample to attribute this call to.
+ */
+static int iomInterpretMOVS(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange, PSTAMPROFILE *ppStat)
 {
     /*
@@ -299 +303 @@
 
     /*
-     * Get bytes/words/dwords count to copy.
+     * Get bytes/words/dwords/qword count to copy.
      */
     uint32_t cTransfers = 1;
@@ -343 +347 @@
          * ds:esi (Virt Src) -> es:edi (Phys Dst)
          */
-        STAM_PROFILE_START(&pVM->iom.s.StatGCInstMovsToMMIO, a2);
+        STAM_STATS({ *ppStat = &pVM->iom.s.StatRZInstMovsToMMIO; });
 
         /* Check callback. */
-        if (!pRange->CTXALLSUFF(pfnWriteCallback))
-        {
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsToMMIO, a2);
+        if (!pRange->CTX_SUFF(pfnWriteCallback))
             return VINF_IOM_HC_MMIO_WRITE;
-        }
 
         /* Convert source address ds:esi. */
@@ -357 +358 @@
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           (PRTGCPTR)&pu8Virt);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
 
@@ -365 +366 @@
             {
                 Log(("MOVS will generate a trap -> recompiler, rc=%d\n", rc));
-                STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsToMMIO, a2);
                 return VINF_EM_RAW_EMULATE_INSTR;
             }
@@ -396 +396 @@
             if (pCpu->prefix & PREFIX_REP)
                 pRegFrame->ecx = cTransfers;
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsToMMIO, a2);
         }
         else
@@ -407 +406 @@
          * ds:[eSI] (Phys Src) -> es:[eDI] (Virt Dst)
          */
+        STAM_STATS({ *ppStat = &pVM->iom.s.StatRZInstMovsFromMMIO; });
+
         /* Check callback. */
-        if (!pRange->pfnReadCallback)
+        if (!pRange->CTX_SUFF(pfnReadCallback))
             return VINF_IOM_HC_MMIO_READ;
 
@@ -416 +417 @@
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           (RTGCPTR *)&pu8Virt);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return VINF_EM_RAW_GUEST_TRAP;
 
@@ -424 +425 @@
         rc = PGMGstGetPage(pVM, (RTGCPTR)pu8Virt, NULL, &PhysDst);
         PhysDst |= (RTGCUINTPTR)pu8Virt & PAGE_OFFSET_MASK;
-        if (    VBOX_SUCCESS(rc)
+        if (    RT_SUCCESS(rc)
             &&  (pMMIODst = iomMMIOGetRange(&pVM->iom.s, PhysDst)))
         {
@@ -430 +431 @@
              * Extra: [MMIO] -> [MMIO]
              */
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstMovsMMIO, d);
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstMovsFromMMIO, c);
-
-            if (!pMMIODst->CTXALLSUFF(pfnWriteCallback) && pMMIODst->pfnWriteCallbackR3)
-            {
-                STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsMMIO, d);
-                STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsFromMMIO, c);
+            STAM_STATS({ *ppStat = &pVM->iom.s.StatRZInstMovsMMIO; });
+            if (!pMMIODst->CTX_SUFF(pfnWriteCallback) && pMMIODst->pfnWriteCallbackR3)
                 return VINF_IOM_HC_MMIO_READ_WRITE;
-            }
 
             /* copy loop. */
@@ -457 +452 @@
                 cTransfers--;
             }
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsMMIO, d);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsFromMMIO, c);
         }
         else
@@ -465 +458 @@
              * Normal: [MMIO] -> [Mem]
              */
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstMovsFromMMIO, c);
-
             /* Access verification first; we currently can't recover properly from traps inside this instruction */
             rc = PGMVerifyAccess(pVM, pu8Virt, cTransfers * cb, X86_PTE_RW | ((cpl == 3) ? X86_PTE_US : 0));
@@ -472 +463 @@
             {
                 Log(("MOVS will generate a trap -> recompiler, rc=%d\n", rc));
-                STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsFromMMIO, c);
                 return VINF_EM_RAW_EMULATE_INSTR;
             }
@@ -502 +492 @@
             MMGCRamDeregisterTrapHandler(pVM);
 #endif
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovsFromMMIO, c);
         }
 
@@ -512 +501 @@
     /* work statistics. */
     if (rc == VINF_SUCCESS)
-    {
         iomMMIOStatLength(pVM, cb);
-    }
+    NOREF(ppStat);
     return rc;
 }
-#endif
-
+#endif /* IOM_WITH_MOVS_SUPPORT */
 
 
@@ -565 +552 @@
     }
 
+/** @todo r=bird: bounds checks! */
+
     /*
      * Get data size.
@@ -581 +570 @@
     uint32_t    u32Data = pRegFrame->eax;
     int rc;
-    if (pRange->CTXALLSUFF(pfnFillCallback))
+    if (pRange->CTX_SUFF(pfnFillCallback))
     {
         /*
@@ -590 +579 @@
         {
             /* addr++ variant. */
-            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), Phys, u32Data, cb, cTransfers);
+            rc = pRange->CTX_SUFF(pfnFillCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), Phys, u32Data, cb, cTransfers);
             if (rc == VINF_SUCCESS)
             {
@@ -602 +591 @@
         {
             /* addr-- variant. */
-            rc = pRange->CTXALLSUFF(pfnFillCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), (Phys - (cTransfers - 1)) << SIZE_2_SHIFT(cb), u32Data, cb, cTransfers);
+            rc = pRange->CTX_SUFF(pfnFillCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), (Phys - (cTransfers - 1)) << SIZE_2_SHIFT(cb), u32Data, cb, cTransfers);
             if (rc == VINF_SUCCESS)
             {
@@ -617 +606 @@
          * Use the write callback.
          */
-        Assert(pRange->CTXALLSUFF(pfnWriteCallback) || !pRange->pfnWriteCallbackR3);
+        Assert(pRange->CTX_SUFF(pfnWriteCallback) || !pRange->pfnWriteCallbackR3);
 
         /* fill loop. */
@@ -663 +652 @@
 static int iomInterpretLODS(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange)
 {
-    Assert(pRange->CTXALLSUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
+    Assert(pRange->CTX_SUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
 
     /*
@@ -711 +700 @@
 static int iomInterpretCMP(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange)
 {
-    Assert(pRange->CTXALLSUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
+    Assert(pRange->CTX_SUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
 
     /*
@@ -787 +776 @@
     {
         /* and reg, [MMIO]. */
-        Assert(pRange->CTXALLSUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
+        Assert(pRange->CTX_SUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
         fAndWrite = false;
         rc = iomMMIODoRead(pVM, pRange, GCPhysFault, &uData2, cb);
@@ -795 +784 @@
         /* and [MMIO], reg|imm. */
         fAndWrite = true;
-        if (    (pRange->CTXALLSUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3)
-            &&  (pRange->CTXALLSUFF(pfnWriteCallback) || !pRange->pfnWriteCallbackR3))
+        if (    (pRange->CTX_SUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3)
+            &&  (pRange->CTX_SUFF(pfnWriteCallback) || !pRange->pfnWriteCallbackR3))
             rc = iomMMIODoRead(pVM, pRange, GCPhysFault, &uData1, cb);
         else
@@ -835 +824 @@
 }
 
+
 /**
  * TEST [MMIO], reg|imm
@@ -852 +842 @@
 static int iomInterpretTEST(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange)
 {
-    Assert(pRange->CTXALLSUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
+    Assert(pRange->CTX_SUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
 
     unsigned    cb     = 0;
@@ -887 +877 @@
 }
 
+
 /**
  * BT [MMIO], reg|imm
@@ -903 +894 @@
 static int iomInterpretBT(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange)
 {
-    Assert(pRange->CTXALLSUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
+    Assert(pRange->CTX_SUFF(pfnReadCallback) || !pRange->pfnReadCallbackR3);
 
     uint64_t    uBit   = 0;
@@ -954 +945 @@
 {
     /* Check for read & write handlers since IOMMMIOHandler doesn't cover this. */
-    if (    (!pRange->CTXALLSUFF(pfnReadCallback) && pRange->pfnReadCallbackR3)
-        ||  (!pRange->CTXALLSUFF(pfnWriteCallback) && pRange->pfnWriteCallbackR3))
+    if (    (!pRange->CTX_SUFF(pfnReadCallback) && pRange->pfnReadCallbackR3)
+        ||  (!pRange->CTX_SUFF(pfnWriteCallback) && pRange->pfnWriteCallbackR3))
         return VINF_IOM_HC_MMIO_READ_WRITE;
 
@@ -1014 +1005 @@
 /**
  * \#PF Handler callback for MMIO ranges.
- * Note: we are on ring0 in Hypervisor and interrupts are disabled.
  *
  * @returns VBox status code (appropriate for GC return).
@@ -1026 +1016 @@
 IOMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser)
 {
-    STAM_PROFILE_START(&pVM->iom.s.StatGCMMIOHandler, a);
+    STAM_PROFILE_START(&pVM->iom.s.StatRZMMIOHandler, a);
     Log(("IOMMMIOHandler: GCPhys=%RGp uErr=%#x pvFault=%VGv eip=%VGv\n",
           GCPhysFault, (uint32_t)uErrorCode, pvFault, pCtxCore->rip));
@@ -1044 +1034 @@
         return VERR_NO_MEMORY;
 # else
-        STAM_PROFILE_STOP(&pVM->iom.s.StatGCMMIOHandler, a);
-        STAM_COUNTER_INC(&pVM->iom.s.StatGCMMIOFailures);
+        STAM_PROFILE_STOP(&pVM->iom.s.StatRZMMIOHandler, a);
+        STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIOFailures);
         return uErrorCode & X86_TRAP_PF_RW ? VINF_IOM_HC_MMIO_WRITE : VINF_IOM_HC_MMIO_READ;
 # endif
@@ -1056 +1046 @@
      */
     if (uErrorCode & X86_TRAP_PF_RW
-        ? !pRange->CTXALLSUFF(pfnWriteCallback) && pRange->pfnWriteCallbackR3
-        : !pRange->CTXALLSUFF(pfnReadCallback)  && pRange->pfnReadCallbackR3)
+        ? !pRange->CTX_SUFF(pfnWriteCallback) && pRange->pfnWriteCallbackR3
+        : !pRange->CTX_SUFF(pfnReadCallback)  && pRange->pfnReadCallbackR3)
     {
 # ifdef VBOX_WITH_STATISTICS
         if (uErrorCode & X86_TRAP_PF_RW)
-            STAM_COUNTER_INC(&pStats->CTXALLMID(Write,ToR3));
+            STAM_COUNTER_INC(&pStats->CTX_MID_Z(Write,ToR3));
         else
-            STAM_COUNTER_INC(&pStats->CTXALLMID(Read,ToR3));
+            STAM_COUNTER_INC(&pStats->CTX_MID_Z(Read,ToR3));
 # endif
 
-        STAM_PROFILE_STOP(&pVM->iom.s.StatGCMMIOHandler, a);
-        STAM_COUNTER_INC(&pVM->iom.s.StatGCMMIOFailures);
+        STAM_PROFILE_STOP(&pVM->iom.s.StatRZMMIOHandler, a);
+        STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIOFailures);
         return uErrorCode & X86_TRAP_PF_RW ? VINF_IOM_HC_MMIO_WRITE : VINF_IOM_HC_MMIO_READ;
     }
@@ -1085 +1075 @@
         case OP_MOVSX:
         {
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstMov, b);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstMov, b);
             if (uErrorCode & X86_TRAP_PF_RW)
                 rc = iomInterpretMOVxXWrite(pVM, pCtxCore, &Cpu, pRange, GCPhysFault);
             else
                 rc = iomInterpretMOVxXRead(pVM, pCtxCore, &Cpu, pRange, GCPhysFault);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMov, b);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstMov, b);
             break;
         }
 
 
-#ifdef iom_MOVS_SUPPORT
+#ifdef IOM_WITH_MOVS_SUPPORT
         case OP_MOVSB:
         case OP_MOVSWD:
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstMovs, c);
-            rc = iomInterpretMOVS(pVM, uErrorCode, pCtxCore, GCPhysFault, &Cpu, pRange);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstMovs, c);
-            break;
+        {
+            STAM_PROFILE_ADV_START(&pVM->iom.s.StatRZInstMovs, c);
+            PSTAMPROFILE pStat = NULL;
+            rc = iomInterpretMOVS(pVM, uErrorCode, pCtxCore, GCPhysFault, &Cpu, pRange, &pStat);
+            STAM_PROFILE_ADV_STOP_EX(&pVM->iom.s.StatRZInstMovs, pStat, c);
+            break;
+        }
 #endif
 
@@ -1107 +1100 @@
         case OP_STOSWD:
             Assert(uErrorCode & X86_TRAP_PF_RW);
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstStos, d);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstStos, d);
             rc = iomInterpretSTOS(pVM, pCtxCore, GCPhysFault, &Cpu, pRange);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstStos, d);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstStos, d);
             break;
 
@@ -1115 +1108 @@
         case OP_LODSWD:
             Assert(!(uErrorCode & X86_TRAP_PF_RW));
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstLods, e);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstLods, e);
             rc = iomInterpretLODS(pVM, pCtxCore, GCPhysFault, &Cpu, pRange);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstLods, e);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstLods, e);
             break;
 
         case OP_CMP:
             Assert(!(uErrorCode & X86_TRAP_PF_RW));
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstCmp, f);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstCmp, f);
             rc = iomInterpretCMP(pVM, pCtxCore, GCPhysFault, &Cpu, pRange);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstCmp, f);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstCmp, f);
             break;
 
         case OP_AND:
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstAnd, g);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstAnd, g);
             rc = iomInterpretOrXorAnd(pVM, pCtxCore, GCPhysFault, &Cpu, pRange, EMEmulateAnd);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstAnd, g);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstAnd, g);
             break;
 
         case OP_OR:
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstOr, k);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstOr, k);
             rc = iomInterpretOrXorAnd(pVM, pCtxCore, GCPhysFault, &Cpu, pRange, EMEmulateOr);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstOr, k);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstOr, k);
             break;
 
         case OP_XOR:
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstXor, m);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstXor, m);
             rc = iomInterpretOrXorAnd(pVM, pCtxCore, GCPhysFault, &Cpu, pRange, EMEmulateXor);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstXor, m);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstXor, m);
             break;
 
         case OP_TEST:
             Assert(!(uErrorCode & X86_TRAP_PF_RW));
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstTest, h);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstTest, h);
             rc = iomInterpretTEST(pVM, pCtxCore, GCPhysFault, &Cpu, pRange);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstTest, h);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstTest, h);
             break;
 
         case OP_BT:
             Assert(!(uErrorCode & X86_TRAP_PF_RW));
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstBt, l);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstBt, l);
             rc = iomInterpretBT(pVM, pCtxCore, GCPhysFault, &Cpu, pRange);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstBt, l);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstBt, l);
             break;
 
         case OP_XCHG:
-            STAM_PROFILE_START(&pVM->iom.s.StatGCInstXchg, i);
+            STAM_PROFILE_START(&pVM->iom.s.StatRZInstXchg, i);
             rc = iomInterpretXCHG(pVM, pCtxCore, GCPhysFault, &Cpu, pRange);
-            STAM_PROFILE_STOP(&pVM->iom.s.StatGCInstXchg, i);
+            STAM_PROFILE_STOP(&pVM->iom.s.StatRZInstXchg, i);
             break;
 
@@ -1170 +1163 @@
          */
         default:
-            STAM_COUNTER_INC(&pVM->iom.s.StatGCInstOther);
+            STAM_COUNTER_INC(&pVM->iom.s.StatRZInstOther);
             rc = (uErrorCode & X86_TRAP_PF_RW) ? VINF_IOM_HC_MMIO_WRITE : VINF_IOM_HC_MMIO_READ;
             break;
@@ -1182 +1175 @@
     else
     {
-        STAM_COUNTER_INC(&pVM->iom.s.StatGCMMIOFailures);
+        STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIOFailures);
 #if defined(VBOX_WITH_STATISTICS) && !defined(IN_RING3)
         switch (rc)
@@ -1188 +1181 @@
             case VINF_IOM_HC_MMIO_READ:
             case VINF_IOM_HC_MMIO_READ_WRITE:
-                STAM_COUNTER_INC(&pStats->CTXALLMID(Read,ToR3));
+                STAM_COUNTER_INC(&pStats->CTX_MID_Z(Read,ToR3));
                 break;
             case VINF_IOM_HC_MMIO_WRITE:
-                STAM_COUNTER_INC(&pStats->CTXALLMID(Write,ToR3));
+                STAM_COUNTER_INC(&pStats->CTX_MID_Z(Write,ToR3));
                 break;
         }
@@ -1197 +1190 @@
     }
 
-    STAM_PROFILE_STOP(&pVM->iom.s.StatGCMMIOHandler, a);
+    STAM_PROFILE_STOP(&pVM->iom.s.StatRZMMIOHandler, a);
     return rc;
 }
@@ -1220 +1213 @@
     int           rc;
     PIOMMMIORANGE pRange = (PIOMMMIORANGE)pvUser;
+    STAM_COUNTER_INC(&pVM->iom.s.StatR3MMIOHandler);
+
+    AssertMsg(cbBuf == 1 || cbBuf == 2 || cbBuf == 4 || cbBuf == 8, ("%zu\n", cbBuf));
 
     Assert(pRange);
@@ -1263 +1259 @@
 # endif
 #endif /* VBOX_WITH_STATISTICS */
-    if (pRange->CTXALLSUFF(pfnReadCallback))
+    if (pRange->CTX_SUFF(pfnReadCallback))
     {
         /*
@@ -1270 +1266 @@
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)
-            STAM_PROFILE_ADV_START(&pStats->CTXALLSUFF(ProfRead), a);
-#endif
-        int rc = pRange->CTXALLSUFF(pfnReadCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), GCPhys, pu32Value, cbValue);
+            STAM_PROFILE_ADV_START(&pStats->CTX_SUFF_Z(ProfRead), a);
+#endif
+        int rc = pRange->CTX_SUFF(pfnReadCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), GCPhys, pu32Value, cbValue);
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)
-            STAM_PROFILE_ADV_STOP(&pStats->CTXALLSUFF(ProfRead), a);
+            STAM_PROFILE_ADV_STOP(&pStats->CTX_SUFF_Z(ProfRead), a);
         if (pStats && rc != VINF_IOM_HC_MMIO_READ)
-            STAM_COUNTER_INC(&pStats->CTXALLSUFF(Read));
+            STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Read));
 #endif
         switch (rc)
@@ -1314 +1310 @@
     if (pRange->pfnReadCallbackR3)
     {
-        STAM_COUNTER_INC(&pStats->CTXALLMID(Read,ToR3));
+        STAM_COUNTER_INC(&pStats->CTX_MID_Z(Read,ToR3));
         return VINF_IOM_HC_MMIO_READ;
     }
@@ -1324 +1320 @@
 #ifdef VBOX_WITH_STATISTICS
     if (pStats)
-        STAM_COUNTER_INC(&pStats->CTXALLSUFF(Read));
+        STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Read));
 #endif
     /* Unassigned memory; this is actually not supposed to happen. */
@@ -1373 +1369 @@
      * to defer it to ring-3.
      */
-    if (pRange->CTXALLSUFF(pfnWriteCallback))
+    if (pRange->CTX_SUFF(pfnWriteCallback))
     {
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)
-            STAM_PROFILE_ADV_START(&pStats->CTXALLSUFF(ProfWrite), a);
-#endif
-        int rc = pRange->CTXALLSUFF(pfnWriteCallback)(pRange->CTXALLSUFF(pDevIns), pRange->CTXALLSUFF(pvUser), GCPhys, &u32Value, cbValue);
+            STAM_PROFILE_ADV_START(&pStats->CTX_SUFF_Z(ProfWrite), a);
+#endif
+        int rc = pRange->CTX_SUFF(pfnWriteCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), GCPhys, &u32Value, cbValue);
 #ifdef VBOX_WITH_STATISTICS
         if (pStats)
-            STAM_PROFILE_ADV_STOP(&pStats->CTXALLSUFF(ProfWrite), a);
+            STAM_PROFILE_ADV_STOP(&pStats->CTX_SUFF_Z(ProfWrite), a);
         if (pStats && rc != VINF_IOM_HC_MMIO_WRITE)
-            STAM_COUNTER_INC(&pStats->CTXALLSUFF(Write));
+            STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Write));
 #endif
         Log4(("IOMMMIOWrite: GCPhys=%RGp u32=%08RX32 cb=%d rc=%Vrc\n", GCPhys, u32Value, cbValue, rc));
@@ -1392 +1388 @@
     if (pRange->pfnWriteCallbackR3)
     {
-        STAM_COUNTER_INC(&pStats->CTXALLMID(Write,ToR3));
+        STAM_COUNTER_INC(&pStats->CTX_MID_Z(Write,ToR3));
         return VINF_IOM_HC_MMIO_WRITE;
     }
@@ -1402 +1398 @@
 #ifdef VBOX_WITH_STATISTICS
     if (pStats)
-        STAM_COUNTER_INC(&pStats->CTXALLSUFF(Write));
+        STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Write));
 #endif
     Log4(("IOMMMIOWrite: GCPhys=%RGp u32=%08RX32 cb=%d rc=%Vrc\n", GCPhys, u32Value, cbValue, VINF_SUCCESS));
@@ -1435 +1431 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-    STAM_COUNTER_INC(&pVM->iom.s.StatGCInstIns);
+    STAM_COUNTER_INC(&pVM->iom.s.StatInstIns);
 #endif
 
@@ -1471 +1467 @@
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           &GCPtrDst);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("INS destination address conversion failed -> fallback, rc=%d\n", rc));
@@ -1523 +1519 @@
         pRegFrame->ecx = cTransfers;
 
-    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_READ || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || VBOX_FAILURE(rc), ("%Vrc\n", rc));
+    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_READ || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || RT_FAILURE(rc), ("%Vrc\n", rc));
     return rc;
 }
@@ -1563 +1559 @@
     if (RT_UNLIKELY(rc != VINF_SUCCESS))
     {
-        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || VBOX_FAILURE(rc), ("%Vrc\n", rc));
+        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Vrc\n", rc));
         return rc;
     }
@@ -1596 +1592 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-    STAM_COUNTER_INC(&pVM->iom.s.StatGCInstOuts);
+    STAM_COUNTER_INC(&pVM->iom.s.StatInstOuts);
 #endif
 
@@ -1631 +1627 @@
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           &GCPtrSrc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         Log(("OUTS source address conversion failed -> fallback, rc=%Vrc\n", rc));
@@ -1686 +1682 @@
         pRegFrame->ecx = cTransfers;
 
-    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_WRITE || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || VBOX_FAILURE(rc), ("%Vrc\n", rc));
+    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_WRITE || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || RT_FAILURE(rc), ("%Vrc\n", rc));
     return rc;
 }
@@ -1728 +1724 @@
     if (RT_UNLIKELY(rc != VINF_SUCCESS))
     {
-        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || VBOX_FAILURE(rc), ("%Vrc\n", rc));
+        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Vrc\n", rc));
         return rc;
     }