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

Timestamp:

May 7, 2016 5:55:21 PM (9 years ago)

Author:

vboxsync

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

107086

Message:

IOMRC.cpp,++: Use IEM for IN and OUT too, cleaning out unnecessary code.

Location:

trunk/src/VBox/VMM/VMMRC

Files:

• IOMRC.cpp (modified) (8 diffs)
• TRPMRCHandlers.cpp (modified) (1 diff)

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

@@ -43 +43 @@
 
 
-#ifdef VBOX_WITH_3RD_IEM_STEP
 /**
  * Converts disassembler mode to IEM mode.
@@ -61 +60 @@
     }
 }
-#endif
-
 
 
@@ -85 +82 @@
 static VBOXSTRICTRC iomRCInterpretIN(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-#ifdef IN_RC
     STAM_COUNTER_INC(&pVM->iom.s.StatInstIn);
-#endif
-
-    /*
-     * Get port number from second parameter.
-     * And get the register size from the first parameter.
-     */
-    uint64_t    uPort = 0;
-    unsigned    cbSize = 0;
-    bool fRc = iomGetRegImmData(pCpu, &pCpu->Param2, pRegFrame, &uPort, &cbSize);
-    AssertMsg(fRc, ("Failed to get reg/imm port number!\n")); NOREF(fRc);
-
-    cbSize = DISGetParamSize(pCpu, &pCpu->Param1);
-    Assert(cbSize > 0);
-    VBOXSTRICTRC rcStrict = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, uPort, cbSize);
-    if (rcStrict == VINF_SUCCESS)
-    {
-        /*
-         * Attempt to read the port.
-         */
-        uint32_t u32Data = UINT32_C(0xffffffff);
-        rcStrict = IOMIOPortRead(pVM, pVCpu, uPort, &u32Data, cbSize);
-        if (IOM_SUCCESS(rcStrict))
-        {
-            /*
-             * Store the result in the AL|AX|EAX register.
-             */
-            fRc = iomSaveDataToReg(pCpu, &pCpu->Param1, pRegFrame, u32Data);
-            AssertMsg(fRc, ("Failed to store register value!\n")); NOREF(fRc);
-        }
-        else
-            AssertMsg(rcStrict == VINF_IOM_R3_IOPORT_READ || RT_FAILURE(rcStrict), ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-    }
-    else
-        AssertMsg(rcStrict == VINF_EM_RAW_GUEST_TRAP || rcStrict == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rcStrict), ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-
-    return rcStrict;
+    Assert(pCpu->Param2.fUse & (DISUSE_IMMEDIATE8 | DISUSE_REG_GEN16));
+    uint16_t u16Port = pCpu->Param2.fUse & DISUSE_REG_GEN16 ? pRegFrame->dx : (uint16_t)pCpu->Param2.uValue;
+
+    Assert(pCpu->Param1.fUse & (DISUSE_REG_GEN32 | DISUSE_REG_GEN16 | DISUSE_REG_GEN8));
+    uint8_t cbValue = pCpu->Param1.fUse & DISUSE_REG_GEN32 ? 4 : pCpu->Param1.fUse & DISUSE_REG_GEN16 ? 2 : 1;
+
+    return IEMExecDecodedIn(pVCpu, pCpu->cbInstr, u16Port, cbValue);
 }
 
