Changeset 56080 in vbox for trunk/src/VBox/VMM/VMMRC

Timestamp:

May 26, 2015 2:36:27 PM (10 years ago)

Author:

vboxsync

Message:

IOM,HM: Let IEM take over the MMIO handling from IOM when VBOX_WITH_2ND_IEM_STEP is defined (currently disabled).

File:

• trunk/src/VBox/VMM/VMMRC/IOMRC.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMRC/IOMRC.cpp

@@ -27 +27 @@
 #include <VBox/vmm/mm.h>
 #include <VBox/vmm/em.h>
+#include <VBox/vmm/iem.h>
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/trpm.h>
@@ -40 +41 @@
 #include <iprt/asm.h>
 #include <iprt/string.h>
+
+
+#ifdef VBOX_WITH_2ND_IEM_STEP
+/**
+ * Converts disassembler mode to IEM mode.
+ * @return IEM CPU mode.
+ * @param  enmDisMode   Disassembler CPU mode.
+ */
+DECLINLINE(IEMMODE) iomDisModeToIemMode(DISCPUMODE enmDisMode)
+{
+    switch (enmDisMode)
+    {
+        case DISCPUMODE_16BIT: return IEMMODE_16BIT;
+        case DISCPUMODE_32BIT: return IEMMODE_32BIT;
+        case DISCPUMODE_64BIT: return IEMMODE_64BIT;
+        default:
+            AssertFailed();
+            return IEMMODE_32BIT;
+    }
+}
+#endif
 
 
@@ -178 +200 @@
 static VBOXSTRICTRC iomRCInterpretINS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
+#ifdef VBOX_WITH_2ND_IEM_STEP
+    uint8_t cbValue = pCpu->pCurInstr->uOpcode == OP_INSB ? 1
+                    : pCpu->uOpMode == DISCPUMODE_16BIT ? 2 : 4;       /* dword in both 32 & 64 bits mode */
+    return IEMExecStringIoRead(pVCpu,
+                               cbValue,
+                               iomDisModeToIemMode((DISCPUMODE)pCpu->uCpuMode),
+                               RT_BOOL(pCpu->fPrefix & (DISPREFIX_REPNE | DISPREFIX_REP)),
+                               pCpu->cbInstr);
+#else
     /*
      * Get port number directly from the register (no need to bother the
@@ -197 +228 @@
 
     return IOMInterpretINSEx(pVM, pVCpu, pRegFrame, Port, pCpu->fPrefix, (DISCPUMODE)pCpu->uAddrMode, cb);
+#endif
 }
 
@@ -222 +254 @@
 static VBOXSTRICTRC iomRCInterpretOUTS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
+#ifdef VBOX_WITH_2ND_IEM_STEP
+    uint8_t cbValue = pCpu->pCurInstr->uOpcode == OP_OUTSB ? 1
+                    : pCpu->uOpMode == DISCPUMODE_16BIT ? 2 : 4;       /* dword in both 32 & 64 bits mode */
+    return IEMExecStringIoWrite(pVCpu,
+                                cbValue,
+                                iomDisModeToIemMode((DISCPUMODE)pCpu->uCpuMode),
+                                RT_BOOL(pCpu->fPrefix & (DISPREFIX_REPNE | DISPREFIX_REP)),
+                                pCpu->cbInstr,
+                                pCpu->fPrefix & DISPREFIX_SEG ? pCpu->idxSegPrefix : X86_SREG_DS);
+#else
     /*
      * Get port number from the first parameter.
@@ -227 +269 @@
      */
     uint64_t    Port = 0;
-    unsigned    cb;
     bool fRc = iomGetRegImmData(pCpu, &pCpu->Param1, pRegFrame, &Port, &cb);
     AssertMsg(fRc, ("Failed to get reg/imm port number!\n")); NOREF(fRc);
+    unsigned cb;
     if (pCpu->pCurInstr->uOpcode == OP_OUTSB)
         cb = 1;
@@ -243 +285 @@
 
     return IOMInterpretOUTSEx(pVM, pVCpu, pRegFrame, Port, pCpu->fPrefix, (DISCPUMODE)pCpu->uAddrMode, cb);
+#endif
 }