Changeset 3145

Timestamp:

06/18/07 17:31:09 (2 years ago)

Author:

vboxsync

Message:

Fixed incorrect IOM return checks.

Files:

• trunk/include/VBox/iom.h (modified) (11 diffs)
• trunk/src/VBox/VMM/EM.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (7 diffs)
• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/VMMGC/IOMGC.cpp (modified) (1 diff)

trunk/include/VBox/iom.h

@@ -40 +40 @@
- */
-#define IOM_NO_PDMINS_CHECKS
+
+/**
+ * Macro for checking if an I/O or MMIO emulation call succeeded.
+ * 
+ * This macro shall only be used with the IOM APIs where it's mentioned 
+ * 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
+ *          explicitly for each for exach the exceptions.
+ *          However, for efficieny we ASSUME that the
+ *          VINF_EM_LAST is smaller than most of the relevant
+ *          status codes. We also ASSUME that the
+ *          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
+ *          the I/O is done. Currently, we don't implement these
+ *          kind of breakpoints.
+ */
+#define IOM_SUCCESS(rc)     (   (rc) == VINF_SUCCESS \
+                             || (   (rc) <= VINF_EM_LAST \
+                                 && (rc) != VINF_EM_RESCHEDULE_REM \
+                                 && (rc) >= VINF_EM_FIRST \
+                                 && (rc) != VINF_EM_RESCHEDULE_RAW \
+                                 && (rc) != VINF_EM_RESCHEDULE_HWACC \
+                                ) \
+                            )
-
-
@@ -263 +299 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
-
-
+
+
+
+
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
- *
@@ -279 +316 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
-
-
+
+
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- *
@@ -295 +333 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
-
-
+
+
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
@@ -313 +352 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
-
-
+
+
+
+
- * @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)
@@ -332 +372 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
-
-
+
+
+
+
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
- *
@@ -367 +408 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
+ *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
+ * @retval  VINF_SUCCESS                Success.
+ * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the 
+ *                                      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_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).
+ * @param   pRegFrame   Pointer to CPUMCTXCORE guest registers structure.
+ * @param   pCpu        Disassembler CPU state.
+ */
+IOMDECL(int) IOMInterpretINS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu);
+
+/**
+ * [REP*] INSB/INSW/INSD
+ * ES:EDI,DX[,ECX]
+ *
+ * @remark Assumes caller checked the access privileges (IOMInterpretCheckPortIOAccess)
+ *
+ * @returns Strict VBox status code. Informational status codes other than the one documented 
- *          here are to be treated as internal failure.
- * @retval  VINF_SUCCESS                Success.
@@ -375 +438 @@
- * @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).
- * @param   pRegFrame   Pointer to CPUMCTXCORE guest registers structure.
- * @param   pCpu        Disassembler CPU state.
- */
-IOMDECL(int) IOMInterpretINS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu);
-
-/**
- * [REP*] INSB/INSW/INSD
- * ES:EDI,DX[,ECX]
- *
- * @remark Assumes caller checked the access privileges (IOMInterpretCheckPortIOAccess)
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
- *          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_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).
- * @param   pRegFrame       Pointer to CPUMCTXCORE guest registers structure.
@@ -409 +451 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
-
-
+
+
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
@@ -430 +473 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
-
-
+
+
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
@@ -510 +554 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
-
-
+
+
+
+
- * @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)

trunk/src/VBox/VMM/EM.cpp

@@ -1321 +1321 @@
-         * (The unhandled cases end up with rc == VINF_EM_RESCHEDULE_REM.)
-         */
-
-
-
-
-
-
-
-
+
-        {
-            pCtx->eip += Cpu.opsize;
@@ -1342 +1335 @@
-        }
-        AssertMsg(rc != VINF_TRPM_XCPT_DISPATCHED, ("Handle VINF_TRPM_XCPT_DISPATCHED\n"));
+
-        if (VBOX_FAILURE(rc))
-        {
@@ -1349 +1343 @@
-        AssertMsg(rc == VINF_EM_RESCHEDULE_REM, ("rc=%Vrc\n", rc));
-    }
-emulate_instr:
-    STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-    return emR3RawExecuteInstruction(pVM, "IO: ");

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

@@ -273 +273 @@
-#ifdef IN_GC
-    int rc = IOMGCIOPortHandler(pVM, pCtxCore, pCpu);
-
-
+
-        pCtxCore->eip += cbOp;
-    return rc;

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

@@ -720 +720 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
- *
@@ -862 +863 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
- *
@@ -987 +989 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- *
@@ -1107 +1110 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- *
@@ -1327 +1331 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @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)
@@ -1364 +1369 @@
-        uint32_t    u32Data = ~0U;
-        rc = IOMIOPortRead(pVM, uPort, &u32Data, cbSize);
-
-
+
-        {
-            /*
@@ -1386 +1390 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)

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

@@ -1592 +1592 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @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)
@@ -1677 +1678 @@
-        uint32_t u32Value;
-        rc = IOMIOPortRead(pVM, uPort, &u32Value, cbTransfer);
-rc == VINF_IOM_HC_IOPORT_READ || VBOX_FAILURE
+!IOM_SUCCESS
-            break;
-        int rc2 = iomRamWrite(pVM, GCPtrDst, &u32Value, cbTransfer);
@@ -1703 +1704 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @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)
@@ -1746 +1748 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
@@ -1834 +1837 @@
-            break;
-        rc = IOMIOPortWrite(pVM, uPort, u32Value, cbTransfer);
-rc == VINF_IOM_HC_IOPORT_WRITE || VBOX_FAILURE
+!IOM_SUCCESS
-            break;
-        GCPtrSrc = (RTGCPTR)((RTUINTPTR)GCPtrSrc + cbTransfer);
@@ -1859 +1862 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
- * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)

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

@@ -54 +54 @@
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
-
+ Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
-
+
+
- * @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)