@@ -147 +114 @@
 static VBOXSTRICTRC iomRCInterpretOUT(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-#ifdef IN_RC
     STAM_COUNTER_INC(&pVM->iom.s.StatInstOut);
-#endif
-
-    /*
-     * Get port number from first parameter.
-     * And get the register size and value from the second parameter.
-     */
-    uint64_t    uPort = 0;
-    unsigned    cbSize = 0;
-    bool fRc = iomGetRegImmData(pCpu, &pCpu->Param1, pRegFrame, &uPort, &cbSize);
-    AssertMsg(fRc, ("Failed to get reg/imm port number!\n")); NOREF(fRc);
-
-    VBOXSTRICTRC rcStrict = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, uPort, cbSize);
-    if (rcStrict == VINF_SUCCESS)
-    {
-        uint64_t u64Data = 0;
-        fRc = iomGetRegImmData(pCpu, &pCpu->Param2, pRegFrame, &u64Data, &cbSize);
-        AssertMsg(fRc, ("Failed to get reg value!\n")); NOREF(fRc);
-
-        /*
-         * Attempt to write to the port.
-         */
-        rcStrict = IOMIOPortWrite(pVM, pVCpu, uPort, u64Data, cbSize);
-        AssertMsg(rcStrict == VINF_SUCCESS || rcStrict == VINF_IOM_R3_IOPORT_WRITE || rcStrict == VINF_IOM_R3_IOPORT_COMMIT_WRITE
-                  || (rcStrict >= VINF_EM_FIRST && rcStrict <= VINF_EM_LAST) || RT_FAILURE(rcStrict),
-                  ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-    }
-    else
-        AssertMsg(rcStrict == VINF_EM_RAW_GUEST_TRAP || rcStrict == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rcStrict), ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-    return rcStrict;
+    Assert(pCpu->Param1.fUse & (DISUSE_IMMEDIATE8 | DISUSE_REG_GEN16));
+    uint16_t const u16Port = pCpu->Param1.fUse & DISUSE_REG_GEN16 ? pRegFrame->dx : (uint16_t)pCpu->Param1.uValue;
+
+    Assert(pCpu->Param2.fUse & (DISUSE_REG_GEN32 | DISUSE_REG_GEN16 | DISUSE_REG_GEN8));
+    uint8_t const cbValue = pCpu->Param2.fUse & DISUSE_REG_GEN32 ? 4 : pCpu->Param2.fUse & DISUSE_REG_GEN16 ? 2 : 1;
+
+    return IEMExecDecodedOut(pVCpu, pCpu->cbInstr, u16Port, cbValue);
 }
 
@@ -203 +147 @@
 static VBOXSTRICTRC iomRCInterpretINS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-#ifdef VBOX_WITH_3RD_IEM_STEP
     uint8_t cbValue = pCpu->pCurInstr->uOpcode == OP_INSB ? 1
                     : pCpu->uOpMode == DISCPUMODE_16BIT ? 2 : 4;       /* dword in both 32 & 64 bits mode */
@@ -210 +153 @@
                                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
-     * disassembler). And get the I/O register size from the opcode / prefix.
-     */
-    RTIOPORT    Port = pRegFrame->edx & 0xffff;
-    unsigned    cb;
-    if (pCpu->pCurInstr->uOpcode == OP_INSB)
-        cb = 1;
-    else
-        cb = (pCpu->uOpMode == DISCPUMODE_16BIT) ? 2 : 4;       /* dword in both 32 & 64 bits mode */
-
-    VBOXSTRICTRC rcStrict = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, Port, cb);
-    if (RT_UNLIKELY(rcStrict != VINF_SUCCESS))
-    {
-        AssertMsg(rcStrict == VINF_EM_RAW_GUEST_TRAP || rcStrict == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rcStrict), ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-        return rcStrict;
-    }
-
-    return IOMInterpretINSEx(pVM, pVCpu, pRegFrame, Port, pCpu->fPrefix, (DISCPUMODE)pCpu->uAddrMode, cb);
-#endif
+                               pCpu->cbInstr,
+                               false /*fIoChecked*/);
 }
 
@@ -258 +181 @@
 static VBOXSTRICTRC iomRCInterpretOUTS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-#ifdef VBOX_WITH_3RD_IEM_STEP
     uint8_t cbValue = pCpu->pCurInstr->uOpcode == OP_OUTSB ? 1
                     : pCpu->uOpMode == DISCPUMODE_16BIT ? 2 : 4;       /* dword in both 32 & 64 bits mode */
@@ -266 +188 @@
                                 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.
