Changeset 17284 in vbox

Timestamp:

Mar 3, 2009 2:33:35 PM (16 years ago)

Author:

vboxsync

Message:

Preliminary code to deal with VINF_EM_RAW_EMULATE_IO_BLOCK

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• VMM.cpp (modified) (1 diff)
• VMMInternal.h (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -2357 +2357 @@
 
         /*
+         * (MM)IO intensive code block detected; fall back to the recompiler for better performance
+         */
+        case VINF_EM_RAW_EMULATE_IO_BLOCK:
+            rc = VINF_EM_RESCHEDULE_REM;
+            break;
+
+        /*
          * Execute instruction.
          */

trunk/src/VBox/VMM/VMM.cpp

@@ -323 +323 @@
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetIRETTrap,            STAMTYPE_COUNTER, "/VMM/RZRet/IRETTrap",            STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_IRET_TRAP returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetEmulate,             STAMTYPE_COUNTER, "/VMM/RZRet/Emulate",             STAMUNIT_OCCURENCES, "Number of VINF_EM_EXECUTE_INSTRUCTION returns.");
+    STAM_REG(pVM, &pVM->vmm.s.StatRZRetIOBlockEmulate,      STAMTYPE_COUNTER, "/VMM/RZRet/EmulateIOBlock",      STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_EMULATE_IO_BLOCK returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetPatchEmulate,        STAMTYPE_COUNTER, "/VMM/RZRet/PatchEmulate",        STAMUNIT_OCCURENCES, "Number of VINF_PATCH_EMULATE_INSTR returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetIORead,              STAMTYPE_COUNTER, "/VMM/RZRet/IORead",              STAMUNIT_OCCURENCES, "Number of VINF_IOM_HC_IOPORT_READ returns.");

trunk/src/VBox/VMM/VMMInternal.h

@@ -302 +302 @@
     STAMCOUNTER                 StatRZRetIRETTrap;
     STAMCOUNTER                 StatRZRetEmulate;
+    STAMCOUNTER                 StatRZRetIOBlockEmulate;
     STAMCOUNTER                 StatRZRetPatchEmulate;
     STAMCOUNTER                 StatRZRetIORead;

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -1453 +1453 @@
             }
 #ifdef VBOX_STRICT
-            if (rc != VINF_EM_RAW_EMULATE_INSTR)
+            if (rc != VINF_EM_RAW_EMULATE_INSTR && rc != VINF_EM_RAW_EMULATE_IO_BLOCK)
                 LogFlow(("PGMTrap0eHandler failed with %d\n", rc));
 #endif

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -2429 +2429 @@
                 }
 #ifdef VBOX_STRICT
-                if (rc != VINF_EM_RAW_EMULATE_INSTR)
+                if (rc != VINF_EM_RAW_EMULATE_INSTR && rc != VINF_EM_RAW_EMULATE_IO_BLOCK)
                     Log2(("PGMTrap0eHandler failed with %d\n", rc));
 #endif

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -372 +372 @@
         case VINF_EM_RAW_EMULATE_INSTR:
             STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetEmulate);
+            break;
+        case VINF_EM_RAW_EMULATE_IO_BLOCK:
+            STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetIOBlockEmulate);
             break;
         case VINF_PATCH_EMULATE_INSTR: