Changeset 56063 in vbox for trunk/src

Timestamp:

May 25, 2015 3:51:11 PM (10 years ago)

Author:

vboxsync

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

100585

Message:

IOMAllMMIO.cpp: IEM experiment (disabled).

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
+//#define IOM_USE_IEM_FOR_MMIO
 
 /*******************************************************************************
@@ -29 +30 @@
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/trpm.h>
-#if defined(IEM_VERIFICATION_MODE) && defined(IN_RING3)
+#if defined(IOM_USE_IEM_FOR_MMIO) || (defined(IEM_VERIFICATION_MODE) && defined(IN_RING3))
 # include <VBox/vmm/iem.h>
 #endif
@@ -572 +573 @@
 
 
+#ifndef IOM_USE_IEM_FOR_MMIO
+
 /**
  * MOV      reg, mem         (read)
@@ -666 +669 @@
     return rc;
 }
+
+#endif /* !IOM_USE_IEM_FOR_MMIO */
 
 
@@ -965 +970 @@
 }
 
+
+#ifndef IOM_USE_IEM_FOR_MMIO
 
 /**
@@ -1497 +1504 @@
 }
 
+#endif /* !IOM_USE_IEM_FOR_MMIO */
 
 /**
@@ -1510 +1518 @@
  * @param   pvUser      Pointer to the MMIO ring-3 range entry.
  */
-static int iomMMIOHandler(PVM pVM, PVMCPU pVCpu, uint32_t uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPHYS GCPhysFault, void *pvUser)
+static VBOXSTRICTRC iomMMIOHandler(PVM pVM, PVMCPU pVCpu, uint32_t uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPHYS GCPhysFault, void *pvUser)
 {
     int rc = IOM_LOCK_SHARED(pVM);
@@ -1585 +1593 @@
         return rc;
     }
+
+#ifdef IOM_USE_IEM_FOR_MMIO
+
+    /*
+     * Let IEM call us back via iomMmioHandler.
+     */
+    VBOXSTRICTRC rcStrict = IEMExecOne(pVCpu);
+
+    STAM_PROFILE_STOP(&pVM->iom.s.StatRZMMIOHandler, a);
+    PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
+    iomMmioReleaseRange(pVM, pRange);
+    return rcStrict;
+
+#else
 
     /*
@@ -1617 +1639 @@
 
 
-#ifdef IOM_WITH_MOVS_SUPPORT
+# ifdef IOM_WITH_MOVS_SUPPORT
         case OP_MOVSB:
         case OP_MOVSWD:
@@ -1632 +1654 @@
             break;
         }
-#endif
+# endif
 
         case OP_STOSB:
@@ -1713 +1735 @@
     {
         STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIOFailures);
-#if defined(VBOX_WITH_STATISTICS) && !defined(IN_RING3)
+# if defined(VBOX_WITH_STATISTICS) && !defined(IN_RING3)
         switch (rc)
         {
@@ -1724 +1746 @@
                 break;
         }
-#endif
+# endif
     }
 
@@ -1731 +1753 @@
     iomMmioReleaseRange(pVM, pRange);
     return rc;
+#endif /* !IOM_USE_IEM_FOR_MMIO */
 }