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

Timestamp:

Sep 24, 2008 2:22:18 PM (17 years ago)

Author:

vboxsync

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

36993

Message:

#1865: EM - one pointer and statistics. Added a couple of more samples to the release statistics.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (40 diffs)
• EMInternal.h (modified) (7 diffs)
• VMMAll/DBGFAll.cpp (modified) (1 diff)
• VMMAll/EMAll.cpp (modified) (75 diffs)
• VMMAll/EMAllA.asm (modified) (14 diffs)
• VMMAll/IOMAllMMIO.cpp (modified) (1 diff)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -20 +20 @@
  */
 
-
 /** @page pg_em         EM - The Execution Monitor/Manager
  *
  * The Execution Monitor/Manager is responsible for running the VM, scheduling
- * the right kind of execution (Raw, Recompiled, Interpreted,..), and keeping
- * the CPU states in sync. The function RMR3ExecuteVM() is the 'main-loop' of
- * the VM.
- *
+ * the right kind of execution (Raw-mode, Hardware Assisted, Recompiled or
+ * Interpreted), and keeping the CPU states in sync. The function
+ * EMR3ExecuteVM() is the 'main-loop' of the VM, while each of the execution
+ * modes has different inner loops (emR3RawExecute, emR3HwAccExecute, and
+ * emR3RemExecute).
+ *
+ * The interpreted execution is only used to avoid switching between
+ * raw-mode/hwaccm and the recompiler when fielding virtualization traps/faults.
+ * The interpretation is thus implemented as part of EM.
  */
 
@@ -144 +148 @@
     if (VBOX_FAILURE(rc))
         return rc;