-     * And get the I/O register size from the opcode / prefix.
-     */
-    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);
-    if (pCpu->pCurInstr->uOpcode == OP_OUTSB)
-        cb = 1;
-    else
-        cb = (pCpu->uOpMode == DISCPUMODE_16BIT) ? 2 : 4;       /* dword in both 32 & 64 bits mode */
-
-    VBOXSTRICTRC rcStrict = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, Port, cb);
-    if (RT_UNLIKELY(rcStrict != VINF_SUCCESS))
-    {
-        AssertMsg(rcStrict == VINF_EM_RAW_GUEST_TRAP || rcStrict == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rcStrict), ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-        return rcStrict;
-    }
-
-    return IOMInterpretOUTSEx(pVM, pVCpu, pRegFrame, Port, pCpu->fPrefix, (DISCPUMODE)pCpu->uAddrMode, cb);
-#endif
+                                pCpu->fPrefix & DISPREFIX_SEG ? pCpu->idxSegPrefix : X86_SREG_DS,
+                                false /*fIoChecked*/);
 }
 

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

@@ -1114 +1114 @@
     {
         VBOXSTRICTRC rcStrict = IOMRCIOPortHandler(pVM, pVCpu, pRegFrame, &Cpu);
-        if (IOM_SUCCESS(rcStrict))
-        {
-            pRegFrame->rip += cbOp;
-
-            /*
-             * Check for I/O breakpoints.  A bit clumsy, but should be short lived (moved to IEM).
-             */
-            uint32_t const uDr7 = CPUMGetGuestDR7(pVCpu);
-            if (RT_UNLIKELY(   (   (uDr7 & X86_DR7_ENABLED_MASK)
-                                && X86_DR7_ANY_RW_IO(uDr7)
-                                && (CPUMGetGuestCR4(pVCpu) & X86_CR4_DE))
-                            || DBGFBpIsHwIoArmed(pVM)))
-            {
-                uint64_t    uPort = pRegFrame->dx;
-                unsigned    cbValue;
-                if (   Cpu.pCurInstr->uOpcode == OP_IN
-                    || Cpu.pCurInstr->uOpcode == OP_INSB
-                    || Cpu.pCurInstr->uOpcode == OP_INSWD)
-                {
-                    cbValue = DISGetParamSize(&Cpu, &Cpu.Param1);
-                    if (Cpu.Param2.fUse & DISUSE_IMMEDIATE)
-                        uPort = Cpu.Param2.uValue;
-                }
-                else
-                {
-                    cbValue = DISGetParamSize(&Cpu, &Cpu.Param2);
-                    if (Cpu.Param1.fUse & DISUSE_IMMEDIATE)
-                        uPort = Cpu.Param1.uValue;
-                }
-
-                VBOXSTRICTRC rcStrict2 = DBGFBpCheckIo(pVM, pVCpu, CPUMCTX_FROM_CORE(pRegFrame), uPort, cbValue);
-                if (rcStrict2 == VINF_EM_RAW_GUEST_TRAP)
-                {
-                    /* Raise #DB. */
-                    TRPMResetTrap(pVCpu);
-                    TRPMAssertTrap(pVCpu, X86_XCPT_DE, TRPM_TRAP);
-                    if (rcStrict != VINF_SUCCESS)
-                        LogRel(("trpmGCTrap0dHandler: Overriding %Rrc with #DB on I/O port access.\n", VBOXSTRICTRC_VAL(rcStrict)));
-                    rcStrict = VINF_EM_RAW_GUEST_TRAP;
-                }
-                /* rcStrict is VINF_SUCCESS or in [VINF_EM_FIRST..VINF_EM_LAST]. */
-                else if (   rcStrict2 != VINF_SUCCESS
-                         && (rcStrict == VINF_SUCCESS || rcStrict2 < rcStrict))
-                    rcStrict = rcStrict2;
-            }
-        }
-        rc = VBOXSTRICTRC_TODO(rcStrict);
         TRPM_EXIT_DBG_HOOK(0xd);
-        return trpmGCExitTrap(pVM, pVCpu, rc, pRegFrame);
+        return trpmGCExitTrap(pVM, pVCpu, VBOXSTRICTRC_TODO(rcStrict), pRegFrame);
     }