Changeset 3184

Timestamp:

06/20/07 15:40:16 (2 years ago)

Author:

vboxsync

Message:

return VINF_EM_RAW_EMULATE_INSTR instead of VINF_EM_RESCHEDULE_REM when the emulation of string I/O encounters difficult bits.

Files:

• trunk/include/VBox/iom.h (modified) (14 diffs)
• trunk/src/VBox/VMM/EM.cpp (modified) (11 diffs)
• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (11 diffs)
• trunk/src/VBox/VMM/VMMGC/IOMGC.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (2 diffs)

trunk/include/VBox/iom.h

@@ -43 +43 @@
-/**
- * Macro for checking if an I/O or MMIO emulation call succeeded.
- 
- 
+
+
- * in the return value description. And there is must be used to correctly
- * determin if the call succeeded and things like the EIP needs updating.
- 
- 
+
+
- * @returns Success indicator (true/false).
- 
+
- * @param   rc          The status code. This may be evaluated
- *                      more than once!
- 
+
- * @remark  To avoid making assumptions about the layout of the
- *          VINF_EM_FIRST...VINF_EM_LAST range we're checking
@@ -62 +62 @@
- *          VINF_EM_RESCHEDULE_REM status code is the most
- *          frequent status code we'll enounter in this range.
- 
+
- * @todo    Will have to add VINF_EM_DBG_HYPER_BREAKPOINT if the
- *          I/O port and MMIO breakpoints should trigger before
@@ -298 +298 @@
- * Reads an I/O port register.
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
@@ -315 +315 @@
- * Writes to an I/O port register.
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
@@ -332 +332 @@
- * OUT <DX|imm16>, <AL|AX|EAX>
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
@@ -351 +351 @@
- * IN <AL|AX|EAX>, <DX|imm16>
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
@@ -371 +371 @@
- * Reads the string buffer of an I/O port register.
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
@@ -389 +389 @@
- * Writes the string buffer of an I/O port register.
- *
- 
+
- *          here are to be treated as internal failure.
- * @retval  VINF_SUCCESS                Success.
- * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success but schedulinging information needs to be passed onto EM.
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- 
+
- * @param   pVM         VM handle.
- * @param   Port        The port to write.
@@ -407 +407 @@
- * ES:EDI,DX[,ECX]
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the read to the REM.
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
- * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
@@ -429 +430 @@
- * @remark Assumes caller checked the access privileges (IOMInterpretCheckPortIOAccess)
- *
-
-
-
-
+
+
+
+
+
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the read to the REM.
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
- * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
@@ -450 +453 @@
- * DS:ESI,DX[,ECX]
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the write to the REM.
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
- * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
@@ -472 +476 @@
- * @remark  Assumes caller checked the access privileges (IOMInterpretCheckPortIOAccess)
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the write to the REM.
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
- * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
@@ -526 +531 @@
- * level and I/O bitmap.
- *
- 
+
- *          here are to be treated as internal failure.
- * @retval  VINF_SUCCESS                Success.
@@ -553 +558 @@
- * trap is a in or out type instruction. (Call it indirectly via EM that is.)
- *
- 
-
-
- 
+
+
+
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)

trunk/src/VBox/VMM/EM.cpp

@@ -729 +729 @@
-    if (pCtx->eflags.Bits.u1VM)
-        Log(("EMV86: %04X:%08X IF=%d\n", pCtx->cs, pCtx->eip, pCtx->eflags.Bits.u1IF));
- 
+
-        Log(("EMR%d: %08X ESP=%08X IF=%d CR0=%x\n", cpl, pCtx->eip, pCtx->esp, pCtx->eflags.Bits.u1IF, pCtx->cr0));
-#endif
@@ -1119 +1119 @@
-    }
-#endif /* LOG_ENABLED */
-
+
-    /*
-     * PATM is making life more interesting.
@@ -1274 +1274 @@
-    if (VBOX_SUCCESS(rc))
-    {
-ESCHEDULE_REM
+AW_EMULATE_INSTR
-
-        if (!(Cpu.prefix & (PREFIX_REP | PREFIX_REPNE)))
@@ -1317 +1317 @@
-        }
-
- 
+
-         * Handled the I/O return codes.
-ESCHEDULE_REM
+AW_EMULATE_INSTR
-         */
-        if (IOM_SUCCESS(rc))
@@ -1341 +1341 @@
-            return rc;
-        }
-
+AW_EMULATE_INSTR || rc == VINF_EM_R
-    }
-    STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
@@ -1483 +1483 @@
-            if (pCtx->SysEnter.cs != 0)
-            {
- 
+
-                                        SELMIsSelector32Bit(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid) ? PATMFL_CODE32 : 0);
-                if (VBOX_SUCCESS(rc))
@@ -1570 +1570 @@
-#ifdef LOG_ENABLED
-        DBGFR3InfoLog(pVM, "cpumguest", "Trap in patch code");
- 
+
-
-        DISCPUSTATE Cpu;
@@ -1576 +1576 @@
-
-        rc = CPUMR3DisasmInstrCPU(pVM, pCtx, pCtx->eip, &Cpu, "Patch code: ");
- 
+
-            &&  Cpu.pCurInstr->opcode == OP_IRET)
-        {
@@ -1734 +1734 @@
-            && !PATMIsPatchGCAddr(pVM, pCtx->eip))
-        {
- 
+
-                                        SELMIsSelector32Bit(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid) ? PATMFL_CODE32 : 0);
-            if (VBOX_SUCCESS(rc))
@@ -2084 +2084 @@
-         */
-        case VINF_PATM_HC_MMIO_PATCH_READ:
- 
+
-                                    PATMFL_MMIO_ACCESS | (SELMIsSelector32Bit(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid) ? PATMFL_CODE32 : 0));
-            if (VBOX_FAILURE(rc))
@@ -2782 +2782 @@
-
-    unsigned uSS = pCtx->ss;
- 
+
-        ||  (uSS & X86_SEL_RPL) == 3)
-    {

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

@@ -1597 +1597 @@
- * @remark Assumes caller checked the access privileges (IOMInterpretCheckPortIOAccess)
- *
- 
+
- *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
- 
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the read to the REM.
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
- * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
@@ -1625 +1626 @@
-    if (   (uPrefix & PREFIX_REPNE)
-        || pRegFrame->eflags.Bits.u1DF)
-ESCHEDULE_REM
+AW_EMULATE_INSTR
-
-    /*
@@ -1644 +1645 @@
-    /* Convert destination address es:edi. */
-    RTGCPTR GCPtrDst;
- 
+
-                          SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
-                          &GCPtrDst, NULL);
@@ -1650 +1651 @@
-    {
-        Log(("INS destination address conversion failed -> fallback, rc=%d\n", rc));
-ESCHEDULE_REM
+AW_EMULATE_INSTR
-    }
-
@@ -1661 +1662 @@
-    {
-        Log(("INS will generate a trap -> fallback, rc=%d\n", rc));
-ESCHEDULE_REM
+AW_EMULATE_INSTR
-    }
-
@@ -1708 +1709 @@
- * ES:EDI,DX[,ECX]
- *
- 
+
- *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
- 
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the read to the REM.
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
- * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
@@ -1752 +1754 @@
- * @remark  Assumes caller checked the access privileges (IOMInterpretCheckPortIOAccess)
- *
- 
+
- *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
- 
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
@@ -1780 +1782 @@
-    if (   (uPrefix & (PREFIX_SEG | PREFIX_REPNE))
-        || pRegFrame->eflags.Bits.u1DF)
-ESCHEDULE_REM
+AW_EMULATE_INSTR
-
-    /*
@@ -1804 +1806 @@
-    {
-        Log(("OUTS source address conversion failed -> fallback, rc=%Vrc\n", rc));
-ESCHEDULE_REM
+AW_EMULATE_INSTR
-    }
-
@@ -1814 +1816 @@
-    {
-        Log(("OUTS will generate a trap -> fallback, rc=%Vrc\n", rc));
-ESCHEDULE_REM
+AW_EMULATE_INSTR
-    }
-
@@ -1865 +1867 @@
- * DS:ESI,DX[,ECX]
- *
- 
+
- *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
- 
+
- *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the write to the REM.
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
- * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)

trunk/src/VBox/VMM/VMMGC/IOMGC.cpp

@@ -53 +53 @@
- * trap is a in or out type instruction. (Call it indirectly via EM that is.)
- *
- 
+
- *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
- 
+
- *                                      status code must be passed on to EM.
+ * @retval  VINF_EM_RESCHEDULE_REM      The exception was dispatched and cannot be executed in raw-mode. (TRPMRaiseXcptErr)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the read to the REM.
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
- * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
- * @retval  VINF_EM_RESCHEDULE_REM      The exception was dispatched and cannot be executed in raw-mode. (TRPMRaiseXcptErr)
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -390 +390 @@
-            val |= X86_CR0_NE;  /* always turn on the native mechanism to report FPU errors (old style uses interrupts) */
-        }
-            
+
-            val &= ~X86_CR0_NW;     /* Illegal when cache is turned on. */
-
@@ -1288 +1288 @@
-            }
-        }
- 
+
-         * Handled the I/O return codes.
-         * (The unhandled cases end up with rc == VINF_EM_RESCHEDULE_REM.)
@@ -1310 +1310 @@
-            Assert(IoExitInfo.n.u1Type == 0);
-        else
-
-
-
-
-
+
+
-        Log2(("Failed IO at %VGv %x size %d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
-        break;

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1727 +1727 @@
-            }
-        }
- 
+
-         * Handled the I/O return codes.
-         * (The unhandled cases end up with rc == VINF_EM_RESCHEDULE_REM.)
@@ -1748 +1748 @@
-            Assert(fIOWrite);
-        else
-
-
-
-
-
+
+
-        break;
-    }