-    pVM->em.s.pStatsHC = pStats;
-    pVM->em.s.pStatsGC = MMHyperHC2GC(pVM, pStats);
-
-    STAM_REG(pVM, &pStats->StatGCEmulate,               STAMTYPE_PROFILE, "/EM/GC/Interpret",                   STAMUNIT_TICKS_PER_CALL, "Profiling of EMInterpretInstruction.");
-    STAM_REG(pVM, &pStats->StatHCEmulate,               STAMTYPE_PROFILE, "/EM/HC/Interpret",                   STAMUNIT_TICKS_PER_CALL, "Profiling of EMInterpretInstruction.");
-
-    STAM_REG(pVM, &pStats->StatGCInterpretSucceeded,    STAMTYPE_COUNTER, "/EM/GC/Interpret/Success",           STAMUNIT_OCCURENCES,    "The number of times an instruction was successfully interpreted.");
-    STAM_REG(pVM, &pStats->StatHCInterpretSucceeded,    STAMTYPE_COUNTER, "/EM/HC/Interpret/Success",           STAMUNIT_OCCURENCES,    "The number of times an instruction was successfully interpreted.");
-
-    STAM_REG_USED(pVM, &pStats->StatGCAnd,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/And",       STAMUNIT_OCCURENCES,    "The number of times AND was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCAnd,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/And",       STAMUNIT_OCCURENCES,    "The number of times AND was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCAdd,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Add",       STAMUNIT_OCCURENCES,    "The number of times ADD was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCAdd,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Add",       STAMUNIT_OCCURENCES,    "The number of times ADD was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCAdc,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Adc",       STAMUNIT_OCCURENCES,    "The number of times ADC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCAdc,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Adc",       STAMUNIT_OCCURENCES,    "The number of times ADC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCSub,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Sub",       STAMUNIT_OCCURENCES,    "The number of times SUB was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCSub,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Sub",       STAMUNIT_OCCURENCES,    "The number of times SUB was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCCpuId,                STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/CpuId",     STAMUNIT_OCCURENCES,    "The number of times CPUID was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCCpuId,                STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/CpuId",     STAMUNIT_OCCURENCES,    "The number of times CPUID was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCDec,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Dec",       STAMUNIT_OCCURENCES,    "The number of times DEC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCDec,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Dec",       STAMUNIT_OCCURENCES,    "The number of times DEC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCHlt,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Hlt",       STAMUNIT_OCCURENCES,    "The number of times HLT was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCHlt,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Hlt",       STAMUNIT_OCCURENCES,    "The number of times HLT was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCInc,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Inc",       STAMUNIT_OCCURENCES,    "The number of times INC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCInc,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Inc",       STAMUNIT_OCCURENCES,    "The number of times INC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCInvlPg,               STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Invlpg",    STAMUNIT_OCCURENCES,    "The number of times INVLPG was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCInvlPg,               STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Invlpg",    STAMUNIT_OCCURENCES,    "The number of times INVLPG was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCIret,                 STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Iret",      STAMUNIT_OCCURENCES,    "The number of times IRET was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCIret,                 STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Iret",      STAMUNIT_OCCURENCES,    "The number of times IRET was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCLLdt,                 STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/LLdt",      STAMUNIT_OCCURENCES,    "The number of times LLDT was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCLLdt,                 STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/LLdt",      STAMUNIT_OCCURENCES,    "The number of times LLDT was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCMov,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Mov",       STAMUNIT_OCCURENCES,    "The number of times MOV was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCMov,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Mov",       STAMUNIT_OCCURENCES,    "The number of times MOV was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCMovCRx,               STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/MovCRx",    STAMUNIT_OCCURENCES,    "The number of times MOV CRx was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCMovCRx,               STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/MovCRx",    STAMUNIT_OCCURENCES,    "The number of times MOV CRx was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCMovDRx,               STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/MovDRx",    STAMUNIT_OCCURENCES,    "The number of times MOV DRx was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCMovDRx,               STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/MovDRx",    STAMUNIT_OCCURENCES,    "The number of times MOV DRx was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCOr,                   STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Or",        STAMUNIT_OCCURENCES,    "The number of times OR was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCOr,                   STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Or",        STAMUNIT_OCCURENCES,    "The number of times OR was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCPop,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Pop",       STAMUNIT_OCCURENCES,    "The number of times POP was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCPop,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Pop",       STAMUNIT_OCCURENCES,    "The number of times POP was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCRdtsc,                STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Rdtsc",     STAMUNIT_OCCURENCES,    "The number of times RDTSC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCRdtsc,                STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Rdtsc",     STAMUNIT_OCCURENCES,    "The number of times RDTSC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCSti,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Sti",       STAMUNIT_OCCURENCES,    "The number of times STI was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCSti,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Sti",       STAMUNIT_OCCURENCES,    "The number of times STI was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCXchg,                 STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Xchg",      STAMUNIT_OCCURENCES,    "The number of times XCHG was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCXchg,                 STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Xchg",      STAMUNIT_OCCURENCES,    "The number of times XCHG was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCXor,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Xor",       STAMUNIT_OCCURENCES,    "The number of times XOR was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCXor,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Xor",       STAMUNIT_OCCURENCES,    "The number of times XOR was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCMonitor,              STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Monitor",   STAMUNIT_OCCURENCES,    "The number of times MONITOR was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCMonitor,              STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Monitor",   STAMUNIT_OCCURENCES,    "The number of times MONITOR was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCMWait,                STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/MWait",     STAMUNIT_OCCURENCES,    "The number of times MWAIT was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCMWait,                STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/MWait",     STAMUNIT_OCCURENCES,    "The number of times MWAIT was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCBtr,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Btr",       STAMUNIT_OCCURENCES,    "The number of times BTR was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCBtr,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Btr",       STAMUNIT_OCCURENCES,    "The number of times BTR was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCBts,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Bts",       STAMUNIT_OCCURENCES,    "The number of times BTS was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCBts,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Bts",       STAMUNIT_OCCURENCES,    "The number of times BTS was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCBtc,                  STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Btc",       STAMUNIT_OCCURENCES,    "The number of times BTC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCBtc,                  STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Btc",       STAMUNIT_OCCURENCES,    "The number of times BTC was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCCmpXchg,              STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/CmpXchg",   STAMUNIT_OCCURENCES,    "The number of times CMPXCHG was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCCmpXchg,              STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/CmpXchg",   STAMUNIT_OCCURENCES,    "The number of times CMPXCHG was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCCmpXchg8b,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/CmpXchg8b",   STAMUNIT_OCCURENCES,  "The number of times CMPXCHG8B was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCCmpXchg8b,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/CmpXchg8b",   STAMUNIT_OCCURENCES,  "The number of times CMPXCHG8B was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCXAdd,                 STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/XAdd",      STAMUNIT_OCCURENCES,    "The number of times XADD was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCXAdd,                 STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/XAdd",      STAMUNIT_OCCURENCES,    "The number of times XADD was successfully interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCRdmsr,                STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Rdmsr",      STAMUNIT_OCCURENCES,   "The number of times RDMSR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCRdmsr,                STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Rdmsr",      STAMUNIT_OCCURENCES,   "The number of times RDMSR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCWrmsr,                STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Wrmsr",      STAMUNIT_OCCURENCES,   "The number of times WRMSR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCWrmsr,                STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Wrmsr",      STAMUNIT_OCCURENCES,   "The number of times WRMSR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCStosWD,               STAMTYPE_COUNTER, "/EM/HC/Interpret/Success/Stoswd",     STAMUNIT_OCCURENCES,   "The number of times STOSWD was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCStosWD,               STAMTYPE_COUNTER, "/EM/GC/Interpret/Success/Stoswd",     STAMUNIT_OCCURENCES,   "The number of times STOSWD was not interpreted.");
-
-    STAM_REG(pVM, &pStats->StatGCInterpretFailed,           STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed",            STAMUNIT_OCCURENCES,    "The number of times an instruction was not interpreted.");
-    STAM_REG(pVM, &pStats->StatHCInterpretFailed,           STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed",            STAMUNIT_OCCURENCES,    "The number of times an instruction was not interpreted.");
-
-    STAM_REG_USED(pVM, &pStats->StatGCFailedAnd,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/And",        STAMUNIT_OCCURENCES,    "The number of times AND was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedAnd,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/And",        STAMUNIT_OCCURENCES,    "The number of times AND was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedCpuId,          STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/CpuId",      STAMUNIT_OCCURENCES,    "The number of times CPUID was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedCpuId,          STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/CpuId",      STAMUNIT_OCCURENCES,    "The number of times CPUID was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedDec,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Dec",        STAMUNIT_OCCURENCES,    "The number of times DEC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedDec,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Dec",        STAMUNIT_OCCURENCES,    "The number of times DEC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedHlt,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Hlt",        STAMUNIT_OCCURENCES,    "The number of times HLT was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedHlt,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Hlt",        STAMUNIT_OCCURENCES,    "The number of times HLT was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedInc,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Inc",        STAMUNIT_OCCURENCES,    "The number of times INC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedInc,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Inc",        STAMUNIT_OCCURENCES,    "The number of times INC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedInvlPg,         STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/InvlPg",     STAMUNIT_OCCURENCES,    "The number of times INVLPG was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedInvlPg,         STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/InvlPg",     STAMUNIT_OCCURENCES,    "The number of times INVLPG was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedIret,           STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Iret",       STAMUNIT_OCCURENCES,    "The number of times IRET was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedIret,           STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Iret",       STAMUNIT_OCCURENCES,    "The number of times IRET was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedLLdt,           STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/LLdt",       STAMUNIT_OCCURENCES,    "The number of times LLDT was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedLLdt,           STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/LLdt",       STAMUNIT_OCCURENCES,    "The number of times LLDT was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedMov,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Mov",        STAMUNIT_OCCURENCES,    "The number of times MOV was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedMov,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Mov",        STAMUNIT_OCCURENCES,    "The number of times MOV was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedMovCRx,         STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/MovCRx",     STAMUNIT_OCCURENCES,    "The number of times MOV CRx was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedMovCRx,         STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/MovCRx",     STAMUNIT_OCCURENCES,    "The number of times MOV CRx was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedMovDRx,         STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/MovDRx",     STAMUNIT_OCCURENCES,    "The number of times MOV DRx was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedMovDRx,         STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/MovDRx",     STAMUNIT_OCCURENCES,    "The number of times MOV DRx was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedOr,             STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Or",         STAMUNIT_OCCURENCES,    "The number of times OR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedOr,             STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Or",         STAMUNIT_OCCURENCES,    "The number of times OR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedPop,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Pop",        STAMUNIT_OCCURENCES,    "The number of times POP was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedPop,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Pop",        STAMUNIT_OCCURENCES,    "The number of times POP was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedSti,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Sti",        STAMUNIT_OCCURENCES,    "The number of times STI was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedSti,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Sti",        STAMUNIT_OCCURENCES,    "The number of times STI was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedXchg,           STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Xchg",       STAMUNIT_OCCURENCES,    "The number of times XCHG was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedXchg,           STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Xchg",       STAMUNIT_OCCURENCES,    "The number of times XCHG was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedXor,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Xor",        STAMUNIT_OCCURENCES,    "The number of times XOR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedXor,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Xor",        STAMUNIT_OCCURENCES,    "The number of times XOR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedMonitor,        STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Monitor",    STAMUNIT_OCCURENCES,    "The number of times MONITOR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedMonitor,        STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Monitor",    STAMUNIT_OCCURENCES,    "The number of times MONITOR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedMWait,          STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/MWait",      STAMUNIT_OCCURENCES,    "The number of times MONITOR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedMWait,          STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/MWait",      STAMUNIT_OCCURENCES,    "The number of times MONITOR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedRdtsc,          STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Rdtsc",      STAMUNIT_OCCURENCES,    "The number of times RDTSC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedRdtsc,          STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Rdtsc",      STAMUNIT_OCCURENCES,    "The number of times RDTSC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedRdmsr,          STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Rdmsr",      STAMUNIT_OCCURENCES,    "The number of times RDMSR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedRdmsr,          STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Rdmsr",      STAMUNIT_OCCURENCES,    "The number of times RDMSR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedWrmsr,          STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Wrmsr",      STAMUNIT_OCCURENCES,    "The number of times WRMSR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedWrmsr,          STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Wrmsr",      STAMUNIT_OCCURENCES,    "The number of times WRMSR was not interpreted.");
-
-    STAM_REG_USED(pVM, &pStats->StatGCFailedMisc,           STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Misc",       STAMUNIT_OCCURENCES,    "The number of times some misc instruction was encountered.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedMisc,           STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Misc",       STAMUNIT_OCCURENCES,    "The number of times some misc instruction was encountered.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedAdd,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Add",        STAMUNIT_OCCURENCES,    "The number of times ADD was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedAdd,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Add",        STAMUNIT_OCCURENCES,    "The number of times ADD was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedAdc,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Adc",        STAMUNIT_OCCURENCES,    "The number of times ADC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedAdc,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Adc",        STAMUNIT_OCCURENCES,    "The number of times ADC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedBtr,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Btr",        STAMUNIT_OCCURENCES,    "The number of times BTR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedBtr,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Btr",        STAMUNIT_OCCURENCES,    "The number of times BTR was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedBts,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Bts",        STAMUNIT_OCCURENCES,    "The number of times BTS was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedBts,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Bts",        STAMUNIT_OCCURENCES,    "The number of times BTS was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedBtc,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Btc",        STAMUNIT_OCCURENCES,    "The number of times BTC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedBtc,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Btc",        STAMUNIT_OCCURENCES,    "The number of times BTC was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedCli,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Cli",        STAMUNIT_OCCURENCES,    "The number of times CLI was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedCli,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Cli",        STAMUNIT_OCCURENCES,    "The number of times CLI was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedCmpXchg,        STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/CmpXchg",    STAMUNIT_OCCURENCES,    "The number of times CMPXCHG was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedCmpXchg,        STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/CmpXchg",    STAMUNIT_OCCURENCES,    "The number of times CMPXCHG was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedCmpXchg8b,      STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/CmpXchg8b",  STAMUNIT_OCCURENCES,    "The number of times CMPXCHG8B was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedCmpXchg8b,      STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/CmpXchg8b",  STAMUNIT_OCCURENCES,    "The number of times CMPXCHG8B was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedXAdd,           STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/XAdd",       STAMUNIT_OCCURENCES,    "The number of times XADD was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedXAdd,           STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/XAdd",       STAMUNIT_OCCURENCES,    "The number of times XADD was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedMovNTPS,        STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/MovNTPS",    STAMUNIT_OCCURENCES,    "The number of times MOVNTPS was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedMovNTPS,        STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/MovNTPS",    STAMUNIT_OCCURENCES,    "The number of times MOVNTPS was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedStosWD,         STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/StosWD",     STAMUNIT_OCCURENCES,    "The number of times STOSWD was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedStosWD,         STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/StosWD",     STAMUNIT_OCCURENCES,    "The number of times STOSWD was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedSub,            STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Sub",        STAMUNIT_OCCURENCES,    "The number of times SUB was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedSub,            STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Sub",        STAMUNIT_OCCURENCES,    "The number of times SUB was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedWbInvd,         STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/WbInvd",     STAMUNIT_OCCURENCES,    "The number of times WBINVD was not interpreted.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedWbInvd,         STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/WbInvd",     STAMUNIT_OCCURENCES,    "The number of times WBINVD was not interpreted.");
-
-    STAM_REG_USED(pVM, &pStats->StatGCFailedUserMode,       STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/UserMode",   STAMUNIT_OCCURENCES,    "The number of rejections because of CPL.");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedUserMode,       STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/UserMode",   STAMUNIT_OCCURENCES,    "The number of rejections because of CPL.");
-    STAM_REG_USED(pVM, &pStats->StatGCFailedPrefix,         STAMTYPE_COUNTER, "/EM/GC/Interpret/Failed/Prefix",     STAMUNIT_OCCURENCES,    "The number of rejections because of prefix .");
-    STAM_REG_USED(pVM, &pStats->StatHCFailedPrefix,         STAMTYPE_COUNTER, "/EM/HC/Interpret/Failed/Prefix",     STAMUNIT_OCCURENCES,    "The number of rejections because of prefix .");
-
-    STAM_REG_USED(pVM, &pStats->StatCli,                    STAMTYPE_COUNTER, "/EM/HC/PrivInst/Cli",                STAMUNIT_OCCURENCES,    "Number of cli instructions.");
-    STAM_REG_USED(pVM, &pStats->StatSti,                    STAMTYPE_COUNTER, "/EM/HC/PrivInst/Sti",                STAMUNIT_OCCURENCES,    "Number of sli instructions.");
-    STAM_REG_USED(pVM, &pStats->StatIn,                     STAMTYPE_COUNTER, "/EM/HC/PrivInst/In",                 STAMUNIT_OCCURENCES,    "Number of in instructions.");
-    STAM_REG_USED(pVM, &pStats->StatOut,                    STAMTYPE_COUNTER, "/EM/HC/PrivInst/Out",                STAMUNIT_OCCURENCES,    "Number of out instructions.");
-    STAM_REG_USED(pVM, &pStats->StatHlt,                    STAMTYPE_COUNTER, "/EM/HC/PrivInst/Hlt",                STAMUNIT_OCCURENCES,    "Number of hlt instructions not handled in GC because of PATM.");
-    STAM_REG_USED(pVM, &pStats->StatInvlpg,                 STAMTYPE_COUNTER, "/EM/HC/PrivInst/Invlpg",             STAMUNIT_OCCURENCES,    "Number of invlpg instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMisc,                   STAMTYPE_COUNTER, "/EM/HC/PrivInst/Misc",               STAMUNIT_OCCURENCES,    "Number of misc. instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[0],          STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov CR0, X",         STAMUNIT_OCCURENCES,    "Number of mov CR0 read instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[1],          STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov CR1, X",         STAMUNIT_OCCURENCES,    "Number of mov CR1 read instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[2],          STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov CR2, X",         STAMUNIT_OCCURENCES,    "Number of mov CR2 read instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[3],          STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov CR3, X",         STAMUNIT_OCCURENCES,    "Number of mov CR3 read instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[4],          STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov CR4, X",         STAMUNIT_OCCURENCES,    "Number of mov CR4 read instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovReadCR[0],           STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov X, CR0",         STAMUNIT_OCCURENCES,    "Number of mov CR0 write instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovReadCR[1],           STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov X, CR1",         STAMUNIT_OCCURENCES,    "Number of mov CR1 write instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovReadCR[2],           STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov X, CR2",         STAMUNIT_OCCURENCES,    "Number of mov CR2 write instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovReadCR[3],           STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov X, CR3",         STAMUNIT_OCCURENCES,    "Number of mov CR3 write instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovReadCR[4],           STAMTYPE_COUNTER, "/EM/HC/PrivInst/Mov X, CR4",         STAMUNIT_OCCURENCES,    "Number of mov CR4 write instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovDRx,                 STAMTYPE_COUNTER, "/EM/HC/PrivInst/MovDRx",             STAMUNIT_OCCURENCES,    "Number of mov DRx instructions.");
-    STAM_REG_USED(pVM, &pStats->StatIret,                   STAMTYPE_COUNTER, "/EM/HC/PrivInst/Iret",               STAMUNIT_OCCURENCES,    "Number of iret instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovLgdt,                STAMTYPE_COUNTER, "/EM/HC/PrivInst/Lgdt",               STAMUNIT_OCCURENCES,    "Number of lgdt instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovLidt,                STAMTYPE_COUNTER, "/EM/HC/PrivInst/Lidt",               STAMUNIT_OCCURENCES,    "Number of lidt instructions.");
-    STAM_REG_USED(pVM, &pStats->StatMovLldt,                STAMTYPE_COUNTER, "/EM/HC/PrivInst/Lldt",               STAMUNIT_OCCURENCES,    "Number of lldt instructions.");
-    STAM_REG_USED(pVM, &pStats->StatSysEnter,               STAMTYPE_COUNTER, "/EM/HC/PrivInst/Sysenter",           STAMUNIT_OCCURENCES,    "Number of sysenter instructions.");
-    STAM_REG_USED(pVM, &pStats->StatSysExit,                STAMTYPE_COUNTER, "/EM/HC/PrivInst/Sysexit",            STAMUNIT_OCCURENCES,    "Number of sysexit instructions.");
-    STAM_REG_USED(pVM, &pStats->StatSysCall,                STAMTYPE_COUNTER, "/EM/HC/PrivInst/Syscall",            STAMUNIT_OCCURENCES,    "Number of syscall instructions.");
-    STAM_REG_USED(pVM, &pStats->StatSysRet,                 STAMTYPE_COUNTER, "/EM/HC/PrivInst/Sysret",             STAMUNIT_OCCURENCES,    "Number of sysret instructions.");
+    pVM->em.s.pStatsR3 = pStats;
+    pVM->em.s.pStatsR0 = MMHyperR3ToR0(pVM, pStats);
+    pVM->em.s.pStatsRC = MMHyperR3ToRC(pVM, pStats);
+
+    STAM_REG(pVM, &pStats->StatRZEmulate,               STAMTYPE_PROFILE, "/EM/RZ/Interpret",                   STAMUNIT_TICKS_PER_CALL, "Profiling of EMInterpretInstruction.");
+    STAM_REG(pVM, &pStats->StatR3Emulate,               STAMTYPE_PROFILE, "/EM/R3/Interpret",                   STAMUNIT_TICKS_PER_CALL, "Profiling of EMInterpretInstruction.");
+
+    STAM_REG(pVM, &pStats->StatRZInterpretSucceeded,    STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success",           STAMUNIT_OCCURENCES,    "The number of times an instruction was successfully interpreted.");
+    STAM_REG(pVM, &pStats->StatR3InterpretSucceeded,    STAMTYPE_COUNTER, "/EM/R3/Interpret/Success",           STAMUNIT_OCCURENCES,    "The number of times an instruction was successfully interpreted.");
+
+    STAM_REG_USED(pVM, &pStats->StatRZAnd,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/And",       STAMUNIT_OCCURENCES,    "The number of times AND was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3And,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/And",       STAMUNIT_OCCURENCES,    "The number of times AND was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZAdd,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Add",       STAMUNIT_OCCURENCES,    "The number of times ADD was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Add,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Add",       STAMUNIT_OCCURENCES,    "The number of times ADD was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZAdc,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Adc",       STAMUNIT_OCCURENCES,    "The number of times ADC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Adc,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Adc",       STAMUNIT_OCCURENCES,    "The number of times ADC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZSub,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Sub",       STAMUNIT_OCCURENCES,    "The number of times SUB was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Sub,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Sub",       STAMUNIT_OCCURENCES,    "The number of times SUB was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZCpuId,                STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/CpuId",     STAMUNIT_OCCURENCES,    "The number of times CPUID was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3CpuId,                STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/CpuId",     STAMUNIT_OCCURENCES,    "The number of times CPUID was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZDec,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Dec",       STAMUNIT_OCCURENCES,    "The number of times DEC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Dec,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Dec",       STAMUNIT_OCCURENCES,    "The number of times DEC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZHlt,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Hlt",       STAMUNIT_OCCURENCES,    "The number of times HLT was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Hlt,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Hlt",       STAMUNIT_OCCURENCES,    "The number of times HLT was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZInc,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Inc",       STAMUNIT_OCCURENCES,    "The number of times INC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Inc,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Inc",       STAMUNIT_OCCURENCES,    "The number of times INC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZInvlPg,               STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Invlpg",    STAMUNIT_OCCURENCES,    "The number of times INVLPG was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3InvlPg,               STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Invlpg",    STAMUNIT_OCCURENCES,    "The number of times INVLPG was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZIret,                 STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Iret",      STAMUNIT_OCCURENCES,    "The number of times IRET was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Iret,                 STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Iret",      STAMUNIT_OCCURENCES,    "The number of times IRET was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZLLdt,                 STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/LLdt",      STAMUNIT_OCCURENCES,    "The number of times LLDT was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3LLdt,                 STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/LLdt",      STAMUNIT_OCCURENCES,    "The number of times LLDT was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZMov,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Mov",       STAMUNIT_OCCURENCES,    "The number of times MOV was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Mov,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Mov",       STAMUNIT_OCCURENCES,    "The number of times MOV was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZMovCRx,               STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/MovCRx",    STAMUNIT_OCCURENCES,    "The number of times MOV CRx was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3MovCRx,               STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/MovCRx",    STAMUNIT_OCCURENCES,    "The number of times MOV CRx was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZMovDRx,               STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/MovDRx",    STAMUNIT_OCCURENCES,    "The number of times MOV DRx was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3MovDRx,               STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/MovDRx",    STAMUNIT_OCCURENCES,    "The number of times MOV DRx was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZOr,                   STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Or",        STAMUNIT_OCCURENCES,    "The number of times OR was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Or,                   STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Or",        STAMUNIT_OCCURENCES,    "The number of times OR was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZPop,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Pop",       STAMUNIT_OCCURENCES,    "The number of times POP was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Pop,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Pop",       STAMUNIT_OCCURENCES,    "The number of times POP was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZRdtsc,                STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Rdtsc",     STAMUNIT_OCCURENCES,    "The number of times RDTSC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Rdtsc,                STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Rdtsc",     STAMUNIT_OCCURENCES,    "The number of times RDTSC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZSti,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Sti",       STAMUNIT_OCCURENCES,    "The number of times STI was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Sti,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Sti",       STAMUNIT_OCCURENCES,    "The number of times STI was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZXchg,                 STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Xchg",      STAMUNIT_OCCURENCES,    "The number of times XCHG was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Xchg,                 STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Xchg",      STAMUNIT_OCCURENCES,    "The number of times XCHG was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZXor,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Xor",       STAMUNIT_OCCURENCES,    "The number of times XOR was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Xor,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Xor",       STAMUNIT_OCCURENCES,    "The number of times XOR was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZMonitor,              STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Monitor",   STAMUNIT_OCCURENCES,    "The number of times MONITOR was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Monitor,              STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Monitor",   STAMUNIT_OCCURENCES,    "The number of times MONITOR was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZMWait,                STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/MWait",     STAMUNIT_OCCURENCES,    "The number of times MWAIT was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3MWait,                STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/MWait",     STAMUNIT_OCCURENCES,    "The number of times MWAIT was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZBtr,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Btr",       STAMUNIT_OCCURENCES,    "The number of times BTR was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Btr,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Btr",       STAMUNIT_OCCURENCES,    "The number of times BTR was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZBts,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Bts",       STAMUNIT_OCCURENCES,    "The number of times BTS was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Bts,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Bts",       STAMUNIT_OCCURENCES,    "The number of times BTS was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZBtc,                  STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Btc",       STAMUNIT_OCCURENCES,    "The number of times BTC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Btc,                  STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Btc",       STAMUNIT_OCCURENCES,    "The number of times BTC was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZCmpXchg,              STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/CmpXchg",   STAMUNIT_OCCURENCES,    "The number of times CMPXCHG was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3CmpXchg,              STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/CmpXchg",   STAMUNIT_OCCURENCES,    "The number of times CMPXCHG was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZCmpXchg8b,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/CmpXchg8b",   STAMUNIT_OCCURENCES,  "The number of times CMPXCHG8B was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3CmpXchg8b,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/CmpXchg8b",   STAMUNIT_OCCURENCES,  "The number of times CMPXCHG8B was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZXAdd,                 STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/XAdd",      STAMUNIT_OCCURENCES,    "The number of times XADD was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3XAdd,                 STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/XAdd",      STAMUNIT_OCCURENCES,    "The number of times XADD was successfully interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Rdmsr,                STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Rdmsr",      STAMUNIT_OCCURENCES,   "The number of times RDMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZRdmsr,                STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Rdmsr",      STAMUNIT_OCCURENCES,   "The number of times RDMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3Wrmsr,                STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Wrmsr",      STAMUNIT_OCCURENCES,   "The number of times WRMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZWrmsr,                STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Wrmsr",      STAMUNIT_OCCURENCES,   "The number of times WRMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3StosWD,               STAMTYPE_COUNTER, "/EM/R3/Interpret/Success/Stoswd",     STAMUNIT_OCCURENCES,   "The number of times STOSWD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZStosWD,               STAMTYPE_COUNTER, "/EM/RZ/Interpret/Success/Stoswd",     STAMUNIT_OCCURENCES,   "The number of times STOSWD was not interpreted.");
+
+    STAM_REG(pVM, &pStats->StatRZInterpretFailed,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed",            STAMUNIT_OCCURENCES,    "The number of times an instruction was not interpreted.");
+    STAM_REG(pVM, &pStats->StatR3InterpretFailed,           STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed",            STAMUNIT_OCCURENCES,    "The number of times an instruction was not interpreted.");
+
+    STAM_REG_USED(pVM, &pStats->StatRZFailedAnd,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/And",        STAMUNIT_OCCURENCES,    "The number of times AND was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedAnd,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/And",        STAMUNIT_OCCURENCES,    "The number of times AND was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedCpuId,          STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/CpuId",      STAMUNIT_OCCURENCES,    "The number of times CPUID was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedCpuId,          STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/CpuId",      STAMUNIT_OCCURENCES,    "The number of times CPUID was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedDec,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Dec",        STAMUNIT_OCCURENCES,    "The number of times DEC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedDec,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Dec",        STAMUNIT_OCCURENCES,    "The number of times DEC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedHlt,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Hlt",        STAMUNIT_OCCURENCES,    "The number of times HLT was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedHlt,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Hlt",        STAMUNIT_OCCURENCES,    "The number of times HLT was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedInc,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Inc",        STAMUNIT_OCCURENCES,    "The number of times INC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedInc,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Inc",        STAMUNIT_OCCURENCES,    "The number of times INC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedInvlPg,         STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/InvlPg",     STAMUNIT_OCCURENCES,    "The number of times INVLPG was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedInvlPg,         STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/InvlPg",     STAMUNIT_OCCURENCES,    "The number of times INVLPG was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedIret,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Iret",       STAMUNIT_OCCURENCES,    "The number of times IRET was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedIret,           STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Iret",       STAMUNIT_OCCURENCES,    "The number of times IRET was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedLLdt,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/LLdt",       STAMUNIT_OCCURENCES,    "The number of times LLDT was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedLLdt,           STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/LLdt",       STAMUNIT_OCCURENCES,    "The number of times LLDT was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedMov,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Mov",        STAMUNIT_OCCURENCES,    "The number of times MOV was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedMov,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Mov",        STAMUNIT_OCCURENCES,    "The number of times MOV was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedMovCRx,         STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/MovCRx",     STAMUNIT_OCCURENCES,    "The number of times MOV CRx was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedMovCRx,         STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/MovCRx",     STAMUNIT_OCCURENCES,    "The number of times MOV CRx was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedMovDRx,         STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/MovDRx",     STAMUNIT_OCCURENCES,    "The number of times MOV DRx was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedMovDRx,         STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/MovDRx",     STAMUNIT_OCCURENCES,    "The number of times MOV DRx was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedOr,             STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Or",         STAMUNIT_OCCURENCES,    "The number of times OR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedOr,             STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Or",         STAMUNIT_OCCURENCES,    "The number of times OR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedPop,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Pop",        STAMUNIT_OCCURENCES,    "The number of times POP was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedPop,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Pop",        STAMUNIT_OCCURENCES,    "The number of times POP was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedSti,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Sti",        STAMUNIT_OCCURENCES,    "The number of times STI was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedSti,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Sti",        STAMUNIT_OCCURENCES,    "The number of times STI was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedXchg,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Xchg",       STAMUNIT_OCCURENCES,    "The number of times XCHG was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedXchg,           STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Xchg",       STAMUNIT_OCCURENCES,    "The number of times XCHG was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedXor,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Xor",        STAMUNIT_OCCURENCES,    "The number of times XOR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedXor,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Xor",        STAMUNIT_OCCURENCES,    "The number of times XOR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedMonitor,        STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Monitor",    STAMUNIT_OCCURENCES,    "The number of times MONITOR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedMonitor,        STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Monitor",    STAMUNIT_OCCURENCES,    "The number of times MONITOR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedMWait,          STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/MWait",      STAMUNIT_OCCURENCES,    "The number of times MONITOR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedMWait,          STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/MWait",      STAMUNIT_OCCURENCES,    "The number of times MONITOR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedRdtsc,          STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Rdtsc",      STAMUNIT_OCCURENCES,    "The number of times RDTSC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedRdtsc,          STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Rdtsc",      STAMUNIT_OCCURENCES,    "The number of times RDTSC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedRdmsr,          STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Rdmsr",      STAMUNIT_OCCURENCES,    "The number of times RDMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedRdmsr,          STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Rdmsr",      STAMUNIT_OCCURENCES,    "The number of times RDMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedWrmsr,          STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Wrmsr",      STAMUNIT_OCCURENCES,    "The number of times WRMSR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedWrmsr,          STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Wrmsr",      STAMUNIT_OCCURENCES,    "The number of times WRMSR was not interpreted.");
+
+    STAM_REG_USED(pVM, &pStats->StatRZFailedMisc,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Misc",       STAMUNIT_OCCURENCES,    "The number of times some misc instruction was encountered.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedMisc,           STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Misc",       STAMUNIT_OCCURENCES,    "The number of times some misc instruction was encountered.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedAdd,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Add",        STAMUNIT_OCCURENCES,    "The number of times ADD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedAdd,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Add",        STAMUNIT_OCCURENCES,    "The number of times ADD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedAdc,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Adc",        STAMUNIT_OCCURENCES,    "The number of times ADC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedAdc,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Adc",        STAMUNIT_OCCURENCES,    "The number of times ADC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedBtr,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Btr",        STAMUNIT_OCCURENCES,    "The number of times BTR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedBtr,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Btr",        STAMUNIT_OCCURENCES,    "The number of times BTR was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedBts,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Bts",        STAMUNIT_OCCURENCES,    "The number of times BTS was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedBts,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Bts",        STAMUNIT_OCCURENCES,    "The number of times BTS was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedBtc,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Btc",        STAMUNIT_OCCURENCES,    "The number of times BTC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedBtc,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Btc",        STAMUNIT_OCCURENCES,    "The number of times BTC was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedCli,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Cli",        STAMUNIT_OCCURENCES,    "The number of times CLI was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedCli,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Cli",        STAMUNIT_OCCURENCES,    "The number of times CLI was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedCmpXchg,        STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/CmpXchg",    STAMUNIT_OCCURENCES,    "The number of times CMPXCHG was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedCmpXchg,        STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/CmpXchg",    STAMUNIT_OCCURENCES,    "The number of times CMPXCHG was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedCmpXchg8b,      STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/CmpXchg8b",  STAMUNIT_OCCURENCES,    "The number of times CMPXCHG8B was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedCmpXchg8b,      STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/CmpXchg8b",  STAMUNIT_OCCURENCES,    "The number of times CMPXCHG8B was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedXAdd,           STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/XAdd",       STAMUNIT_OCCURENCES,    "The number of times XADD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedXAdd,           STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/XAdd",       STAMUNIT_OCCURENCES,    "The number of times XADD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedMovNTPS,        STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/MovNTPS",    STAMUNIT_OCCURENCES,    "The number of times MOVNTPS was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedMovNTPS,        STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/MovNTPS",    STAMUNIT_OCCURENCES,    "The number of times MOVNTPS was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedStosWD,         STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/StosWD",     STAMUNIT_OCCURENCES,    "The number of times STOSWD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedStosWD,         STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/StosWD",     STAMUNIT_OCCURENCES,    "The number of times STOSWD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedSub,            STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Sub",        STAMUNIT_OCCURENCES,    "The number of times SUB was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedSub,            STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Sub",        STAMUNIT_OCCURENCES,    "The number of times SUB was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedWbInvd,         STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/WbInvd",     STAMUNIT_OCCURENCES,    "The number of times WBINVD was not interpreted.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedWbInvd,         STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/WbInvd",     STAMUNIT_OCCURENCES,    "The number of times WBINVD was not interpreted.");
+
+    STAM_REG_USED(pVM, &pStats->StatRZFailedUserMode,       STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/UserMode",   STAMUNIT_OCCURENCES,    "The number of rejections because of CPL.");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedUserMode,       STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/UserMode",   STAMUNIT_OCCURENCES,    "The number of rejections because of CPL.");
+    STAM_REG_USED(pVM, &pStats->StatRZFailedPrefix,         STAMTYPE_COUNTER, "/EM/RZ/Interpret/Failed/Prefix",     STAMUNIT_OCCURENCES,    "The number of rejections because of prefix .");
+    STAM_REG_USED(pVM, &pStats->StatR3FailedPrefix,         STAMTYPE_COUNTER, "/EM/R3/Interpret/Failed/Prefix",     STAMUNIT_OCCURENCES,    "The number of rejections because of prefix .");
+
+    STAM_REG_USED(pVM, &pStats->StatCli,                    STAMTYPE_COUNTER, "/EM/R3/PrivInst/Cli",                STAMUNIT_OCCURENCES,    "Number of cli instructions.");
+    STAM_REG_USED(pVM, &pStats->StatSti,                    STAMTYPE_COUNTER, "/EM/R3/PrivInst/Sti",                STAMUNIT_OCCURENCES,    "Number of sli instructions.");
+    STAM_REG_USED(pVM, &pStats->StatIn,                     STAMTYPE_COUNTER, "/EM/R3/PrivInst/In",                 STAMUNIT_OCCURENCES,    "Number of in instructions.");
+    STAM_REG_USED(pVM, &pStats->StatOut,                    STAMTYPE_COUNTER, "/EM/R3/PrivInst/Out",                STAMUNIT_OCCURENCES,    "Number of out instructions.");
+    STAM_REG_USED(pVM, &pStats->StatHlt,                    STAMTYPE_COUNTER, "/EM/R3/PrivInst/Hlt",                STAMUNIT_OCCURENCES,    "Number of hlt instructions not handled in GC because of PATM.");
+    STAM_REG_USED(pVM, &pStats->StatInvlpg,                 STAMTYPE_COUNTER, "/EM/R3/PrivInst/Invlpg",             STAMUNIT_OCCURENCES,    "Number of invlpg instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMisc,                   STAMTYPE_COUNTER, "/EM/R3/PrivInst/Misc",               STAMUNIT_OCCURENCES,    "Number of misc. instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[0],          STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov CR0, X",         STAMUNIT_OCCURENCES,    "Number of mov CR0 read instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[1],          STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov CR1, X",         STAMUNIT_OCCURENCES,    "Number of mov CR1 read instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[2],          STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov CR2, X",         STAMUNIT_OCCURENCES,    "Number of mov CR2 read instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[3],          STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov CR3, X",         STAMUNIT_OCCURENCES,    "Number of mov CR3 read instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovWriteCR[4],          STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov CR4, X",         STAMUNIT_OCCURENCES,    "Number of mov CR4 read instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovReadCR[0],           STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov X, CR0",         STAMUNIT_OCCURENCES,    "Number of mov CR0 write instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovReadCR[1],           STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov X, CR1",         STAMUNIT_OCCURENCES,    "Number of mov CR1 write instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovReadCR[2],           STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov X, CR2",         STAMUNIT_OCCURENCES,    "Number of mov CR2 write instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovReadCR[3],           STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov X, CR3",         STAMUNIT_OCCURENCES,    "Number of mov CR3 write instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovReadCR[4],           STAMTYPE_COUNTER, "/EM/R3/PrivInst/Mov X, CR4",         STAMUNIT_OCCURENCES,    "Number of mov CR4 write instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovDRx,                 STAMTYPE_COUNTER, "/EM/R3/PrivInst/MovDRx",             STAMUNIT_OCCURENCES,    "Number of mov DRx instructions.");
+    STAM_REG_USED(pVM, &pStats->StatIret,                   STAMTYPE_COUNTER, "/EM/R3/PrivInst/Iret",               STAMUNIT_OCCURENCES,    "Number of iret instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovLgdt,                STAMTYPE_COUNTER, "/EM/R3/PrivInst/Lgdt",               STAMUNIT_OCCURENCES,    "Number of lgdt instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovLidt,                STAMTYPE_COUNTER, "/EM/R3/PrivInst/Lidt",               STAMUNIT_OCCURENCES,    "Number of lidt instructions.");
+    STAM_REG_USED(pVM, &pStats->StatMovLldt,                STAMTYPE_COUNTER, "/EM/R3/PrivInst/Lldt",               STAMUNIT_OCCURENCES,    "Number of lldt instructions.");
+    STAM_REG_USED(pVM, &pStats->StatSysEnter,               STAMTYPE_COUNTER, "/EM/R3/PrivInst/Sysenter",           STAMUNIT_OCCURENCES,    "Number of sysenter instructions.");
+    STAM_REG_USED(pVM, &pStats->StatSysExit,                STAMTYPE_COUNTER, "/EM/R3/PrivInst/Sysexit",            STAMUNIT_OCCURENCES,    "Number of sysexit instructions.");
+    STAM_REG_USED(pVM, &pStats->StatSysCall,                STAMTYPE_COUNTER, "/EM/R3/PrivInst/Syscall",            STAMUNIT_OCCURENCES,    "Number of syscall instructions.");
+    STAM_REG_USED(pVM, &pStats->StatSysRet,                 STAMTYPE_COUNTER, "/EM/R3/PrivInst/Sysret",             STAMUNIT_OCCURENCES,    "Number of sysret instructions.");
 
     STAM_REG(pVM, &pVM->em.s.StatTotalClis,             STAMTYPE_COUNTER, "/EM/Cli/Total",              STAMUNIT_OCCURENCES,     "Total number of cli instructions executed.");
@@ -327 +332 @@
 #endif /* VBOX_WITH_STATISTICS */
 
-/* these should be considered for release statistics. */
-    STAM_REG(pVM, &pVM->em.s.StatForcedActions,         STAMTYPE_PROFILE, "/PROF/EM/ForcedActions",     STAMUNIT_TICKS_PER_CALL, "Profiling forced action execution.");
+    /* these should be considered for release statistics. */
+    STAM_REL_REG(pVM, &pVM->em.s.StatForcedActions,     STAMTYPE_PROFILE, "/PROF/EM/ForcedActions",     STAMUNIT_TICKS_PER_CALL, "Profiling forced action execution.");
+    STAM_REG(pVM, &pVM->em.s.StatIOEmu,                 STAMTYPE_PROFILE, "/PROF/EM/Emulation/IO",      STAMUNIT_TICKS_PER_CALL, "Profiling of emR3RawExecuteIOInstruction.");
+    STAM_REG(pVM, &pVM->em.s.StatPrivEmu,               STAMTYPE_PROFILE, "/PROF/EM/Emulation/Priv",    STAMUNIT_TICKS_PER_CALL, "Profiling of emR3RawPrivileged.");
+    STAM_REG(pVM, &pVM->em.s.StatMiscEmu,               STAMTYPE_PROFILE, "/PROF/EM/Emulation/Misc",    STAMUNIT_TICKS_PER_CALL, "Profiling of emR3RawExecuteInstruction.");
+
     STAM_REL_REG(pVM, &pVM->em.s.StatHalted,            STAMTYPE_PROFILE, "/PROF/EM/Halted",            STAMUNIT_TICKS_PER_CALL, "Profiling halted state (VMR3WaitHalted).");
     STAM_REG(pVM, &pVM->em.s.StatHwAccEntry,            STAMTYPE_PROFILE, "/PROF/EM/HwAccEnter",        STAMUNIT_TICKS_PER_CALL, "Profiling Hardware Accelerated Mode entry overhead.");
     STAM_REG(pVM, &pVM->em.s.StatHwAccExec,             STAMTYPE_PROFILE, "/PROF/EM/HwAccExec",         STAMUNIT_TICKS_PER_CALL, "Profiling Hardware Accelerated Mode execution.");
-    STAM_REG(pVM, &pVM->em.s.StatIOEmu,                 STAMTYPE_PROFILE, "/PROF/EM/Emulation/IO",      STAMUNIT_TICKS_PER_CALL, "Profiling of emR3RawExecuteIOInstruction.");
-    STAM_REG(pVM, &pVM->em.s.StatPrivEmu,               STAMTYPE_PROFILE, "/PROF/EM/Emulation/Priv",    STAMUNIT_TICKS_PER_CALL, "Profiling of emR3RawPrivileged.");
-    STAM_REG(pVM, &pVM->em.s.StatMiscEmu,               STAMTYPE_PROFILE, "/PROF/EM/Emulation/Misc",    STAMUNIT_TICKS_PER_CALL, "Profiling of emR3RawExecuteInstruction.");
     STAM_REG(pVM, &pVM->em.s.StatREMEmu,                STAMTYPE_PROFILE, "/PROF/EM/REMEmuSingle",      STAMUNIT_TICKS_PER_CALL, "Profiling single instruction REM execution.");
     STAM_REG(pVM, &pVM->em.s.StatREMExec,               STAMTYPE_PROFILE, "/PROF/EM/REMExec",           STAMUNIT_TICKS_PER_CALL, "Profiling REM execution.");
     STAM_REG(pVM, &pVM->em.s.StatREMSync,               STAMTYPE_PROFILE, "/PROF/EM/REMSync",           STAMUNIT_TICKS_PER_CALL, "Profiling REM context syncing.");
-    STAM_REG(pVM, &pVM->em.s.StatREMTotal,              STAMTYPE_PROFILE, "/PROF/EM/REMTotal",          STAMUNIT_TICKS_PER_CALL, "Profiling emR3RemExecute (excluding FFs).");
+    STAM_REL_REG(pVM, &pVM->em.s.StatREMTotal,          STAMTYPE_PROFILE, "/PROF/EM/REMTotal",          STAMUNIT_TICKS_PER_CALL, "Profiling emR3RemExecute (excluding FFs).");
     STAM_REG(pVM, &pVM->em.s.StatRAWEntry,              STAMTYPE_PROFILE, "/PROF/EM/RAWEnter",          STAMUNIT_TICKS_PER_CALL, "Profiling Raw Mode entry overhead.");
     STAM_REG(pVM, &pVM->em.s.StatRAWExec,               STAMTYPE_PROFILE, "/PROF/EM/RAWExec",           STAMUNIT_TICKS_PER_CALL, "Profiling Raw Mode execution.");
     STAM_REG(pVM, &pVM->em.s.StatRAWTail,               STAMTYPE_PROFILE, "/PROF/EM/RAWTail",           STAMUNIT_TICKS_PER_CALL, "Profiling Raw Mode tail overhead.");
-    STAM_REG(pVM, &pVM->em.s.StatRAWTotal,              STAMTYPE_PROFILE, "/PROF/EM/RAWTotal",          STAMUNIT_TICKS_PER_CALL, "Profiling emR3RawExecute (excluding FFs).");
+    STAM_REL_REG(pVM, &pVM->em.s.StatRAWTotal,          STAMTYPE_PROFILE, "/PROF/EM/RAWTotal",          STAMUNIT_TICKS_PER_CALL, "Profiling emR3RawExecute (excluding FFs).");
     STAM_REL_REG(pVM, &pVM->em.s.StatTotal,         STAMTYPE_PROFILE_ADV, "/PROF/EM/Total",             STAMUNIT_TICKS_PER_CALL, "Profiling EMR3ExecuteVM.");
 
@@ -348 +354 @@
     return VINF_SUCCESS;
 }
-
 
 
@@ -361 +366 @@
 {
     LogFlow(("EMR3Relocate\n"));
-    if (pVM->em.s.pStatsHC)
-        pVM->em.s.pStatsGC = MMHyperHC2GC(pVM, pVM->em.s.pStatsHC);
+    if (pVM->em.s.pStatsR3)
+        pVM->em.s.pStatsRC = MMHyperR3ToRC(pVM, pVM->em.s.pStatsR3);
 }
 
@@ -434 +439 @@
         pVM->em.s.fForceRAW = false;
 
-    Assert(pVM->em.s.pCliStatTree == 0);
+    Assert(!pVM->em.s.pCliStatTree);
     return rc;
 }
@@ -455 +460 @@
     {
         case EMRAW_NONE:
-            pVM->fRawR3Enabled    = false;
-            pVM->fRawR0Enabled    = false;
+            pVM->fRawR3Enabled = false;
+            pVM->fRawR0Enabled = false;
             break;
         case EMRAW_RING3_ENABLE:
@@ -474 +479 @@
             return VERR_INVALID_PARAMETER;
     }
-    Log(("EMR3SetRawMode: fRawR3Enabled=%RTbool fRawR0Enabled=%RTbool pVM->fRawR3Enabled=%RTbool\n",
-          pVM->fRawR3Enabled, pVM->fRawR0Enabled, pVM->fRawR3Enabled));
+    Log(("EMR3SetRawMode: fRawR3Enabled=%RTbool fRawR0Enabled=%RTbool\n",
+          pVM->fRawR3Enabled, pVM->fRawR0Enabled));
     return pVM->em.s.enmState == EMSTATE_RAW ? VINF_EM_RESCHEDULE : VINF_SUCCESS;
 }
@@ -734 +739 @@
 }
 
+
 /**
  * Executes recompiled code.
@@ -759 +765 @@
         Log(("EMR%d: %08X ESP=%08X IF=%d CR0=%x\n", cpl, pCtx->eip, pCtx->esp, pCtx->eflags.Bits.u1IF, (uint32_t)pCtx->cr0));
 #endif
-    STAM_PROFILE_ADV_START(&pVM->em.s.StatREMTotal, a);
+    STAM_REL_PROFILE_ADV_START(&pVM->em.s.StatREMTotal, a);
 
 #if defined(VBOX_STRICT) && defined(DEBUG_bird)
@@ -852 +858 @@
                 fInREMState = false;
             }
-            STAM_PROFILE_ADV_SUSPEND(&pVM->em.s.StatREMTotal, a);
+            STAM_REL_PROFILE_ADV_SUSPEND(&pVM->em.s.StatREMTotal, a);
             rc = emR3ForcedActions(pVM, rc);
-            STAM_PROFILE_ADV_RESUME(&pVM->em.s.StatREMTotal, a);
+            STAM_REL_PROFILE_ADV_RESUME(&pVM->em.s.StatREMTotal, a);
             if (    rc != VINF_SUCCESS
                 &&  rc != VINF_EM_RESCHEDULE_REM)
@@ -876 +882 @@
     }
 
-    STAM_PROFILE_ADV_STOP(&pVM->em.s.StatREMTotal, a);
+    STAM_REL_PROFILE_ADV_STOP(&pVM->em.s.StatREMTotal, a);
     return rc;
 }
@@ -1058 +1064 @@
 
     Log(("Single step BEGIN:\n"));
-    for(uint32_t i=0;i<cIterations;i++)
+    for (uint32_t i = 0; i < cIterations; i++)
     {
         DBGFR3PrgStep(pVM);
@@ -1077 +1083 @@
 
     Log(("Single step BEGIN:\n"));
-    for(uint32_t i=0;i<cIterations;i++)
+    for (uint32_t i = 0; i < cIterations; i++)
     {
         DBGFR3PrgStep(pVM);
@@ -1096 +1102 @@
 
     Log(("Single step BEGIN:\n"));
-    for(uint32_t i=0;i<cIterations;i++)
+    for (uint32_t i = 0; i < cIterations; i++)
     {
         DBGFR3PrgStep(pVM);
@@ -1256 +1262 @@
         }
     }
-#endif
+#endif /* 0 */
     STAM_PROFILE_START(&pVM->em.s.StatREMEmu, a);
     rc = REMR3EmulateInstruction(pVM);
@@ -1312 +1318 @@
                 case OP_IN:
                 {
-                    STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatIn);
+                    STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->StatIn);
                     rc = IOMInterpretIN(pVM, CPUMCTX2CORE(pCtx), &Cpu);
                     break;
@@ -1319 +1325 @@
                 case OP_OUT:
                 {
-                    STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatOut);
+                    STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->StatOut);
                     rc = IOMInterpretOUT(pVM, CPUMCTX2CORE(pCtx), &Cpu);
                     break;
@@ -1332 +1338 @@
                 case OP_INSWD:
                 {
-                    STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatIn);
+                    STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->StatIn);
                     rc = IOMInterpretINS(pVM, CPUMCTX2CORE(pCtx), &Cpu);
                     break;
@@ -1340 +1346 @@
                 case OP_OUTSWD:
                 {
-                    STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatOut);
+                    STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->StatOut);
                     rc = IOMInterpretOUTS(pVM, CPUMCTX2CORE(pCtx), &Cpu);
                     break;
@@ -1392 +1398 @@
      */
     uint8_t         u8TrapNo;
-    TRPMEVENT       enmType;;
+    TRPMEVENT       enmType;
     RTGCUINT        uErrorCode;
     RTGCUINTPTR     uCR2;
@@ -1527 +1533 @@
         {
             case OP_SYSENTER:
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatSysEnter);
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->StatSysEnter);
                 break;
             case OP_SYSEXIT:
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatSysExit);
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->StatSysExit);
                 break;
             case OP_SYSCALL:
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatSysCall);
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->StatSysCall);
                 break;
             case OP_SYSRET:
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatSysRet);
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->StatSysRet);
                 break;
         }
