Changeset 2504

Timestamp:

05/04/07 20:12:30 (2 years ago)

Author:

vboxsync

Message:

Documented port I/O status code and fixed places where we didn't handle them correctly. (part 1)

Files:

• trunk/include/VBox/iom.h (modified) (12 diffs)
• trunk/src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (10 diffs)
• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (17 diffs)
• trunk/src/VBox/VMM/VMMGC/IOMGC.cpp (modified) (1 diff)

trunk/include/VBox/iom.h

@@ -262 +262 @@
- * Reads an I/O port register.
- *
-
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -274 +278 @@
- * Writes to an I/O port register.
- *
-
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -286 +294 @@
- * OUT <DX|imm16>, <AL|AX|EAX>
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).
@@ -297 +312 @@
- * IN <AL|AX|EAX>, <DX|imm16>
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).
@@ -309 +331 @@
- * Reads the string buffer of an I/O port register.
- *
-
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -322 +348 @@
- * Writes the string buffer of an I/O port register.
- *
-
-
+
+
+
+
+
+
- * @param   pVM         VM handle.
- * @param   Port        The port to write.
@@ -336 +366 @@
- * ES:EDI,DX[,ECX]
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).
@@ -348 +385 @@
- * ES:EDI,DX[,ECX]
- *
-
-
-
+
+
+
+
+
+
+
+
+
+
- *
- * @param   pVM             The virtual machine (GC pointer ofcourse).
@@ -364 +408 @@
- * DS:ESI,DX[,ECX]
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).
@@ -376 +427 @@
- * DS:ESI,DX[,ECX]
- *
-
-
-
+
+
+
+
+
+
+
+
+
+
- *
- * @param   pVM             The virtual machine (GC pointer ofcourse).
@@ -424 +482 @@
- * level and I/O bitmap.
- *
-
-
+
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -445 +507 @@
- *
- * The \#GP trap handler in GC will call this function if the opcode causing the
-
-
-
+
+
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).

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

@@ -719 +719 @@
- * Reads an I/O port register.
- *
-
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -857 +861 @@
- * Reads the string buffer of an I/O port register.
- *
-
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -978 +986 @@
- * Writes to an I/O port register.
- *
-
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -1089 +1101 @@
-    return VINF_SUCCESS;
-}
+
+
-/**
- * Writes the string buffer of an I/O port register.
- *
-
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -1208 +1226 @@
-}
-
+
-/**
- * Checks that the operation is allowed according to the IOPL
- * level and I/O bitmap.
- *
-
-
+
+
+
+
+
+
- *
- * @param   pVM         VM handle.
@@ -1303 +1326 @@
- * IN <AL|AX|EAX>, <DX|imm16>
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).
@@ -1334 +1364 @@
-        uint32_t    u32Data = ~0U;
-        rc = IOMIOPortRead(pVM, uPort, &u32Data, cbSize);
-
+
+
-        {
-            /*
@@ -1342 +1373 @@
-            AssertMsg(fRc, ("Failed to store register value!\n")); NOREF(fRc);
-        }
-
+
+
+
+
+
-    return rc;
-}
@@ -1350 +1385 @@
- * OUT <DX|imm16>, <AL|AX|EAX>
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).
@@ -1379 +1421 @@
-
-        /*
-
+t
-         */
-        rc = IOMIOPortWrite(pVM, uPort, u32Data, cbSize);
-
+
+
+
+
-    return rc;
-}

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

