Changeset 47713 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 13, 2013 11:01:39 PM (12 years ago)

Author:

vboxsync

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

87952

Message:

fixes

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (3 diffs)

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

@@ -8935 +8935 @@
      * Execute the instruction in REM.
      */
-    PVM pVM = IEMCPU_TO_VM(pIemCpu);
+    PVM    pVM   = IEMCPU_TO_VM(pIemCpu);
+    PVMCPU pVCpu = IEMCPU_TO_VMCPU(pIemCpu);
     VBOXSTRICTRC rc = VERR_EM_CANNOT_EXEC_GUEST;
 #if 1
@@ -8941 +8942 @@
         && pIemCpu->cIOReads == 0
         && pIemCpu->cIOWrites == 0)
+    {
         do
-            rc = EMR3HmSingleInstruction(pVM, IEMCPU_TO_VMCPU(pIemCpu), EM_ONE_INS_FLAGS_RIP_CHANGE);
-        while (rc == VINF_SUCCESS);
+            rc = EMR3HmSingleInstruction(pVM, pVCpu, EM_ONE_INS_FLAGS_RIP_CHANGE);
+        while (   rc == VINF_SUCCESS
+               || (   rc == VINF_EM_DBG_STEPPED
+                   && VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
+                   && EMGetInhibitInterruptsPC(pVCpu) == pOrgCtx->rip) );
+    }
 #endif
     if (   rc == VERR_EM_CANNOT_EXEC_GUEST
@@ -8954 +8960 @@
     {
         EMRemLock(pVM);
-        rc = REMR3EmulateInstruction(pVM, IEMCPU_TO_VMCPU(pIemCpu));
+        rc = REMR3EmulateInstruction(pVM, pVCpu);
         AssertRC(rc);
         EMRemUnlock(pVM);