Changeset 83088 in vbox for trunk/src/VBox/Debugger

Timestamp:

Feb 16, 2020 8:12:37 PM (5 years ago)

Author:

vboxsync

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

136144

Message:

DBGC: Added multistep command.

Location:

trunk/src/VBox/Debugger

Files:

• DBGCCommands.cpp (modified) (4 diffs)
• DBGCInternal.h (modified) (1 diff)
• DBGConsole.cpp (modified) (3 diffs)

trunk/src/VBox/Debugger/DBGCCommands.cpp

@@ -65 +65 @@
 static FNDBGCCMD dbgcCmdLoadMap;
 static FNDBGCCMD dbgcCmdLoadSeg;
+static FNDBGCCMD dbgcCmdMultiStep;
 static FNDBGCCMD dbgcCmdUnload;
 static FNDBGCCMD dbgcCmdSet;
@@ -207 +208 @@
     /* cTimesMin,   cTimesMax,  enmCategory,            fFlags,                         pszName,        pszDescription */
     {  0,           1,          DBGCVAR_CAT_STRING,     0,                              "flags",        "Flag modifier string (quote it!)." }
+};
+
+/** multistep arguments. */
+static const DBGCVARDESC    g_aArgMultiStep[] =
+{
+    /* cTimesMin,   cTimesMax,  enmCategory,            fFlags,                         pszName,        pszDescription */
+    {  0,           1,          DBGCVAR_CAT_NUMBER_NO_RANGE, 0,                         "count",        "Number of steps to take, defaults to 64." },
+    {  0,           1,          DBGCVAR_CAT_NUMBER_NO_RANGE, DBGCVD_FLAGS_DEP_PREV,     "stride",       "The length of each step, defaults to 1." },
 };
 
@@ -283 +292 @@
     { "logflags",   0,        1,        &g_aArgLogFlags[0],  RT_ELEMENTS(g_aArgLogFlags),  0, dbgcCmdLogFlags,  "[flags string]",       "Displays or modifies the logging flags (VBOX_LOG_FLAGS)." },
     { "logflush",   0,        0,        NULL,                0,                            0, dbgcCmdLogFlush,  "",                     "Flushes the log buffers." },
+    { "multistep",  0,        2,        &g_aArgMultiStep[0], RT_ELEMENTS(g_aArgMultiStep), 0, dbgcCmdMultiStep, "[count [stride]",              "Performs the specified number of step-into operations. Stops early if non-step event occurs." },
     { "quit",       0,        0,        NULL,                0,                            0, dbgcCmdQuit,      "",                     "Exits the debugger." },
     { "runscript",  1,        1,        &g_aArgFilename[0],  RT_ELEMENTS(g_aArgFilename),  0, dbgcCmdRunScript, "<filename>",           "Runs the command listed in the script. Lines starting with '#' "
@@ -859 +869 @@
     NOREF(pCmd);
     NOREF(pUVM);
+    return rc;
+}
+
+
+/**
+ * @callback_method_impl{FNDBGCCMD, The 'multistep' command.}
+ */
+static DECLCALLBACK(int) dbgcCmdMultiStep(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs)
+{
+    PDBGC pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
+
+    /*
+     * Parse arguments.
+     */
+    uint32_t cSteps = 64;
+    if (cArgs > 0)
+    {
+        if (paArgs[0].u.u64Number == 0 || paArgs[0].u.u64Number > _2G)
+            return DBGCCmdHlpFailRc(pCmdHlp, pCmd, VERR_OUT_OF_RANGE,
+                                    "The 'count' argument is out of range: %#llx - 1..2GiB\n", paArgs[0].u.u64Number);
+        cSteps = (uint32_t)paArgs[0].u.u64Number;
+    }
+    uint32_t uStrideLength = 1;
+    if (cArgs > 1)
+    {
+        if (paArgs[1].u.u64Number == 0 || paArgs[1].u.u64Number > _2G)
+            return DBGCCmdHlpFailRc(pCmdHlp, pCmd, VERR_OUT_OF_RANGE,
+                                    "The 'stride' argument is out of range: %#llx - 1..2GiB\n", paArgs[0].u.u64Number);
+        uStrideLength = (uint32_t)paArgs[0].u.u64Number;
+    }
+
+    /*
+     * Take the first step.
+     */
+    int rc = DBGFR3StepEx(pUVM, pDbgc->idCpu, DBGF_STEP_F_INTO, NULL, NULL, 0, uStrideLength);
+    if (RT_SUCCESS(rc))
+    {
+        pDbgc->cMultiStepsLeft          = cSteps;
+        pDbgc->uMultiStepStrideLength   = uStrideLength;
+        pDbgc->pMultiStepCmd            = pCmd;
+        pDbgc->fReady                   = false;
+    }
+    else
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGFR3StepEx(,,DBGF_STEP_F_INTO,) failed");
+
+    NOREF(pCmd);
     return rc;
 }

trunk/src/VBox/Debugger/DBGCInternal.h

@@ -138 +138 @@
     bool                fLog;
 
+    /** Counter use to suppress the printing of the headers. */
+    uint8_t             cPagingHierarchyDumps;
     /** Indicates whether the register are terse or sparse. */
     bool                fRegTerse;
+
+    /** @name Stepping
+     * @{ */
     /** Whether to display registers when tracing. */
     bool                fStepTraceRegs;
-    /** Counter use to suppress the printing of the headers. */
-    uint8_t             cPagingHierarchyDumps;
+    /** Number of multi-steps left, zero if not multi-stepping.   */
+    uint32_t            cMultiStepsLeft;
+    /** The multi-step stride length. */
+    uint32_t            uMultiStepStrideLength;
+    /** The active multi-step command. */
+    PCDBGCCMD           pMultiStepCmd;
+    /** @} */
 
     /** Current disassembler position. */

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -716 +716 @@
         case DBGFEVENT_STEPPED_HYPER:
         {
-            rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: Single step! (%s)\n", dbgcGetEventCtx(pEvent->enmCtx));
+            if (!pDbgc->cMultiStepsLeft)
+                rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: Single step! (%s)\n", dbgcGetEventCtx(pEvent->enmCtx));
+            else
+                pDbgc->cMultiStepsLeft -= 1;
             if (RT_SUCCESS(rc))
             {
@@ -733 +736 @@
                         rc = pDbgc->CmdHlp.pfnExec(&pDbgc->CmdHlp, "%s", szCmd);
                 }
+            }
+
+            /* If multi-stepping, take the next step: */
+            if (pDbgc->cMultiStepsLeft > 0)
+            {
+                int rc2 = DBGFR3StepEx(pDbgc->pUVM, pDbgc->idCpu, DBGF_STEP_F_INTO, NULL, NULL, 0, pDbgc->uMultiStepStrideLength);
+                if (RT_SUCCESS(rc2))
+                    fPrintPrompt = false;
+                else
+                    DBGCCmdHlpFailRc(&pDbgc->CmdHlp, pDbgc->pMultiStepCmd, rc2, "DBGFR3StepEx(,,DBGF_STEP_F_INTO,) failed");
             }
             break;
@@ -860 +873 @@
         if (RT_SUCCESS(rc))
             pDbgc->pBack->pfnSetReady(pDbgc->pBack, true);
+        pDbgc->cMultiStepsLeft = 0;
     }