Changeset 72490 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Jun 9, 2018 3:11:13 PM (7 years ago)

Author:

vboxsync

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

122975

Message:

NEM,EM: Generic optimization of I/O port accesses that have to be executed in ring-3. Only NEM uses the feature for now. bugref:9044 bugref:9193

Location:

trunk/src/VBox/VMM/include

Files:

• EMHandleRCTmpl.h (modified) (1 diff)
• EMInternal.h (modified) (2 diffs)
• NEMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/include/EMHandleRCTmpl.h

@@ -221 +221 @@
 
         /*
+         * Execute pending I/O Port access.
+         */
+        case VINF_EM_PENDING_R3_IOPORT_WRITE:
+            rc = emR3ExecutePendingIoPortWrite(pVM, pVCpu);
+            break;
+        case VINF_EM_PENDING_R3_IOPORT_READ:
+            rc = emR3ExecutePendingIoPortRead(pVM, pVCpu);
+            break;
+
+        /*
          * Memory mapped I/O access - emulate the instruction.
          */

trunk/src/VBox/VMM/include/EMInternal.h

@@ -378 +378 @@
     /** Current time slice value. */
     uint64_t                u64TimeSliceExec;
-    uint64_t                u64Alignment;
+
+    /** Pending ring-3 I/O port access (VINF_EM_PENDING_R3_IOPORT_READ / VINF_EM_PENDING_R3_IOPORT_WRITE). */
+    struct
+    {
+        RTIOPORT            uPort;          /**< The I/O port number.*/
+        uint8_t             cbValue;        /**< The value size in bytes.  Zero when not pending. */
+        uint8_t             cbInstr;        /**< The instruction length. */
+        uint32_t            uValue;         /**< The value to write. */
+    } PendingIoPortAccess;
 
     /** MWait halt state. */
     struct
     {
-        uint32_t            fWait;          /** Type of mwait; see EMMWAIT_FLAG_*. */
+        uint32_t            fWait;          /**< Type of mwait; see EMMWAIT_FLAG_*. */
         uint32_t            u32Padding;
-        RTGCPTR             uMWaitRAX;      /** MWAIT hints. */
-        RTGCPTR             uMWaitRCX;      /** MWAIT extensions. */
-        RTGCPTR             uMonitorRAX;    /** Monitored address. */
-        RTGCPTR             uMonitorRCX;    /** Monitor extension. */
-        RTGCPTR             uMonitorRDX;    /** Monitor hint. */
+        RTGCPTR             uMWaitRAX;      /**< MWAIT hints. */
+        RTGCPTR             uMWaitRCX;      /**< MWAIT extensions. */
+        RTGCPTR             uMonitorRAX;    /**< Monitored address. */
+        RTGCPTR             uMonitorRCX;    /**< Monitor extension. */
+        RTGCPTR             uMonitorRDX;    /**< Monitor hint. */
     } MWait;
 
@@ -486 +494 @@
 bool    emR3IsExecutionAllowed(PVM pVM, PVMCPU pVCpu);
 
+VBOXSTRICTRC emR3ExecutePendingIoPortWrite(PVM pVM, PVMCPU pVCpu);
+VBOXSTRICTRC emR3ExecutePendingIoPortRead(PVM pVM, PVMCPU pVCpu);
+
 RT_C_DECLS_END
 

trunk/src/VBox/VMM/include/NEMInternal.h

@@ -45 +45 @@
  */
 # define NEM_WIN_USE_HYPERCALLS_FOR_PAGES
-//# define NEM_WIN_USE_HYPERCALLS_FOR_REGISTERS
-//# define NEM_WIN_USE_OUR_OWN_RUN_API
+# define NEM_WIN_USE_HYPERCALLS_FOR_REGISTERS
+# define NEM_WIN_USE_OUR_OWN_RUN_API
 # if defined(NEM_WIN_USE_OUR_OWN_RUN_API) && !defined(NEM_WIN_USE_HYPERCALLS_FOR_REGISTERS)
 #  error "NEM_WIN_USE_OUR_OWN_RUN_API requires NEM_WIN_USE_HYPERCALLS_FOR_REGISTERS"