Changeset 47718 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Aug 14, 2013 10:33:22 AM (11 years ago)

Author:

vboxsync

Message:

More single stepping work.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

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

@@ -3336 +3336 @@
         else
         {
+            pMixedCtx->eflags.u32 |= X86_EFL_TF;
+            pVCpu->hm.s.fClearTrapFlag = true;
+            pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_RFLAGS;
             fInterceptDB = true;
-            pMixedCtx->eflags.u32 |= X86_EFL_TF;
-            pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_RFLAGS;
         }
     }
@@ -6081 +6082 @@
 
 /**
+ * Take necessary actions before going back to ring-3.
+ *
  * An action requires us to go back to ring-3. This function does the necessary
  * steps before we can safely return to ring-3. This is not the same as longjmps
@@ -6151 +6154 @@
     else
         pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST;
+
+    /* Make sure we've undo the trap flag if we tried to single step something. */
+    if (pVCpu->hm.s.fClearTrapFlag)
+    {
+        pVCpu->hm.s.fClearTrapFlag = false;
+        pMixedCtx->eflags.Bits.u1TF = 0;
+    }
 
     STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchExitToR3);
@@ -9653 +9663 @@
     AssertRCReturn(rc, rc);
 
-    /* If we sat the trap flag above, we have to clear it. */ /** @todo HM should remember what it does and possibly do this elsewhere! */
-    if (   (pVCpu->hm.s.fSingleInstruction || DBGFIsStepping(pVCpu))
-        && !(pVCpu->CTX_SUFF(pVM)->hm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_MONITOR_TRAP_FLAG))
+    /* If we sat the trap flag above, we have to clear it. */
+    if (pVCpu->hm.s.fClearTrapFlag)
+    {
+        pVCpu->hm.s.fClearTrapFlag = false;
         pMixedCtx->eflags.Bits.u1TF = 0;
+    }
 
     /* Refer Intel spec. Table 27-1. "Exit Qualifications for debug exceptions" for the format. */