Changeset 2505 in vbox

Timestamp:

May 4, 2007 6:20:07 PM (18 years ago)

Author:

vboxsync

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

20936

Message:

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

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (12 diffs)
• VMMAll/EMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -965 +965 @@
 }
 
+
+#ifdef DEBUG
+
 /**
  * Steps hardware accelerated mode.
@@ -1019 +1022 @@
 }
 
-#ifdef DEBUG
+
 void emR3SingleStepExecRaw(PVM pVM, uint32_t cIterations)
 {
     EMSTATE  enmOldState = pVM->em.s.enmState;
-    PCPUMCTX pCtx        = pVM->em.s.pCtx;
 
     pVM->em.s.enmState = EMSTATE_DEBUG_GUEST_RAW;
@@ -1039 +1041 @@
 }
 
+
 void emR3SingleStepExecHwAcc(PVM pVM, uint32_t cIterations)
 {
     EMSTATE  enmOldState = pVM->em.s.enmState;
-    PCPUMCTX pCtx        = pVM->em.s.pCtx;
 
     pVM->em.s.enmState = EMSTATE_DEBUG_GUEST_HWACC;
@@ -1058 +1060 @@
 }
 
+
 void emR3SingleStepExecRem(PVM pVM, uint32_t cIterations)
 {
     EMSTATE  enmOldState = pVM->em.s.enmState;
-    PCPUMCTX pCtx        = pVM->em.s.pCtx;
 
     pVM->em.s.enmState = EMSTATE_DEBUG_GUEST_REM;
@@ -1076 +1078 @@
     pVM->em.s.enmState = enmOldState;
 }
-#endif
+
+#endif /* DEBUG */
+
 
 /**
@@ -1270 +1274 @@
     if (VBOX_SUCCESS(rc))
     {
+        rc = VINF_EM_RESCHEDULE_REM;
+
         if (!(Cpu.prefix & (PREFIX_REP | PREFIX_REPNE)))
         {
@@ -1277 +1283 @@
                 {
                     STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatIn);
-
                     rc = IOMInterpretIN(pVM, CPUMCTX2CORE(pCtx), &Cpu);
-                    if (rc == VINF_SUCCESS)
-                    {
-                        pCtx->eip += Cpu.opsize;
-                        STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-                        return VINF_SUCCESS;
-                    }
-                    else
-                    if (rc == VINF_EM_RAW_GUEST_TRAP)
-                    {
-                        STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-                        rc = emR3RawGuestTrap(pVM);
-                        return rc;
-                    }
-                    /* emulate in the recompiler */
                     break;
                 }
@@ -1299 +1290 @@
                 {
                     STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatOut);
-
                     rc = IOMInterpretOUT(pVM, CPUMCTX2CORE(pCtx), &Cpu);
-                    if (rc == VINF_SUCCESS)
-                    {
-                        pCtx->eip += Cpu.opsize;
-                        STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-                        return VINF_SUCCESS;
-                    }
-                    else
-                    if (rc == VINF_EM_RAW_GUEST_TRAP)
-                    {
-                        STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-                        rc = emR3RawGuestTrap(pVM);
-                        return rc;
-                    }
-                    /* emulate in the recompiler */
                     break;
                 }
-
-                default:
-                    break;
             }
-        }//if(!(Cpu.prefix & (PREFIX_REP|PREFIX_REPNE))
+        }
         else if (Cpu.prefix & PREFIX_REP)
         {
@@ -1331 +1304 @@
                     STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatIn);
                     rc = IOMInterpretINS(pVM, CPUMCTX2CORE(pCtx), &Cpu);
-                    if (rc == VINF_SUCCESS)
-                    {
-                        STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-                        pCtx->eip += Cpu.opsize;
-                        return rc;
-                    }
-                    else
-                    if (rc == VINF_EM_RAW_GUEST_TRAP)
-                    {
-                        STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-                        rc = emR3RawGuestTrap(pVM);
-                        return rc;
-                    }
-                    /* emulate in the recompiler */
                     break;
                 }
+
                 case OP_OUTSB:
                 case OP_OUTSWD:
@@ -1352 +1312 @@
                     STAM_COUNTER_INC(&pVM->em.s.CTXSUFF(pStats)->StatOut);
                     rc = IOMInterpretOUTS(pVM, CPUMCTX2CORE(pCtx), &Cpu);
-                    if (rc == VINF_SUCCESS)
-                    {
-                        STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-                        pCtx->eip += Cpu.opsize;
-                        return rc;
-                    }
-                    else
-                    if (rc == VINF_EM_RAW_GUEST_TRAP)
-                    {
-                        STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
-                        rc = emR3RawGuestTrap(pVM);
-                        return rc;
-                    }
-                    /* emulate in the recompiler */
                     break;
                 }
             }
-        }//if(Cpu.prefix & PREFIX_REP)
+        }
+
+        /* 
+         * Handled the I/O return codes.
+         * (The unhandled cases ends up with rc == VINF_EM_RESCHEDULE_REM.)
+         */
+        if (    rc == VINF_SUCCESS
+            ||  (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
+        {
+            pCtx->eip += Cpu.opsize;
+            STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
+            return rc;
+        }
+        if (rc == VINF_EM_RAW_GUEST_TRAP)
+        {
+            STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
+            rc = emR3RawGuestTrap(pVM);
+            return rc;
+        }
+        AssertMsg(rc != VINF_TRPM_XCPT_DISPATCHED, ("Handle VINF_TRPM_XCPT_DISPATCHED\n"));
+        if (VBOX_FAILURE(rc))
+        {
+            STAM_PROFILE_STOP(&pVM->em.s.StatIOEmu, a);
+            return rc;
+        }
+        AssertMsg(rc == VINF_EM_RESCHEDULE_REM, ("rc=%Vrc\n", rc));
     }
 
@@ -2196 +2167 @@
         case VINF_IOM_HC_IOPORT_READ:
         case VINF_IOM_HC_IOPORT_WRITE:
-        case VINF_IOM_HC_IOPORT_READWRITE:
             rc = emR3RawExecuteIOInstruction(pVM);
             break;
@@ -2525 +2495 @@
             ||  rc == VINF_IOM_HC_IOPORT_READ
             ||  rc == VINF_IOM_HC_IOPORT_WRITE
-            ||  rc == VINF_IOM_HC_IOPORT_READWRITE
             //||  rc == VINF_PATM_PATCH_INT3
            )

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

@@ -47 +47 @@
 #include <iprt/string.h>
 
+
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -54 +55 @@
 typedef EMDECL(uint32_t) PFN_EMULATE_PARAM3(uint32_t *pu32Param1, uint32_t val2, size_t val3);
 
+
 /*******************************************************************************
- *   Internal Functions                                                        *
- *******************************************************************************/
-
+*   Internal Functions                                                         *
+*******************************************************************************/
 DECLINLINE(int) emInterpretInstructionCPU(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize);
+
 
 /**
@@ -271 +273 @@
 #ifdef IN_GC
     int rc = IOMGCIOPortHandler(pVM, pCtxCore, pCpu);
-    if (rc == VINF_SUCCESS)
+    if (    rc == VINF_SUCCESS
+        ||  (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
         pCtxCore->eip += cbOp;
     return rc;