Changeset 31591 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 11, 2010 11:32:12 PM (14 years ago)

Author:

vboxsync

Message:

IOMALLMMIO.cpp: Don't waste time check uErrorCode to figure out whether to return VINF_IOM_HC_MMIO_WRITE or VINF_IOM_HC_MMIO_READ. It might be misleading in the EPT + MMIO optimization case anyway.

File:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (4 diffs)

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

@@ -1041 +1041 @@
 #ifndef IN_RING3
     if (rc == VERR_SEM_BUSY)
-        return (uErrorCode & X86_TRAP_PF_RW) ? VINF_IOM_HC_MMIO_WRITE : VINF_IOM_HC_MMIO_READ;
+        return VINF_IOM_HC_MMIO_READ_WRITE;
 #endif
     AssertRC(rc);
@@ -1072 +1072 @@
         STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIOFailures);
         iomUnlock(pVM);
-        return (uErrorCode & X86_TRAP_PF_RW) ? VINF_IOM_HC_MMIO_WRITE : VINF_IOM_HC_MMIO_READ;
+        return VINF_IOM_HC_MMIO_READ_WRITE;
 # endif
     }
@@ -1205 +1205 @@
         default:
             STAM_COUNTER_INC(&pVM->iom.s.StatRZInstOther);
-            rc = (uErrorCode & X86_TRAP_PF_RW) ? VINF_IOM_HC_MMIO_WRITE : VINF_IOM_HC_MMIO_READ;
+            rc = VINF_IOM_HC_MMIO_READ_WRITE;
             break;
     }
@@ -1275 +1275 @@
 #ifndef IN_RING3
     if (rc2 == VERR_SEM_BUSY)
-        return (uErrorCode & X86_TRAP_PF_RW) ? VINF_IOM_HC_MMIO_WRITE : VINF_IOM_HC_MMIO_READ;
+        return VINF_IOM_HC_MMIO_READ_WRITE;
 #endif
     VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, uErrorCode, pCtxCore, GCPhysFault, iomMMIOGetRange(&pVM->iom.s, GCPhysFault));