@@ -460 +460 @@
-
-
-inline int
+DECLINLINE(int)
-{
-#ifdef IN_GC
@@ -479 +479 @@
-}
-
-inline int
+DECLINLINE(int)
-{
-#ifdef IN_GC
@@ -1589 +1589 @@
- * ES:EDI,DX[,ECX]
- *
-
-
-
+
+
+
+
+
+
+
+
+
+
- *
- * @param   pVM             The virtual machine (GC pointer ofcourse).
@@ -1601 +1608 @@
-IOMDECL(int) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, uint32_t cbTransfer)
-{
-    int rc = VINF_SUCCESS;
-
-#ifdef VBOX_WITH_STATISTICS
-    STAM_COUNTER_INC(&pVM->iom.s.StatGCInstIns);
@@ -1628 +1633 @@
-    /* Convert destination address es:edi. */
-    RTGCPTR GCPtrDst;
-
-
-
+int 
+    
+    
-    if (VBOX_FAILURE(rc))
-    {
@@ -1683 +1688 @@
-        pRegFrame->ecx = cTransfers;
-
+    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_READ || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || VBOX_FAILURE(rc), ("%Vrc\n", rc));
-    return rc;
-}
@@ -1691 +1697 @@
- * ES:EDI,DX[,ECX]
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).
@@ -1712 +1725 @@
-    int rc = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, uPort, cbSize);
-    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+    {
+        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || VBOX_FAILURE(rc), ("%Vrc\n", rc));
-        return rc;
+    }
-
-    return IOMInterpretINSEx(pVM, pRegFrame, uPort, pCpu->prefix, cbSize);
-}
+
-
-/**
@@ -1721 +1738 @@
- * DS:ESI,DX[,ECX]
- *
-
-
-
+
+
+
+
+
+
+
+
+
+
- *
- * @param   pVM             The virtual machine (GC pointer ofcourse).
@@ -1733 +1757 @@
-IOMDECL(int) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, uint32_t cbTransfer)
-{
-    int rc = VINF_SUCCESS;
-
-#ifdef VBOX_WITH_STATISTICS
-    STAM_COUNTER_INC(&pVM->iom.s.StatGCInstOuts);
@@ -1760 +1782 @@
-    /* Convert source address ds:esi. */
-    RTGCPTR GCPtrSrc;
-
-
-
+int 
+    
+    
-    if (VBOX_FAILURE(rc))
-    {
-d
+Vrc
-        return VINF_IOM_HC_IOPORT_WRITE;
-    }
@@ -1775 +1797 @@
-    if (rc != VINF_SUCCESS)
-    {
-d
+Vrc
-        return VINF_IOM_HC_IOPORT_WRITE;
-    }
@@ -1783 +1805 @@
-    {
-        /*
-
-
-
+ 
+ 
+ 
-        const RTGCUINTREG cTransfersOrg = cTransfers;
-        rc = IOMIOPortWriteString(pVM, uPort, &GCPtrSrc, &cTransfers, cbTransfer);
@@ -1803 +1825 @@
-            break;
-        rc = IOMIOPortWrite(pVM, uPort, u32Value, cbTransfer);
-
+ || VBOX_FAILURE(rc)
-            break;
-        GCPtrSrc = (RTGCPTR)((RTUINTPTR)GCPtrSrc + cbTransfer);
@@ -1817 +1839 @@
-    if (uPrefix & PREFIX_REP)
-        pRegFrame->ecx = cTransfers;
+
+    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_WRITE || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || VBOX_FAILURE(rc), ("%Vrc\n", rc));
-    return rc;
-}
-
-
-
@@ -1826 +1849 @@
- * DS:ESI,DX[,ECX]
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).
@@ -1849 +1879 @@
-    int rc = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, uPort, cbSize);
-    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+    {
+        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || VBOX_FAILURE(rc), ("%Vrc\n", rc));
-        return rc;
+    }
-
-    return IOMInterpretOUTSEx(pVM, pRegFrame, uPort, pCpu->prefix, cbSize);
-}
+

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

@@ -51 +51 @@
- *
- * The \#GP trap handler in GC will call this function if the opcode causing the
-
+ (Call it indirectly via EM that is.)
- *
-
+
+
+
+
+
+
+
+
- *
- * @param   pVM         The virtual machine (GC pointer ofcourse).