Changeset 4764 in vbox for trunk/src/VBox

Timestamp:

Sep 13, 2007 9:52:11 AM (17 years ago)

Author:

vboxsync

Message:

Translate VERR_EM_INTERPRETER to VINF_EM_RAW_EMULATE_INSTR.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (5 diffs)

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

@@ -1560 +1560 @@
         }
         AssertMsg(rc == VERR_EM_INTERPRETER, ("EMU: invlpg %VGv failed with %Vrc\n", exitQualification, rc));
-        rc = VINF_EM_RAW_EMULATE_INSTR;
         break;
     }
@@ -1634 +1633 @@
         }
         Assert(rc == VERR_EM_INTERPRETER || rc == VINF_PGM_CHANGE_MODE || rc == VINF_PGM_SYNC_CR3);
-        if (rc == VERR_EM_INTERPRETER)
-            rc = VINF_EM_RAW_EMULATE_INSTR;
         break;
     }
@@ -1670 +1667 @@
         }
         Assert(rc == VERR_EM_INTERPRETER);
-        rc = VINF_EM_RAW_EMULATE_INSTR;
         break;
     }
@@ -1848 +1844 @@
     case VMX_EXIT_PORT_IO:              /* 30 I/O instruction. */
         /* already handled above */
-        AssertMsg(rc == VINF_PGM_CHANGE_MODE || rc == VINF_EM_RAW_INTERRUPT || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_PGM_SYNC_CR3 || rc == VINF_IOM_HC_IOPORT_READ || rc == VINF_IOM_HC_IOPORT_WRITE
-                  || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_EM_RESCHEDULE_REM, ("rc = %d\n", rc));
+        AssertMsg(   rc == VINF_PGM_CHANGE_MODE 
+                  || rc == VINF_EM_RAW_INTERRUPT 
+                  || rc == VERR_EM_INTERPRETER 
+                  || rc == VINF_EM_RAW_EMULATE_INSTR 
+                  || rc == VINF_PGM_SYNC_CR3 
+                  || rc == VINF_IOM_HC_IOPORT_READ 
+                  || rc == VINF_IOM_HC_IOPORT_WRITE
+                  || rc == VINF_EM_RAW_GUEST_TRAP 
+                  || rc == VINF_TRPM_XCPT_DISPATCHED 
+                  || rc == VINF_EM_RESCHEDULE_REM, 
+                  ("rc = %d\n", rc));
         break;
 
@@ -1921 +1926 @@
     }
 
+    /* translate into a less severe return code */
+    if (rc == VERR_EM_INTERPRETER)
+        rc = VINF_EM_RAW_EMULATE_INSTR;
+
     STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
     Log2(("X"));