@@ -1572 +1578 @@
         uErrorCode = 0;
     }
-    else
-    if (gcret == VINF_PATM_PATCH_TRAP_GP)
+    else if (gcret == VINF_PATM_PATCH_TRAP_GP)
     {
         /* No active trap in this case. Kind of ugly. */
@@ -1645 +1650 @@
             }
         }
-#endif
+#endif /* LOG_ENABLED */
         Log(("emR3PatchTrap: in patch: eip=%08x: trap=%02x err=%08x cr2=%08x cr0=%08x\n",
              pCtx->eip, u8TrapNo, uErrorCode, uCR2, (uint32_t)pCtx->cr0));
@@ -1795 +1800 @@
     {
 #ifdef VBOX_WITH_STATISTICS
-        PEMSTATS pStats = pVM->em.s.CTXSUFF(pStats);
+        PEMSTATS pStats = pVM->em.s.CTX_SUFF(pStats);
         switch (Cpu.pCurInstr->opcode)
         {
@@ -1869 +1874 @@
                 break;
         }
-#endif
+#endif /* VBOX_WITH_STATISTICS */
         if (    (pCtx->ss & X86_SEL_RPL) == 0
             &&  !pCtx->eflags.Bits.u1VM
@@ -2312 +2317 @@
 }
 
+
 /**
  * Check for pending raw actions
@@ -2428 +2434 @@
 static int emR3RawExecute(PVM pVM, bool *pfFFDone)
 {
-    STAM_PROFILE_ADV_START(&pVM->em.s.StatRAWTotal, a);
+    STAM_REL_PROFILE_ADV_START(&pVM->em.s.StatRAWTotal, a);
 
     int      rc = VERR_INTERNAL_ERROR;
@@ -2529 +2535 @@
         LogFlow(("RR0-E: %08X ESP=%08X IF=%d VMFlags=%x PIF=%d CPL=%d\n", pCtx->eip, pCtx->esp, pCtx->eflags.Bits.u1IF, pGCState->uVMFlags, pGCState->fPIF, (pCtx->ss & X86_SEL_RPL)));
         LogFlow(("VMMR3RawRunGC returned %Vrc\n", rc));
+
+
 
         /*
@@ -2605 +2613 @@
             Assert(pCtx->eflags.Bits.u1VM || (pCtx->ss & X86_SEL_RPL) != 1);
 
-            STAM_PROFILE_ADV_SUSPEND(&pVM->em.s.StatRAWTotal, a);
+            STAM_REL_PROFILE_ADV_SUSPEND(&pVM->em.s.StatRAWTotal, a);
             rc = emR3ForcedActions(pVM, rc);
-            STAM_PROFILE_ADV_RESUME(&pVM->em.s.StatRAWTotal, a);
+            STAM_REL_PROFILE_ADV_RESUME(&pVM->em.s.StatRAWTotal, a);
             if (    rc != VINF_SUCCESS
                 &&  rc != VINF_EM_RESCHEDULE_RAW)
@@ -2627 +2635 @@
     RTLogFlush(NULL);
 #endif
-    STAM_PROFILE_ADV_STOP(&pVM->em.s.StatRAWTotal, a);
+    STAM_REL_PROFILE_ADV_STOP(&pVM->em.s.StatRAWTotal, a);
     return rc;
 }
@@ -2678 +2686 @@
 
 #ifdef LOG_ENABLED
-        uint8_t u8Vector;
-
-        rc = TRPMQueryTrapAll(pVM, &u8Vector, 0, 0, 0);
-        if (rc == VINF_SUCCESS)
-        {
-            Log(("Pending hardware interrupt=0x%x ) cs:eip=%04X:%VGv\n", u8Vector, pCtx->cs, pCtx->rip));
-        }
         /*
          * Log important stuff before entering GC.
          */
+        if (TRPMHasTrap(pVM))
+            Log(("Pending hardware interrupt=0x%x cs:eip=%04X:%VGv\n", TRPMGetTrapNo(pVM), pCtx->cs, pCtx->rip));
+
         uint32_t cpl = CPUMGetGuestCPL(pVM, CPUMCTX2CORE(pCtx));
-
         if (pCtx->eflags.Bits.u1VM)
             Log(("HWV86: %08X IF=%d\n", pCtx->eip, pCtx->eflags.Bits.u1IF));
-        else
-        if (CPUMIsGuestIn64BitCode(pVM, CPUMCTX2CORE(pCtx)))
+        else if (CPUMIsGuestIn64BitCode(pVM, CPUMCTX2CORE(pCtx)))
             Log(("HWR%d: %04X:%VGv ESP=%VGv IF=%d CR0=%x CR4=%x EFER=%x\n", cpl, pCtx->cs, pCtx->rip, pCtx->rsp, pCtx->eflags.Bits.u1IF, (uint32_t)pCtx->cr0, (uint32_t)pCtx->cr4, (uint32_t)pCtx->msrEFER));
         else
             Log(("HWR%d: %04X:%08X ESP=%08X IF=%d CR0=%x CR4=%x EFER=%x\n", cpl, pCtx->cs, pCtx->eip, pCtx->esp, pCtx->eflags.Bits.u1IF, (uint32_t)pCtx->cr0, (uint32_t)pCtx->cr4, (uint32_t)pCtx->msrEFER));
-#endif
+#endif /* LOG_ENABLED */
 
         /*
@@ -2760 +2762 @@
  * @param   pCtx    The CPU context.
  */
-inline EMSTATE emR3Reschedule(PVM pVM, PCPUMCTX pCtx)
+DECLINLINE(EMSTATE) emR3Reschedule(PVM pVM, PCPUMCTX pCtx)
 {
     /*
@@ -2782 +2784 @@
             return EMSTATE_HWACC;
 
-        /** @note Raw mode and hw accelerated mode are incompatible. The latter turns off monitoring features essential for raw mode! */
+        /* Note: Raw mode and hw accelerated mode are incompatible. The latter turns
+         * off monitoring features essential for raw mode! */
         return EMSTATE_REM;
     }
 
-    /* Standard raw-mode:
+    /*
+     * Standard raw-mode:
      *
      * Here we only support 16 & 32 bits protected mode ring 3 code that has no IO privileges
@@ -2938 +2942 @@
 static int emR3ForcedActions(PVM pVM, int rc)
 {
+    STAM_REL_PROFILE_START(&pVM->em.s.StatForcedActions, a);
 #ifdef VBOX_STRICT
     int rcIrq = VINF_SUCCESS;
 #endif
-    STAM_PROFILE_START(&pVM->em.s.StatForcedActions, a);
-
+    int rc2;
 #define UPDATE_RC() \
-    do { \
-        AssertMsg(rc2 <= 0 || (rc2 >= VINF_EM_FIRST && rc2 <= VINF_EM_LAST), ("Invalid FF return code: %Vra\n", rc2)); \
-        if (rc2 == VINF_SUCCESS || rc < VINF_SUCCESS) \
-            break; \
-        if (!rc || rc2 < rc) \
-            rc = rc2; \
-    } while (0)
-
-    int rc2;
+        do { \
+            AssertMsg(rc2 <= 0 || (rc2 >= VINF_EM_FIRST && rc2 <= VINF_EM_LAST), ("Invalid FF return code: %Vra\n", rc2)); \
+            if (rc2 == VINF_SUCCESS || rc < VINF_SUCCESS) \
+                break; \
+            if (!rc || rc2 < rc) \
+                rc = rc2; \
+        } while (0)
 
     /*
@@ -2965 +2967 @@
         {
             Log2(("emR3ForcedActions: returns VINF_EM_TERMINATE\n"));
-            STAM_PROFILE_STOP(&pVM->em.s.StatForcedActions, a);
+            STAM_REL_PROFILE_STOP(&pVM->em.s.StatForcedActions, a);
             return VINF_EM_TERMINATE;
         }
@@ -3033 +3035 @@
             {
                 Log2(("emR3ForcedActions: returns %Vrc\n", rc2));
-                STAM_PROFILE_STOP(&pVM->em.s.StatForcedActions, a);
+                STAM_REL_PROFILE_STOP(&pVM->em.s.StatForcedActions, a);
                 return rc2;
             }
@@ -3049 +3051 @@
     /*
      * Execute polling function ever so often.
-     * THIS IS A HACK, IT WILL BE *REPLACED* BY PROPER ASYNC NETWORKING SOON!
+     * THIS IS A HACK, IT WILL BE *REPLACED* BY PROPER ASYNC NETWORKING "SOON"!
      */
     static unsigned cLast = 0;
@@ -3141 +3143 @@
         {
             Log2(("emR3ForcedActions: returns VINF_EM_TERMINATE\n"));
-            STAM_PROFILE_STOP(&pVM->em.s.StatForcedActions, a);
+            STAM_REL_PROFILE_STOP(&pVM->em.s.StatForcedActions, a);
             return VINF_EM_TERMINATE;
         }
@@ -3163 +3165 @@
 #undef UPDATE_RC
     Log2(("emR3ForcedActions: returns %Vrc\n", rc));
-    STAM_PROFILE_STOP(&pVM->em.s.StatForcedActions, a);
+    STAM_REL_PROFILE_STOP(&pVM->em.s.StatForcedActions, a);
     Assert(rcIrq == VINF_SUCCESS || rcIrq == rc);
     return rc;

trunk/src/VBox/VMM/EMInternal.h

@@ -49 +49 @@
 
 /**
- * Converts a EM pointer into a VM pointer.
- * @returns Pointer to the VM structure the EM is part of.
- * @param   pEM   Pointer to EM instance data.
- */
-#define EM2VM(pEM)  ( (PVM)((char*)pEM - pEM->offVM) )
-
-/**
  * Cli node structure
  */
@@ -73 +66 @@
 {
     /** GC: Profiling of EMInterpretInstruction(). */
-    STAMPROFILE             StatGCEmulate;
+    STAMPROFILE             StatRZEmulate;
     /** HC: Profiling of EMInterpretInstruction(). */
-    STAMPROFILE             StatHCEmulate;
+    STAMPROFILE             StatR3Emulate;
 
     /** @name Interpreter Instruction statistics.
      * @{
      */
-    STAMCOUNTER             StatGCInterpretSucceeded;
-    STAMCOUNTER             StatHCInterpretSucceeded;
-
-    STAMCOUNTER             StatGCAnd;
-    STAMCOUNTER             StatHCAnd;
-    STAMCOUNTER             StatGCCpuId;
-    STAMCOUNTER             StatHCCpuId;
-    STAMCOUNTER             StatGCDec;
-    STAMCOUNTER             StatHCDec;
-    STAMCOUNTER             StatGCHlt;
-    STAMCOUNTER             StatHCHlt;
-    STAMCOUNTER             StatGCInc;
-    STAMCOUNTER             StatHCInc;
-    STAMCOUNTER             StatGCInvlPg;
-    STAMCOUNTER             StatHCInvlPg;
-    STAMCOUNTER             StatGCIret;
-    STAMCOUNTER             StatHCIret;
-    STAMCOUNTER             StatGCLLdt;
-    STAMCOUNTER             StatHCLLdt;
-    STAMCOUNTER             StatGCMov;
-    STAMCOUNTER             StatHCMov;
-    STAMCOUNTER             StatGCMovCRx;
-    STAMCOUNTER             StatHCMovCRx;
-    STAMCOUNTER             StatGCMovDRx;
-    STAMCOUNTER             StatHCMovDRx;
-    STAMCOUNTER             StatGCOr;
-    STAMCOUNTER             StatHCOr;
-    STAMCOUNTER             StatGCPop;
-    STAMCOUNTER             StatHCPop;
-    STAMCOUNTER             StatGCSti;
-    STAMCOUNTER             StatHCSti;
-    STAMCOUNTER             StatGCXchg;
-    STAMCOUNTER             StatHCXchg;
-    STAMCOUNTER             StatGCXor;
-    STAMCOUNTER             StatHCXor;
-    STAMCOUNTER             StatGCMonitor;
-    STAMCOUNTER             StatHCMonitor;
-    STAMCOUNTER             StatGCMWait;
-    STAMCOUNTER             StatHCMWait;
-    STAMCOUNTER             StatGCAdd;
-    STAMCOUNTER             StatHCAdd;
-    STAMCOUNTER             StatGCSub;
-    STAMCOUNTER             StatHCSub;
-    STAMCOUNTER             StatGCAdc;
-    STAMCOUNTER             StatHCAdc;
-    STAMCOUNTER             StatGCRdtsc;
-    STAMCOUNTER             StatHCRdtsc;
-    STAMCOUNTER             StatGCBtr;
-    STAMCOUNTER             StatHCBtr;
-    STAMCOUNTER             StatGCBts;
-    STAMCOUNTER             StatHCBts;
-    STAMCOUNTER             StatGCBtc;
-    STAMCOUNTER             StatHCBtc;
-    STAMCOUNTER             StatGCCmpXchg;
-    STAMCOUNTER             StatHCCmpXchg;
-    STAMCOUNTER             StatGCCmpXchg8b;
-    STAMCOUNTER             StatHCCmpXchg8b;
-    STAMCOUNTER             StatGCXAdd;
-    STAMCOUNTER             StatHCXAdd;
-    STAMCOUNTER             StatGCClts;
-    STAMCOUNTER             StatHCClts;
-    STAMCOUNTER             StatGCStosWD;
-    STAMCOUNTER             StatHCStosWD;
-    STAMCOUNTER             StatHCRdmsr;
-    STAMCOUNTER             StatHCWrmsr;
-    STAMCOUNTER             StatGCRdmsr;
-    STAMCOUNTER             StatGCWrmsr;
-
-    STAMCOUNTER             StatGCInterpretFailed;
-    STAMCOUNTER             StatHCInterpretFailed;
-
-    STAMCOUNTER             StatGCFailedAnd;
-    STAMCOUNTER             StatHCFailedAnd;
-    STAMCOUNTER             StatGCFailedCpuId;
-    STAMCOUNTER             StatHCFailedCpuId;
-    STAMCOUNTER             StatGCFailedDec;
-    STAMCOUNTER             StatHCFailedDec;
-    STAMCOUNTER             StatGCFailedHlt;
-    STAMCOUNTER             StatHCFailedHlt;
-    STAMCOUNTER             StatGCFailedInc;
-    STAMCOUNTER             StatHCFailedInc;
-    STAMCOUNTER             StatGCFailedInvlPg;
-    STAMCOUNTER             StatHCFailedInvlPg;
-    STAMCOUNTER             StatGCFailedIret;
-    STAMCOUNTER             StatHCFailedIret;
-    STAMCOUNTER             StatGCFailedLLdt;
-    STAMCOUNTER             StatHCFailedLLdt;
-    STAMCOUNTER             StatGCFailedMisc;
-    STAMCOUNTER             StatHCFailedMisc;
-    STAMCOUNTER             StatGCFailedMov;
-    STAMCOUNTER             StatHCFailedMov;
-    STAMCOUNTER             StatGCFailedMovCRx;
-    STAMCOUNTER             StatHCFailedMovCRx;
-    STAMCOUNTER             StatGCFailedMovDRx;
-    STAMCOUNTER             StatHCFailedMovDRx;
-    STAMCOUNTER             StatGCFailedOr;
-    STAMCOUNTER             StatHCFailedOr;
-    STAMCOUNTER             StatGCFailedPop;
-    STAMCOUNTER             StatHCFailedPop;
-    STAMCOUNTER             StatGCFailedSti;
-    STAMCOUNTER             StatHCFailedSti;
-    STAMCOUNTER             StatGCFailedXchg;
-    STAMCOUNTER             StatHCFailedXchg;
-    STAMCOUNTER             StatGCFailedXor;
-    STAMCOUNTER             StatHCFailedXor;
-    STAMCOUNTER             StatGCFailedMonitor;
-    STAMCOUNTER             StatHCFailedMonitor;
-    STAMCOUNTER             StatGCFailedMWait;
-    STAMCOUNTER             StatHCFailedMWait;
-    STAMCOUNTER             StatHCFailedRdmsr;
-    STAMCOUNTER             StatHCFailedWrmsr;
-    STAMCOUNTER             StatGCFailedRdmsr;
-    STAMCOUNTER             StatGCFailedWrmsr;
-
-    STAMCOUNTER             StatGCFailedAdd;
-    STAMCOUNTER             StatHCFailedAdd;
-    STAMCOUNTER             StatGCFailedAdc;
-    STAMCOUNTER             StatHCFailedAdc;
-    STAMCOUNTER             StatGCFailedBtr;
-    STAMCOUNTER             StatHCFailedBtr;
-    STAMCOUNTER             StatGCFailedBts;
-    STAMCOUNTER             StatHCFailedBts;
-    STAMCOUNTER             StatGCFailedBtc;
-    STAMCOUNTER             StatHCFailedBtc;
-    STAMCOUNTER             StatGCFailedCli;
-    STAMCOUNTER             StatHCFailedCli;
-    STAMCOUNTER             StatGCFailedCmpXchg;
-    STAMCOUNTER             StatHCFailedCmpXchg;
-    STAMCOUNTER             StatGCFailedCmpXchg8b;
-    STAMCOUNTER             StatHCFailedCmpXchg8b;
-    STAMCOUNTER             StatGCFailedXAdd;
-    STAMCOUNTER             StatHCFailedXAdd;
-    STAMCOUNTER             StatHCFailedMovNTPS;
-    STAMCOUNTER             StatGCFailedMovNTPS;
-    STAMCOUNTER             StatGCFailedStosWD;
-    STAMCOUNTER             StatHCFailedStosWD;
-    STAMCOUNTER             StatGCFailedSub;
-    STAMCOUNTER             StatHCFailedSub;
-    STAMCOUNTER             StatGCFailedWbInvd;
-    STAMCOUNTER             StatHCFailedWbInvd;
-    STAMCOUNTER             StatGCFailedRdtsc;
-    STAMCOUNTER             StatHCFailedRdtsc;
-    STAMCOUNTER             StatGCFailedClts;
-    STAMCOUNTER             StatHCFailedClts;
-
-    STAMCOUNTER             StatGCFailedUserMode;
-    STAMCOUNTER             StatHCFailedUserMode;
-    STAMCOUNTER             StatGCFailedPrefix;
-    STAMCOUNTER             StatHCFailedPrefix;
+    STAMCOUNTER             StatRZInterpretSucceeded;
+    STAMCOUNTER             StatR3InterpretSucceeded;
+
+    STAMCOUNTER             StatRZAnd;
+    STAMCOUNTER             StatR3And;
+    STAMCOUNTER             StatRZCpuId;
+    STAMCOUNTER             StatR3CpuId;
+    STAMCOUNTER             StatRZDec;
+    STAMCOUNTER             StatR3Dec;
+    STAMCOUNTER             StatRZHlt;
+    STAMCOUNTER             StatR3Hlt;
+    STAMCOUNTER             StatRZInc;
+    STAMCOUNTER             StatR3Inc;
+    STAMCOUNTER             StatRZInvlPg;
+    STAMCOUNTER             StatR3InvlPg;
+    STAMCOUNTER             StatRZIret;
+    STAMCOUNTER             StatR3Iret;
+    STAMCOUNTER             StatRZLLdt;
+    STAMCOUNTER             StatR3LLdt;
+    STAMCOUNTER             StatRZMov;
+    STAMCOUNTER             StatR3Mov;
+    STAMCOUNTER             StatRZMovCRx;
+    STAMCOUNTER             StatR3MovCRx;
+    STAMCOUNTER             StatRZMovDRx;
+    STAMCOUNTER             StatR3MovDRx;
+    STAMCOUNTER             StatRZOr;
+    STAMCOUNTER             StatR3Or;
+    STAMCOUNTER             StatRZPop;
+    STAMCOUNTER             StatR3Pop;
+    STAMCOUNTER             StatRZSti;
+    STAMCOUNTER             StatR3Sti;
+    STAMCOUNTER             StatRZXchg;
+    STAMCOUNTER             StatR3Xchg;
+    STAMCOUNTER             StatRZXor;
+    STAMCOUNTER             StatR3Xor;
+    STAMCOUNTER             StatRZMonitor;
+    STAMCOUNTER             StatR3Monitor;
+    STAMCOUNTER             StatRZMWait;
+    STAMCOUNTER             StatR3MWait;
+    STAMCOUNTER             StatRZAdd;
+    STAMCOUNTER             StatR3Add;
+    STAMCOUNTER             StatRZSub;
+    STAMCOUNTER             StatR3Sub;
+    STAMCOUNTER             StatRZAdc;
+    STAMCOUNTER             StatR3Adc;
+    STAMCOUNTER             StatRZRdtsc;
+    STAMCOUNTER             StatR3Rdtsc;
+    STAMCOUNTER             StatRZBtr;
+    STAMCOUNTER             StatR3Btr;
+    STAMCOUNTER             StatRZBts;
+    STAMCOUNTER             StatR3Bts;
+    STAMCOUNTER             StatRZBtc;
+    STAMCOUNTER             StatR3Btc;
+    STAMCOUNTER             StatRZCmpXchg;
+    STAMCOUNTER             StatR3CmpXchg;
+    STAMCOUNTER             StatRZCmpXchg8b;
+    STAMCOUNTER             StatR3CmpXchg8b;
+    STAMCOUNTER             StatRZXAdd;
+    STAMCOUNTER             StatR3XAdd;
+    STAMCOUNTER             StatRZClts;
+    STAMCOUNTER             StatR3Clts;
+    STAMCOUNTER             StatRZStosWD;
+    STAMCOUNTER             StatR3StosWD;
+    STAMCOUNTER             StatR3Rdmsr;
+    STAMCOUNTER             StatR3Wrmsr;
+    STAMCOUNTER             StatRZRdmsr;
+    STAMCOUNTER             StatRZWrmsr;
+
+    STAMCOUNTER             StatRZInterpretFailed;
+    STAMCOUNTER             StatR3InterpretFailed;
+
+    STAMCOUNTER             StatRZFailedAnd;
+    STAMCOUNTER             StatR3FailedAnd;
+    STAMCOUNTER             StatRZFailedCpuId;
+    STAMCOUNTER             StatR3FailedCpuId;
+    STAMCOUNTER             StatRZFailedDec;
+    STAMCOUNTER             StatR3FailedDec;
+    STAMCOUNTER             StatRZFailedHlt;
+    STAMCOUNTER             StatR3FailedHlt;
+    STAMCOUNTER             StatRZFailedInc;
+    STAMCOUNTER             StatR3FailedInc;
+    STAMCOUNTER             StatRZFailedInvlPg;
+    STAMCOUNTER             StatR3FailedInvlPg;
+    STAMCOUNTER             StatRZFailedIret;
+    STAMCOUNTER             StatR3FailedIret;
+    STAMCOUNTER             StatRZFailedLLdt;
+    STAMCOUNTER             StatR3FailedLLdt;
+    STAMCOUNTER             StatRZFailedMisc;
+    STAMCOUNTER             StatR3FailedMisc;
+    STAMCOUNTER             StatRZFailedMov;
+    STAMCOUNTER             StatR3FailedMov;
+    STAMCOUNTER             StatRZFailedMovCRx;
+    STAMCOUNTER             StatR3FailedMovCRx;
+    STAMCOUNTER             StatRZFailedMovDRx;
+    STAMCOUNTER             StatR3FailedMovDRx;
+    STAMCOUNTER             StatRZFailedOr;
+    STAMCOUNTER             StatR3FailedOr;
+    STAMCOUNTER             StatRZFailedPop;
+    STAMCOUNTER             StatR3FailedPop;
+    STAMCOUNTER             StatRZFailedSti;
+    STAMCOUNTER             StatR3FailedSti;
+    STAMCOUNTER             StatRZFailedXchg;
+    STAMCOUNTER             StatR3FailedXchg;
+    STAMCOUNTER             StatRZFailedXor;
+    STAMCOUNTER             StatR3FailedXor;
+    STAMCOUNTER             StatRZFailedMonitor;
+    STAMCOUNTER             StatR3FailedMonitor;
+    STAMCOUNTER             StatRZFailedMWait;
+    STAMCOUNTER             StatR3FailedMWait;
+    STAMCOUNTER             StatR3FailedRdmsr;
+    STAMCOUNTER             StatR3FailedWrmsr;
+    STAMCOUNTER             StatRZFailedRdmsr;
+    STAMCOUNTER             StatRZFailedWrmsr;
+
+    STAMCOUNTER             StatRZFailedAdd;
+    STAMCOUNTER             StatR3FailedAdd;
+    STAMCOUNTER             StatRZFailedAdc;
+    STAMCOUNTER             StatR3FailedAdc;
+    STAMCOUNTER             StatRZFailedBtr;
+    STAMCOUNTER             StatR3FailedBtr;
+    STAMCOUNTER             StatRZFailedBts;
+    STAMCOUNTER             StatR3FailedBts;
+    STAMCOUNTER             StatRZFailedBtc;
+    STAMCOUNTER             StatR3FailedBtc;
+    STAMCOUNTER             StatRZFailedCli;
+    STAMCOUNTER             StatR3FailedCli;
+    STAMCOUNTER             StatRZFailedCmpXchg;
+    STAMCOUNTER             StatR3FailedCmpXchg;
+    STAMCOUNTER             StatRZFailedCmpXchg8b;
+    STAMCOUNTER             StatR3FailedCmpXchg8b;
+    STAMCOUNTER             StatRZFailedXAdd;
+    STAMCOUNTER             StatR3FailedXAdd;
+    STAMCOUNTER             StatR3FailedMovNTPS;
+    STAMCOUNTER             StatRZFailedMovNTPS;
+    STAMCOUNTER             StatRZFailedStosWD;
+    STAMCOUNTER             StatR3FailedStosWD;
+    STAMCOUNTER             StatRZFailedSub;
+    STAMCOUNTER             StatR3FailedSub;
+    STAMCOUNTER             StatRZFailedWbInvd;
+    STAMCOUNTER             StatR3FailedWbInvd;
+    STAMCOUNTER             StatRZFailedRdtsc;
+    STAMCOUNTER             StatR3FailedRdtsc;
+    STAMCOUNTER             StatRZFailedClts;
+    STAMCOUNTER             StatR3FailedClts;
+
+    STAMCOUNTER             StatRZFailedUserMode;
+    STAMCOUNTER             StatR3FailedUserMode;
+    STAMCOUNTER             StatRZFailedPrefix;
+    STAMCOUNTER             StatR3FailedPrefix;
     /** @} */
 
@@ -253 +246 @@
     /** @} */
 
-} EMSTATS, *PEMSTATS;
+} EMSTATS;
+/** Pointer to the excessive EM statistics. */
+typedef EMSTATS *PEMSTATS;
+
+
+/**
+ * Converts a EM pointer into a VM pointer.
+ * @returns Pointer to the VM structure the EM is part of.
+ * @param   pEM   Pointer to EM instance data.
+ */
+#define EM2VM(pEM)  ( (PVM)((char*)pEM - pEM->offVM) )
 
 /**
@@ -266 +269 @@
 
     /** Execution Manager State. */
