Changeset 93204 in vbox for trunk/src/VBox/VMM/VMMR3/EM.cpp

Timestamp:

Jan 12, 2022 6:37:23 PM (3 years ago)

Author:

vboxsync

Message:

VMM/EM: Some debug stepping hacks.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (2 diffs)

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

@@ -505 +505 @@
             case EMEXECPOLICY_IEM_ALL:
                 pVM->em.s.fIemExecutesAll = pArgs->fEnforce;
+
+                /* For making '.alliem 1' useful during debugging, transition the
+                   EMSTATE_DEBUG_GUEST_XXX to EMSTATE_DEBUG_GUEST_IEM.  */
+                for (VMCPUID i = 0; i < pVM->cCpus; i++)
+                {
+                    PVMCPU pVCpuX = pVM->apCpusR3[i];
+                    switch (pVCpuX->em.s.enmState)
+                    {
+                        case EMSTATE_DEBUG_GUEST_RAW:
+                        case EMSTATE_DEBUG_GUEST_HM:
+                        case EMSTATE_DEBUG_GUEST_NEM:
+                        case EMSTATE_DEBUG_GUEST_REM:
+                            Log(("EM: idCpu=%u: %s -> EMSTATE_DEBUG_GUEST_IEM\n", i, emR3GetStateName(pVCpuX->em.s.enmState) ));
+                            pVCpuX->em.s.enmState = EMSTATE_DEBUG_GUEST_IEM;
+                            break;
+                        case EMSTATE_DEBUG_GUEST_IEM:
+                        default:
+                            break;
+                    }
+                }
                 break;
             default:
@@ -1674 +1694 @@
             CPUM_IMPORT_EXTRN_RCSTRICT(pVCpu, ~CPUMCTX_EXTRN_KEEPER_MASK, rc);
             rc2 = DBGFR3VMMForcedAction(pVM, pVCpu);
-            UPDATE_RC();
+            /** @todo why that VINF_EM_DBG_EVENT here? Duplicate info, should be handled
+             *        somewhere before we get here, I would think. */
+            if (rc == VINF_EM_DBG_EVENT) /* HACK! We should've handled pending debug event. */
+                rc = rc2;
+            else
+                UPDATE_RC();
         }