vbox的更動 47671 路徑 trunk/src/VBox/VMM/VMMR3/EMHM.cpp

時間撮記:

2013-8-12 上午11:16:55 (12 年 以前)

作者:

vboxsync

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

87874

訊息:

VMM: More debugging related stuff.

檔案:

• trunk/src/VBox/VMM/VMMR3/EMHM.cpp (修改) (1 筆差異)

trunk/src/VBox/VMM/VMMR3/EMHM.cpp

@@ -167 +167 @@
  * @param   pVCpu               Pointer to the cross context CPU structure for
  *                              the calling EMT.
+ * @param   fFlags              Combinations of EM_ONE_INS_FLAGS_XXX.
  * @thread  EMT.
  */
-VMMR3_INT_DECL(VBOXSTRICTRC) EMR3HmSingleInstruction(PVM pVM, PVMCPU pVCpu)
+VMMR3_INT_DECL(VBOXSTRICTRC) EMR3HmSingleInstruction(PVM pVM, PVMCPU pVCpu, uint32_t fFlags)
 {
-    if (!HMR3CanExecuteGuest(pVM, pVCpu->em.s.pCtx))
+    PCPUMCTX pCtx = pVCpu->em.s.pCtx;
+    Assert(!(fFlags & ~EM_ONE_INS_FLAGS_MASK));
+
+    if (!HMR3CanExecuteGuest(pVM, pCtx))
         return VINF_EM_RESCHEDULE;
 
-    /*
-     * Service necessary FFs before going into HM.
-     */
-    PCPUMCTX pCtx = pVCpu->em.s.pCtx;
-    if (    VM_FF_IS_PENDING(pVM, VM_FF_HIGH_PRIORITY_PRE_RAW_MASK)
-        ||  VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_HIGH_PRIORITY_PRE_RAW_MASK))
-    {
-        VBOXSTRICTRC rcStrict = emR3HmForcedActions(pVM, pVCpu, pCtx);
-        if (rcStrict != VINF_SUCCESS)
-        {
-            Log(("EMR3HmSingleInstruction: FFs before -> %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+    uint64_t const uOldRip = pCtx->rip;
+    for (;;)
+    {
+        /*
+         * Service necessary FFs before going into HM.
+         */
+        if (   VM_FF_IS_PENDING(pVM, VM_FF_HIGH_PRIORITY_PRE_RAW_MASK)
+            || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_HIGH_PRIORITY_PRE_RAW_MASK))
+        {
+            VBOXSTRICTRC rcStrict = emR3HmForcedActions(pVM, pVCpu, pCtx);
+            if (rcStrict != VINF_SUCCESS)
+            {
+                Log(("EMR3HmSingleInstruction: FFs before -> %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+                return rcStrict;
+            }
+        }
+
+        /*
+         * Go execute it.
+         */
+        bool fOld = HMSetSingleInstruction(pVCpu, true);
+        VBOXSTRICTRC rcStrict = VMMR3HmRunGC(pVM, pVCpu);
+        HMSetSingleInstruction(pVCpu, fOld);
+        LogFlow(("EMR3HmSingleInstruction: %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+
+        /*
+         * Handle high priority FFs and informational status codes.  We don't do
+         * normal FF processing the caller or the next call can deal with them.
+         */
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_RESUME_GUEST_MASK);
+        if (   VM_FF_IS_PENDING(pVM, VM_FF_HIGH_PRIORITY_POST_MASK)
+            || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_HIGH_PRIORITY_POST_MASK))
+        {
+            rcStrict = emR3HighPriorityPostForcedActions(pVM, pVCpu, VBOXSTRICTRC_TODO(rcStrict));
+            LogFlow(("EMR3HmSingleInstruction: FFs after -> %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+        }
+
+        if (rcStrict != VINF_SUCCESS && (rcStrict < VINF_EM_FIRST || rcStrict > VINF_EM_LAST))
+        {
+            rcStrict = emR3HmHandleRC(pVM, pVCpu, pCtx, VBOXSTRICTRC_TODO(rcStrict));
+            Log(("EMR3HmSingleInstruction: emR3HmHandleRC -> %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+        }
+
+        /*
+         * Done?
+         */
+        if (   (rcStrict != VINF_SUCCESS && rcStrict != VINF_EM_DBG_STEPPED)
+            || !(fFlags & EM_ONE_INS_FLAGS_RIP_CHANGE)
+            || pCtx->rip != uOldRip)
+        {
+            if (rcStrict == VINF_SUCCESS && pCtx->rip != uOldRip)
+                rcStrict = VINF_EM_DBG_STEPPED;
+            Log(("EMR3HmSingleInstruction: returns %Rrc (rip %llx -> %llx)\n", VBOXSTRICTRC_VAL(rcStrict), uOldRip, pCtx->rip));
             return rcStrict;
         }
     }
-
-    /*
-     * Go execute it.
-     */
-    bool fOld = HMSetSingleInstruction(pVCpu, true);
-    VBOXSTRICTRC rcStrict = VMMR3HmRunGC(pVM, pVCpu);
-    HMSetSingleInstruction(pVCpu, fOld);
-    LogFlow(("EMR3HmSingleInstruction: %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-
-    /*
-     * Handle high priority FFs and informational status codes.  We don't do
-     * normal FF processing the caller or the next call can deal with them.
-     */
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_RESUME_GUEST_MASK);
-    if (    VM_FF_IS_PENDING(pVM, VM_FF_HIGH_PRIORITY_POST_MASK)
-        ||  VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_HIGH_PRIORITY_POST_MASK))
-    {
-        rcStrict = emR3HighPriorityPostForcedActions(pVM, pVCpu, VBOXSTRICTRC_TODO(rcStrict));
-        LogFlow(("EMR3HmSingleInstruction: FFs after -> %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-    }
-
-    if (rcStrict != VINF_SUCCESS && (rcStrict < VINF_EM_FIRST || rcStrict > VINF_EM_LAST))
-    {
-        rcStrict = emR3HmHandleRC(pVM, pVCpu, pCtx, VBOXSTRICTRC_TODO(rcStrict));
-        Log(("EMR3HmSingleInstruction: emR3HmHandleRC -> %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-    }
-
-    return rcStrict;
 }