-    volatile EMSTATE        enmState;
+    EMSTATE volatile        enmState;
     /** Force raw-mode execution.
      * This is used to prevent REM from trying to execute patch code.
@@ -286 +289 @@
 
 
-    /** Pointer to the PATM status structure. (HC Ptr) */
-    R3R0PTRTYPE(PPATMGCSTATE) pPatmGCState;
-
-    /** Pointer to the guest CPUM state. (HC Ptr) */
-    R3R0PTRTYPE(PCPUMCTX)     pCtx;
+    /** Pointer to the PATM status structure. (R3 Ptr) */
+    R3PTRTYPE(PPATMGCSTATE) pPatmGCState;
+
+    /** Pointer to the guest CPUM state. (R3 Ptr) */
+    R3PTRTYPE(PCPUMCTX)     pCtx;
 
 #if GC_ARCH_BITS == 64
-    RTGCPTR                   aPadding1;
+    RTGCPTR                 aPadding1;
 #endif
 
@@ -325 +328 @@
     /** @} */
 
-    /** HC: Profiling of emR3RawExecuteIOInstruction. */
+    /** R3: Profiling of emR3RawExecuteIOInstruction. */
     STAMPROFILE             StatIOEmu;
-    /** HC: Profiling of emR3RawPrivileged. */
+    /** R3: Profiling of emR3RawPrivileged. */
     STAMPROFILE             StatPrivEmu;
