Changeset 4756 in vbox for trunk/src/VBox

Timestamp:

Sep 13, 2007 8:27:24 AM (17 years ago)

Author:

vboxsync

Message:

Translate VERR_EM_INTERPRETER to VINF_EM_RAW_EMULATE_INSTR

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (6 diffs)

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

@@ -1063 +1063 @@
         /* Truly a pita. Why can't SVM give the same information as VMX? */
         rc = SVMR0InterpretInvpg(pVM, CPUMCTX2CORE(pCtx), pVMCB->ctrl.TLBCtrl.n.u32ASID);
+        if (rc == VINF_SUCCESS)
+            goto ResumeExecution;   /* eip already updated */
         break;
     }
@@ -1112 +1114 @@
         }
         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;
     }
@@ -1136 +1136 @@
         }
         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;
     }
@@ -1160 +1158 @@
         }
         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;
     }
@@ -1184 +1180 @@
         }
         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;
     }
@@ -1407 +1401 @@
         pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_ALL;
     }
+
+    /* 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);