-    /** HC: Profiling of emR3RawExecuteInstruction. */
+    /** R3: Profiling of emR3RawExecuteInstruction. */
     STAMPROFILE             StatMiscEmu;
-
-    /** @todo r=bird: Are any of these actually used? */
-    STAMCOUNTER             StatPatchTrap;
-    STAMCOUNTER             StatPatchInt3;
-    STAMCOUNTER             StatPatchIF0;
-    STAMCOUNTER             StatPatchEmulate;
-    STAMCOUNTER             StatPageOutOfSync;
+    /** R3: Number of time emR3HwAccExecute is called. */
     STAMCOUNTER             StatHwAccExecuteEntry;
 
-    /** More statistics (HC). */
-    R3R0PTRTYPE(PEMSTATS)   pStatsHC;
-    /** More statistics (GC). */
-    RCPTRTYPE(PEMSTATS)     pStatsGC;
+    /** More statistics (R3). */
+    R3PTRTYPE(PEMSTATS)     pStatsR3;
+    /** More statistics (R0). */
+    R0PTRTYPE(PEMSTATS)     pStatsR0;
+    /** More statistics (RC). */
+    RCPTRTYPE(PEMSTATS)     pStatsRC;
 #if HC_ARCH_BITS == 64
     RTRCPTR                 padding0;
@@ -349 +348 @@
 
     /** Tree for keeping track of cli occurances (debug only). */
-    R3PTRTYPE(PAVLPVNODECORE) pCliStatTree;
+    R3PTRTYPE(PAVLPVNODECORE)   pCliStatTree;
     STAMCOUNTER             StatTotalClis;
 #if 0

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

@@ -128 +128 @@
     return pVM->dbgf.s.fSingleSteppingRaw;
 }
+

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

@@ -49 +49 @@
 
 /*******************************************************************************
-*   Structures and Typedefs                                                    *
-*******************************************************************************/
-
-
-/*******************************************************************************
 *   Internal Functions                                                         *
 *******************************************************************************/
@@ -59 +54 @@
 
 
+
 /**
  * Get the current execution manager status.
@@ -69 +65 @@
 }
 
+
 /**
  * Flushes the REM translation blocks the next time we execute code there.
  *
  * @param   pVM         The VM handle.
+ *
+ * @todo    This doesn't belong here, it should go in REMAll.cpp!
  */
 EMDECL(void) EMFlushREMTBs(PVM pVM)
@@ -81 +80 @@
 
 #ifndef IN_GC
+
 /**
  * Read callback for disassembly function; supports reading bytes that cross a page boundary
@@ -95 +95 @@
     DISCPUSTATE  *pCpu     = (DISCPUSTATE *)pvUserdata;
     PVM           pVM      = (PVM)pCpu->apvUserData[0];
-#ifdef IN_RING0
+# ifdef IN_RING0
     int rc = PGMPhysReadGCPtr(pVM, pDest, pSrc, cb);
     AssertMsgRC(rc, ("PGMPhysReadGCPtr failed for pSrc=%VGv cb=%x\n", pSrc, cb));
-#else
+# else /* IN_RING3 */
     if (!PATMIsPatchGCAddr(pVM, pSrc))
     {
@@ -115 +115 @@
         }
     }
-#endif /* IN_RING0 */
+# endif /* IN_RING3 */
     return VINF_SUCCESS;
 }
@@ -124 +124 @@
 }
 
-#else
+#else /* IN_GC */
 
 DECLINLINE(int) emDisCoreOne(PVM pVM, DISCPUSTATE *pCpu, RTGCUINTPTR InstrGC, uint32_t *pOpsize)
@@ -131 +131 @@
 }
 
-#endif
+#endif /* IN_GC */
 
 
@@ -227 +227 @@
 }
 
+
 /**
  * Interprets the current instruction using the supplied DISCPUSTATE structure.
@@ -254 +255 @@
 EMDECL(int) EMInterpretInstructionCPU(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
-    STAM_PROFILE_START(&CTXMID(pVM->em.s.CTXSUFF(pStats)->Stat,Emulate), a);
+    STAM_PROFILE_START(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Emulate), a);
     int rc = emInterpretInstructionCPU(pVM, pCpu, pRegFrame, pvFault, pcbSize);
-    STAM_PROFILE_STOP(&CTXMID(pVM->em.s.CTXSUFF(pStats)->Stat,Emulate), a);
+    STAM_PROFILE_STOP(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Emulate), a);
     if (VBOX_SUCCESS(rc))
-        STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,InterpretSucceeded));
+        STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,InterpretSucceeded));
     else
-        STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,InterpretFailed));
+        STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,InterpretFailed));
     return rc;
 }
@@ -312 +313 @@
 #endif
 }
+
 
 DECLINLINE(int) emRamWrite(PVM pVM, RTGCPTR GCDest, void *pSrc, uint32_t cb)
@@ -343 +345 @@
 }
 
+
 /* Convert sel:addr to a flat GC address */
 static RTGCPTR emConvertToFlatAddr(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu, POP_PARAMETER pParam, RTGCPTR pvAddr)
@@ -349 +352 @@
     return SELMToFlat(pVM, enmPrefixSeg, pRegFrame, pvAddr);
 }
+
 
 #if defined(VBOX_STRICT) || defined(LOG_ENABLED)
@@ -378 +382 @@
         case OP_RDMSR:      return "Rdmsr";
         case OP_WRMSR:      return "Wrmsr";
+        case OP_ADD:        return "Add";
         case OP_ADC:        return "Adc";
-        case OP_BTC:        return "Btc";
+        case OP_SUB:        return "Sub";
+        case OP_SBB:        return "Sbb";
         case OP_RDTSC:      return "Rdtsc";
         case OP_STI:        return "Sti";
@@ -385 +391 @@
         case OP_HLT:        return "Hlt";
         case OP_IRET:       return "Iret";
-        case OP_CMPXCHG:    return "CmpXchg";
-        case OP_CMPXCHG8B:  return "CmpXchg8b";
         case OP_MOVNTPS:    return "MovNTPS";
         case OP_STOSWD:     return "StosWD";
@@ -393 +397 @@
         case OP_BTR:        return "Btr";
         case OP_BTS:        return "Bts";
+        case OP_BTC:        return "Btc";
+        case OP_CMPXCHG:    return pCpu->prefix & PREFIX_LOCK ? "Lock CmpXchg"   : "CmpXchg";
+        case OP_CMPXCHG8B:  return pCpu->prefix & PREFIX_LOCK ? "Lock CmpXchg8b" : "CmpXchg8b";
+
         default:
             Log(("Unknown opcode %d\n", pCpu->pCurInstr->opcode));
@@ -398 +406 @@
     }
 }
-#endif
+#endif /* VBOX_STRICT || LOG_ENABLED */
+
 
 /**
@@ -538 +547 @@
 }
 
+
 /**
  * INC and DEC emulation.
  */
 static int emInterpretIncDec(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize,
-                             PFN_EMULATE_PARAM2 pfnEmulate)
+                             PFNEMULATEPARAM2 pfnEmulate)
 {
     OP_PARAMVAL param1;
@@ -605 +615 @@
     return VERR_EM_INTERPRETER;
 }
+
 
 /**
@@ -694 +705 @@
  */
 static int emInterpretOrXorAnd(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize,
-                               PFN_EMULATE_PARAM3 pfnEmulate)
+                               PFNEMULATEPARAM3 pfnEmulate)
 {
     OP_PARAMVAL param1, param2;
@@ -705 +716 @@
         return VERR_EM_INTERPRETER;
 
-#ifdef LOG_ENABLED
-    const char *pszInstr;
-
-    if (pCpu->pCurInstr->opcode == OP_XOR)
-        pszInstr = "Xor";
-    else if (pCpu->pCurInstr->opcode == OP_OR)
-        pszInstr = "Or";
-    else if (pCpu->pCurInstr->opcode == OP_AND)
-        pszInstr = "And";
-    else
-        pszInstr = "OrXorAnd??";
-#endif
-
 #ifdef IN_GC
     if (TRPMHasTrap(pVM))
@@ -731 +729 @@
                 if (pCpu->param1.size < pCpu->param2.size)
                 {
-                    AssertMsgFailed(("%s at %VGv parameter mismatch %d vs %d!!\n", pszInstr, pRegFrame->rip, pCpu->param1.size, pCpu->param2.size)); /* should never happen! */
+                    AssertMsgFailed(("%s at %VGv parameter mismatch %d vs %d!!\n", emGetMnemonic(pCpu), pRegFrame->rip, pCpu->param1.size, pCpu->param2.size)); /* should never happen! */
                     return VERR_EM_INTERPRETER;
                 }
@@ -774 +772 @@
             }
 
-            LogFlow(("emInterpretOrXorAnd %s %VGv %RX64 - %RX64 size %d (%d)\n", pszInstr, pParam1, valpar1, valpar2, param2.size, param1.size));
+            LogFlow(("emInterpretOrXorAnd %s %VGv %RX64 - %RX64 size %d (%d)\n", emGetMnemonic(pCpu), pParam1, valpar1, valpar2, param2.size, param1.size));
 
             /* Data read, emulate instruction. */
             uint32_t eflags = pfnEmulate(&valpar1, valpar2, param2.size);
 
-            LogFlow(("emInterpretOrXorAnd %s result %RX64\n", pszInstr, valpar1));
+            LogFlow(("emInterpretOrXorAnd %s result %RX64\n", emGetMnemonic(pCpu), valpar1));
 
             /* Update guest's eflags and finish. */
@@ -799 +797 @@
     return VERR_EM_INTERPRETER;
 }
+
 
 /**
@@ -880 +879 @@
 }
 
+
 /**
  * ADD, ADC & SUB Emulation.
  */
 static int emInterpretAddSub(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize,
-                             PFN_EMULATE_PARAM3 pfnEmulate)
+                             PFNEMULATEPARAM3 pfnEmulate)
 {
     OP_PARAMVAL param1, param2;
@@ -895 +895 @@
         return VERR_EM_INTERPRETER;
 
-#ifdef LOG_ENABLED
-    const char *pszInstr;
-
-    if (pCpu->pCurInstr->opcode == OP_SUB)
-        pszInstr = "Sub";
-    else if (pCpu->pCurInstr->opcode == OP_ADD)
-        pszInstr = "Add";
-    else if (pCpu->pCurInstr->opcode == OP_ADC)
-        pszInstr = "Adc";
-    else
-        pszInstr = "AddSub??";
-#endif
-
 #ifdef IN_GC
     if (TRPMHasTrap(pVM))
@@ -921 +908 @@
                 if (pCpu->param1.size < pCpu->param2.size)
                 {
-                    AssertMsgFailed(("%s at %VGv parameter mismatch %d vs %d!!\n", pszInstr, pRegFrame->rip, pCpu->param1.size, pCpu->param2.size)); /* should never happen! */
+                    AssertMsgFailed(("%s at %VGv parameter mismatch %d vs %d!!\n", emGetMnemonic(pCpu), pRegFrame->rip, pCpu->param1.size, pCpu->param2.size)); /* should never happen! */
                     return VERR_EM_INTERPRETER;
                 }
@@ -988 +975 @@
 }
 
+
 /**
  * ADC Emulation.
@@ -999 +987 @@
 }
 
+
 /**
  * BTR/C/S Emulation.
  */
 static int emInterpretBitTest(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize,
-                              PFN_EMULATE_PARAM2_UINT32 pfnEmulate)
+                              PFNEMULATEPARAM2UINT32 pfnEmulate)
 {
     OP_PARAMVAL param1, param2;
@@ -1014 +1003 @@
         return VERR_EM_INTERPRETER;
 
-#ifdef LOG_ENABLED
-    const char *pszInstr;
-
-    if (pCpu->pCurInstr->opcode == OP_BTR)
-        pszInstr = "Btr";
-    else if (pCpu->pCurInstr->opcode == OP_BTS)
-        pszInstr = "Bts";
-    else if (pCpu->pCurInstr->opcode == OP_BTC)
-        pszInstr = "Btc";
-    else
-        pszInstr = "Bit??";
-#endif
-
 #ifdef IN_GC
     if (TRPMHasTrap(pVM))
@@ -1056 +1032 @@
             }
 
-            Log2(("emInterpret%s: pvFault=%VGv pParam1=%VGv val2=%x\n", pszInstr, pvFault, pParam1, valpar2));
+            Log2(("emInterpret%s: pvFault=%VGv pParam1=%VGv val2=%x\n", emGetMnemonic(pCpu), pvFault, pParam1, valpar2));
             pParam1 = (RTGCPTR)((RTGCUINTPTR)pParam1 + valpar2/8);
 #ifdef IN_GC
@@ -1093 +1069 @@
     return VERR_EM_INTERPRETER;
 }
+
 
 /**
@@ -1171 +1148 @@
     return VINF_SUCCESS;
 }
+
 
 /**
@@ -1311 +1289 @@
     return VERR_EM_INTERPRETER;
 }
+
 
 #ifndef IN_GC
@@ -1452 +1431 @@
 
 
-/*
+/**
  * [LOCK] CMPXCHG emulation.
  */
@@ -1459 +1438 @@
 {
     OP_PARAMVAL param1, param2;
-
-#ifdef LOG_ENABLED
-    const char *pszInstr;
-
-    if (pCpu->prefix & PREFIX_LOCK)
-        pszInstr = "Lock CmpXchg";
-    else
-        pszInstr = "CmpXchg";
-#endif
 
     /* Source to make DISQueryParamVal read the register value - ugly hack */
@@ -1511 +1481 @@
     }
 
-    LogFlow(("%s %VGv rax=%RX64 %RX64\n", pszInstr, GCPtrPar1, pRegFrame->rax, valpar));
+    LogFlow(("%s %VGv rax=%RX64 %RX64\n", emGetMnemonic(pCpu), GCPtrPar1, pRegFrame->rax, valpar));
 
     if (pCpu->prefix & PREFIX_LOCK)
@@ -1518 +1488 @@
         eflags = EMEmulateCmpXchg(pvParam1, &pRegFrame->rax, valpar, pCpu->param2.size);
 
-    LogFlow(("%s %VGv rax=%RX64 %RX64 ZF=%d\n", pszInstr, GCPtrPar1, pRegFrame->rax, valpar, !!(eflags & X86_EFL_ZF)));
+    LogFlow(("%s %VGv rax=%RX64 %RX64 ZF=%d\n", emGetMnemonic(pCpu), GCPtrPar1, pRegFrame->rax, valpar, !!(eflags & X86_EFL_ZF)));
 
     /* Update guest's eflags and finish. */
@@ -1528 +1498 @@
 }
 
-#else
+#else /* IN_GC */
 static int emInterpretCmpXchg(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
     Assert(pCpu->mode != CPUMODE_64BIT);    /** @todo check */
     OP_PARAMVAL param1, param2;
-
-#ifdef LOG_ENABLED
-    const char *pszInstr;
-
-    if (pCpu->prefix & PREFIX_LOCK)
-        pszInstr = "Lock CmpXchg";
-    else
-        pszInstr = "CmpXchg";
-#endif
 
     /* Source to make DISQueryParamVal read the register value - ugly hack */
@@ -1584 +1545 @@
             }
 
-            LogFlow(("%s %VRv eax=%08x %08x\n", pszInstr, pParam1, pRegFrame->eax, valpar));
+            LogFlow(("%s %VRv eax=%08x %08x\n", emGetMnemonic(pCpu), pParam1, pRegFrame->eax, valpar));
 
             MMGCRamRegisterTrapHandler(pVM);
@@ -1595 +1556 @@
             if (VBOX_FAILURE(rc))
             {
-                Log(("%s %VGv eax=%08x %08x -> emulation failed due to page fault!\n", pszInstr, pParam1, pRegFrame->eax, valpar));
+                Log(("%s %VGv eax=%08x %08x -> emulation failed due to page fault!\n", emGetMnemonic(pCpu), pParam1, pRegFrame->eax, valpar));
                 return VERR_EM_INTERPRETER;
             }
 
-            LogFlow(("%s %VRv eax=%08x %08x ZF=%d\n", pszInstr, pParam1, pRegFrame->eax, valpar, !!(eflags & X86_EFL_ZF)));
+            LogFlow(("%s %VRv eax=%08x %08x ZF=%d\n", emGetMnemonic(pCpu), pParam1, pRegFrame->eax, valpar, !!(eflags & X86_EFL_ZF)));
 
             /* Update guest's eflags and finish. */
@@ -1619 +1580 @@
     Assert(pCpu->mode != CPUMODE_64BIT);    /** @todo check */
     OP_PARAMVAL param1;
-
-#ifdef LOG_ENABLED
-    const char *pszInstr;
-
-    if (pCpu->prefix & PREFIX_LOCK)
-        pszInstr = "Lock CmpXchg8b";
-    else
-        pszInstr = "CmpXchg8b";
-#endif
 
     /* Source to make DISQueryParamVal read the register value - ugly hack */
@@ -1656 +1608 @@
             }
 
-            LogFlow(("%s %VRv=%08x eax=%08x\n", pszInstr, pParam1, pRegFrame->eax));
+            LogFlow(("%s %VRv=%08x eax=%08x\n", emGetMnemonic(pCpu), pParam1, pRegFrame->eax));
 
             MMGCRamRegisterTrapHandler(pVM);
@@ -1667 +1619 @@
             if (VBOX_FAILURE(rc))
             {
-                Log(("%s %VGv=%08x eax=%08x -> emulation failed due to page fault!\n", pszInstr, pParam1, pRegFrame->eax));
+                Log(("%s %VGv=%08x eax=%08x -> emulation failed due to page fault!\n", emGetMnemonic(pCpu), pParam1, pRegFrame->eax));
                 return VERR_EM_INTERPRETER;
             }
 
-            LogFlow(("%s %VGv=%08x eax=%08x ZF=%d\n", pszInstr, pParam1, pRegFrame->eax, !!(eflags & X86_EFL_ZF)));
+            LogFlow(("%s %VGv=%08x eax=%08x ZF=%d\n", emGetMnemonic(pCpu), pParam1, pRegFrame->eax, !!(eflags & X86_EFL_ZF)));
 
             /* Update guest's eflags and finish; note that *only* ZF is affected. */
@@ -1683 +1635 @@
     return VERR_EM_INTERPRETER;
 }
-#endif
-
-/*
+#endif /* IN_GC */
+
+
+/**
  * [LOCK] XADD emulation.
  */
@@ -1755 +1708 @@
     return VERR_EM_INTERPRETER;
 }
-#endif
+#endif /* IN_GC */
+
 
 #ifdef IN_GC
@@ -1809 +1763 @@
     return VINF_SUCCESS;
 }
-#endif
+#endif /* IN_GC */
+
 
 /**
@@ -1820 +1775 @@
 }
 
-/**
- * INVLPG Emulation.
- */
 
 /**
@@ -1855 +1807 @@
 }
 
+
+/**
+ * INVLPG Emulation.
+ */
 static int emInterpretInvlPg(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
@@ -1893 +1849 @@
 }
 
-/**
- * CPUID Emulation.
- */
 
 /**
@@ -1915 +1868 @@
 }
 
+
+/**
+ * CPUID Emulation.
+ */
 static int emInterpretCpuId(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
@@ -1921 +1878 @@
 }
 
-/**
- * MOV CRx Emulation.
- */
 
 /**
@@ -2016 +1970 @@
 }
 
+/**
+ * CLTS Emulation.
+ */
 static int emInterpretClts(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
     return EMInterpretCLTS(pVM);
 }
+
 
 /**
@@ -2165 +2123 @@
 }
 
+
+/**
+ * MOV CRx
+ */
 static int emInterpretMovCRx(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
@@ -2177 +2139 @@
 }
 
-/**
- * MOV DRx
- */
 
 /**
@@ -2218 +2177 @@
 }
 
+
 /**
  * Interpret DRx read
@@ -2247 +2207 @@
 }
 
+
+/**
+ * MOV DRx
+ */
 static int emInterpretMovDRx(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
@@ -2265 +2229 @@
     return rc;
 }
+
 
 /**
@@ -2305 +2270 @@
 }
 
+
 #ifdef IN_GC
 /**
@@ -2341 +2307 @@
 }
 
-
-/**
- * RDTSC Emulation.
- */
 
 /**
@@ -2370 +2332 @@
 }
 
+
+/**
+ * RDTSC Emulation.
+ */
 static int emInterpretRdtsc(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
     return EMInterpretRdtsc(pVM, pRegFrame);
 }
+
 
 /**
@@ -2423 +2390 @@
 }
 
+
 #ifdef LOG_ENABLED
-static const char *emMSRtoString(unsigned uMsr)
-{
-    switch(uMsr)
+static const char *emMSRtoString(uint32_t uMsr)
+{
+    switch (uMsr)
     {
     case MSR_IA32_APICBASE:
@@ -2487 +2455 @@
     return "Unknown MSR";
 }
-#endif
+#endif /* LOG_ENABLED */
+
 
 /**
@@ -2599 +2568 @@
 }
 
+
 /**
  * RDMSR Emulation.
@@ -2609 +2579 @@
 }
 
+
 /**
  * Interpret WRMSR
@@ -2615 +2586 @@
  * @param   pVM         The VM handle.
  * @param   pRegFrame   The register frame.
- *
  */
 EMDECL(int) EMInterpretWrmsr(PVM pVM, PCPUMCTXCORE pRegFrame)
@@ -2732 +2702 @@
 }
 
+
 /**
  * WRMSR Emulation.
@@ -2739 +2710 @@
     return EMInterpretWrmsr(pVM, pRegFrame);
 }
+
 
 /**
@@ -2759 +2731 @@
     {
         Log(("WARNING: refusing instruction emulation for user-mode code!!\n"));
-        STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,FailedUserMode));
+        STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,FailedUserMode));
         return VERR_EM_INTERPRETER;
     }
@@ -2786 +2758 @@
     {
         //Log(("EMInterpretInstruction: wrong prefix!!\n"));
-        STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,FailedPrefix));
+        STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,FailedPrefix));
         return VERR_EM_INTERPRETER;
     }
@@ -2803 +2775 @@
                 rc = emInterpret##InstrFn(pVM, pCpu, pRegFrame, pvFault, pcbSize, pfnEmulate); \
             if (VBOX_SUCCESS(rc)) \
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,Instr)); \
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Instr)); \
             else \
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,Failed##Instr)); \
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Failed##Instr)); \
             return rc
 #define INTERPRET_CASE_EX_PARAM3(opcode, Instr, InstrFn, pfnEmulate) \
@@ -2811 +2783 @@
             rc = emInterpret##InstrFn(pVM, pCpu, pRegFrame, pvFault, pcbSize, pfnEmulate); \
             if (VBOX_SUCCESS(rc)) \
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,Instr)); \
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Instr)); \
             else \
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,Failed##Instr)); \
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Failed##Instr)); \
             return rc
 
@@ -2825 +2797 @@
             rc = emInterpret##Instr(pVM, pCpu, pRegFrame, pvFault, pcbSize); \
             if (VBOX_SUCCESS(rc)) \
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,Instr)); \
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Instr)); \
             else \
-                STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,Failed##Instr)); \
+                STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Failed##Instr)); \
             return rc
 #define INTERPRET_STAT_CASE(opcode, Instr) \
-        case opcode: STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,Failed##Instr)); return VERR_EM_INTERPRETER;
+        case opcode: STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,Failed##Instr)); return VERR_EM_INTERPRETER;
 
         INTERPRET_CASE(OP_XCHG,Xchg);
@@ -2878 +2850 @@
         default:
             Log3(("emInterpretInstructionCPU: opcode=%d\n", pCpu->pCurInstr->opcode));
-            STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->CTXMID(Stat,FailedMisc));
+            STAM_COUNTER_INC(&pVM->em.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,FailedMisc));
             return VERR_EM_INTERPRETER;
 #undef INTERPRET_CASE_EX_PARAM2
@@ -2920 +2892 @@
     return pVM->em.s.GCPtrInhibitInterrupts;
 }
+

trunk/src/VBox/VMM/VMMAll/EMAllA.asm

@@ -30 +30 @@
 ; The register we use for value pointers (And,Or,Dec,Inc).
 %ifdef RT_ARCH_AMD64
-%define MY_PTR_REG  rcx
+ %define MY_PTR_REG     rcx
 %else
-%define MY_PTR_REG  ecx
+ %define MY_PTR_REG     ecx
 %endif
 
@@ -38 +38 @@
 ; The register we return the result in.
 %ifdef RT_ARCH_AMD64
-%define MY_RET_REG  rax
+ %define MY_RET_REG     rax
 %else
-%define MY_RET_REG  eax
+ %define MY_RET_REG     eax
 %endif
 
@@ -239 +239 @@
 ENDPROC     EMEmulateOr
 
+
 ;;
 ; Emulate LOCK OR instruction.
@@ -310 +311 @@
     pop     dword [eax]
 %endif
-    mov     eax, VINF_SUCCESS     
+    mov     eax, VINF_SUCCESS
     retn
 
 %ifdef IN_GC
-; #PF resume point. 
+; #PF resume point.
 GLOBALNAME EMEmulateLockOr_Error
     mov     eax, VERR_ACCESS_DENIED
@@ -321 +322 @@
 
 ENDPROC     EMEmulateLockOr
+
 
 ;;
@@ -386 +388 @@
 ENDPROC     EMEmulateXor
 
+
 ;;
 ; Emulate INC instruction, CDECL calling conv.
@@ -511 +514 @@
 ENDPROC     EMEmulateDec
 
+
 ;;
 ; Emulate ADD instruction, CDECL calling conv.
@@ -575 +579 @@
 ENDPROC     EMEmulateAdd
 
+
 ;;
 ; Emulate ADC instruction, CDECL calling conv.
@@ -643 +648 @@
 ENDPROC     EMEmulateAdcWithCarrySet
 
+
 ;;
 ; Emulate SUB instruction, CDECL calling conv.
@@ -773 +779 @@
 
 %ifdef IN_GC
-; #PF resume point. 
+; #PF resume point.
 GLOBALNAME EMEmulateLockBtr_Error
     mov     eax, VERR_ACCESS_DENIED
@@ -781 +787 @@
 ENDPROC     EMEmulateLockBtr
 
+
 ;;
 ; Emulate BTC instruction, CDECL calling conv.
@@ -810 +817 @@
     retn
 ENDPROC     EMEmulateBtc
+
 
 ;;
@@ -929 +937 @@
 ENDPROC     EMEmulateLockCmpXchg
 
+
 ;;
 ; Emulate CMPXCHG instruction, CDECL calling conv.
@@ -1016 +1025 @@
 ENDPROC     EMEmulateCmpXchg
 
+
 %if 0
 ;; not tested!!

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

@@ -763 +763 @@
  * @param   pfnEmulate  Instruction emulation function.
  */
-static int iomInterpretOrXorAnd(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange, PFN_EMULATE_PARAM3 pfnEmulate)
+static int iomInterpretOrXorAnd(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, PDISCPUSTATE pCpu, PIOMMMIORANGE pRange, PFNEMULATEPARAM3 pfnEmulate)
 {
     unsigned    cb     = 0;

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -121 +121 @@
     GEN_CHECK_OFF(EM, StatForcedActions);
     GEN_CHECK_OFF(EM, StatTotalClis);
-    GEN_CHECK_OFF(EM, pStatsHC);
-    GEN_CHECK_OFF(EM, pStatsGC);
+    GEN_CHECK_OFF(EM, pStatsR3);
+    GEN_CHECK_OFF(EM, pStatsR0);
+    GEN_CHECK_OFF(EM, pStatsRC);
     GEN_CHECK_OFF(EM, pCliStatTree);