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

Timestamp:

Aug 25, 2010 4:15:25 PM (15 years ago)

Author:

vboxsync

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

65199

Message:

DBGF,PGM,DBGC: dumping page tables - hacking still in progress (sigh, this takes for ever).

Location:

trunk/src/VBox/Debugger

Files:

• DBGCCmdHlp.cpp (modified) (2 diffs)
• DBGCCommands.cpp (modified) (2 diffs)
• DBGCEmulateCodeView.cpp (modified) (7 diffs)
• DBGCInternal.h (modified) (2 diffs)
• DBGConsole.cpp (modified) (1 diff)
• testcase/tstDBGCStubs.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCCmdHlp.cpp

@@ -792 +792 @@
 
 /**
+ * @interface_method_impl{DBGCCMDHLP,pfnVarGetRange}
+ */
+static DECLCALLBACK(int) dbgcHlpVarGetRange(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, uint64_t cbElement, uint64_t cbDefault,
+                                            uint64_t *pcbRange)
+{
+/** @todo implement this properly, strings/symbols are not resolved now. */
+    switch (pVar->enmRangeType)
+    {
+        default:
+        case DBGCVAR_RANGE_NONE:
+            *pcbRange = cbDefault;
+            break;
+        case DBGCVAR_RANGE_BYTES:
+            *pcbRange = pVar->u64Range;
+            break;
+        case DBGCVAR_RANGE_ELEMENTS:
+            *pcbRange = pVar->u64Range * cbElement;
+            break;
+    }
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Info helper callback wrapper - print formatted string.
+ *
+ * @param   pHlp        Pointer to this structure.
+ * @param   pszFormat   The format string.
+ * @param   ...         Arguments.
+ */
+static DECLCALLBACK(void) dbgcHlpGetDbgfOutputHlp_Printf(PCDBGFINFOHLP pHlp, const char *pszFormat, ...)
+{
+    PDBGC pDbgc = RT_FROM_MEMBER(pHlp, DBGC, DbgfOutputHlp);
+    va_list va;
+    va_start(va, pszFormat);
+    pDbgc->CmdHlp.pfnPrintfV(&pDbgc->CmdHlp, NULL, pszFormat, va);
+    va_end(va);
+}
+
+
+/**
+ * Info helper callback wrapper - print formatted string.
+ *
+ * @param   pHlp        Pointer to this structure.
+ * @param   pszFormat   The format string.
+ * @param   args        Argument list.
+ */
+static DECLCALLBACK(void) dbgcHlpGetDbgfOutputHlp_PrintfV(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args)
+{
+    PDBGC pDbgc = RT_FROM_MEMBER(pHlp, DBGC, DbgfOutputHlp);
+    pDbgc->CmdHlp.pfnPrintfV(&pDbgc->CmdHlp, NULL, pszFormat, args);
+}
+
+
+/**
+ * @interface_method_impl{DBGCCMDHLP,pfnGetDbgfOutputHlp}
+ */
+static DECLCALLBACK(PCDBGFINFOHLP) dbgcHlpGetDbgfOutputHlp(PDBGCCMDHLP pCmdHlp)
+{
+    PDBGC pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
+
+    /* Lazy init */
+    if (!pDbgc->DbgfOutputHlp.pfnPrintf)
+    {
+        pDbgc->DbgfOutputHlp.pfnPrintf  = dbgcHlpGetDbgfOutputHlp_Printf;
+        pDbgc->DbgfOutputHlp.pfnPrintfV = dbgcHlpGetDbgfOutputHlp_PrintfV;
+    }
+
+    return &pDbgc->DbgfOutputHlp;
+}
+
+
+/**
  * Initializes the Command Helpers for a DBGC instance.
  *
@@ -798 +871 @@
 void dbgcInitCmdHlp(PDBGC pDbgc)
 {
-    pDbgc->CmdHlp.pfnWrite      = dbgcHlpWrite;
-    pDbgc->CmdHlp.pfnPrintfV    = dbgcHlpPrintfV;
-    pDbgc->CmdHlp.pfnPrintf     = dbgcHlpPrintf;
-    pDbgc->CmdHlp.pfnVBoxErrorV = dbgcHlpVBoxErrorV;
-    pDbgc->CmdHlp.pfnVBoxError  = dbgcHlpVBoxError;
-    pDbgc->CmdHlp.pfnMemRead    = dbgcHlpMemRead;
-    pDbgc->CmdHlp.pfnMemWrite   = dbgcHlpMemWrite;
-    pDbgc->CmdHlp.pfnEvalV      = dbgcHlpEvalV;
-    pDbgc->CmdHlp.pfnExec       = dbgcHlpExec;
-    pDbgc->CmdHlp.pfnFailV      = dbgcHlpFailV;
-    pDbgc->CmdHlp.pfnVarToDbgfAddr = dbgcHlpVarToDbgfAddr;
-    pDbgc->CmdHlp.pfnVarToBool = dbgcHlpVarToBool;
-}
-
+    pDbgc->CmdHlp.pfnWrite              = dbgcHlpWrite;
+    pDbgc->CmdHlp.pfnPrintfV            = dbgcHlpPrintfV;
+    pDbgc->CmdHlp.pfnPrintf             = dbgcHlpPrintf;
+    pDbgc->CmdHlp.pfnVBoxErrorV         = dbgcHlpVBoxErrorV;
+    pDbgc->CmdHlp.pfnVBoxError          = dbgcHlpVBoxError;
+    pDbgc->CmdHlp.pfnMemRead            = dbgcHlpMemRead;
+    pDbgc->CmdHlp.pfnMemWrite           = dbgcHlpMemWrite;
+    pDbgc->CmdHlp.pfnEvalV              = dbgcHlpEvalV;
+    pDbgc->CmdHlp.pfnExec               = dbgcHlpExec;
+    pDbgc->CmdHlp.pfnFailV              = dbgcHlpFailV;
+    pDbgc->CmdHlp.pfnVarToDbgfAddr      = dbgcHlpVarToDbgfAddr;
+    pDbgc->CmdHlp.pfnVarToBool          = dbgcHlpVarToBool;
+    pDbgc->CmdHlp.pfnVarGetRange        = dbgcHlpVarGetRange;
+    pDbgc->CmdHlp.pfnGetDbgfOutputHlp   = dbgcHlpGetDbgfOutputHlp;
+}
+

trunk/src/VBox/Debugger/DBGCCommands.cpp

@@ -874 +874 @@
 
 /**
- * Print formatted string.
- *
- * @param   pHlp        Pointer to this structure.
- * @param   pszFormat   The format string.
- * @param   ...         Arguments.
- */
-static DECLCALLBACK(void) dbgcCmdInfo_Printf(PCDBGFINFOHLP pHlp, const char *pszFormat, ...)
-{
-    PDBGCCMDHLP pCmdHlp = *(PDBGCCMDHLP *)(pHlp + 1);
-    va_list args;
-    va_start(args,  pszFormat);
-    pCmdHlp->pfnPrintfV(pCmdHlp, NULL, pszFormat, args);
-    va_end(args);
-}
-
-
-/**
- * Print formatted string.
- *
- * @param   pHlp        Pointer to this structure.
- * @param   pszFormat   The format string.
- * @param   args        Argument list.
- */
-static DECLCALLBACK(void) dbgcCmdInfo_PrintfV(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args)
-{
-    PDBGCCMDHLP pCmdHlp = *(PDBGCCMDHLP *)(pHlp + 1);
-    pCmdHlp->pfnPrintfV(pCmdHlp, NULL, pszFormat, args);
-}
-
-
-/**
  * The 'info' command.
  *
@@ -932 +901 @@
      * Dump it.
      */
-    struct
-    {
-        DBGFINFOHLP Hlp;
-        DBGCCMDHLP *pCmdHlp; /* XXX gcc warns when using PDBGCCMDHLP here */
-    } Hlp = { { dbgcCmdInfo_Printf, dbgcCmdInfo_PrintfV }, pCmdHlp };
-    int rc = VMR3ReqCallWait(pVM, pDbgc->idCpu,
-                             (PFNRT)DBGFR3Info, 4, pVM, paArgs[0].u.pszString, cArgs == 2 ? paArgs[1].u.pszString : NULL, &Hlp.Hlp);
+    int rc = VMR3ReqCallWait(pVM, pDbgc->idCpu, (PFNRT)DBGFR3Info, 4,
+                             pVM, paArgs[0].u.pszString, cArgs == 2 ? paArgs[1].u.pszString : NULL,
+                             DBGCCmdHlpGetDbgfOutputHlp(pCmdHlp));
     if (RT_FAILURE(rc))
         return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3Info()\n");

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -58 +58 @@
 static DECLCALLBACK(int) dbgcCmdDumpPageDir(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
 static DECLCALLBACK(int) dbgcCmdDumpPageDirBoth(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
+static DECLCALLBACK(int) dbgcCmdDumpPageHierarchy(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
 static DECLCALLBACK(int) dbgcCmdDumpPageTable(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
 static DECLCALLBACK(int) dbgcCmdDumpPageTableBoth(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
@@ -164 +165 @@
     /* cTimesMin,   cTimesMax,  enmCategory,            fFlags,                         pszName,        pszDescription */
     {  0,           1,          DBGCVAR_CAT_POINTER,    0,                              "address",      "Address of the page directory entry to start dumping from." },
+};
+
+
+/** 'dph*' arguments. */
+static const DBGCVARDESC    g_aArgDumpPH[] =
+{
+    /* cTimesMin,   cTimesMax,  enmCategory,            fFlags,                         pszName,        pszDescription */
+    {  0,           1,          DBGCVAR_CAT_GC_POINTER, 0,                              "address",      "Where in the address space to start dumping and for how long (range).  The default address/range will be used if omitted." },
+    {  0,           1,          DBGCVAR_CAT_NUMBER,     DBGCVD_FLAGS_DEP_PREV,          "cr3",          "The CR3 value to use.  The current CR3 of the context will be used if omitted." },
+    {  0,           1,          DBGCVAR_CAT_STRING,     DBGCVD_FLAGS_DEP_PREV,          "mode",         "The paging mode: legacy, pse, pae, long, ept. Append '-np' for nested paging and '-nx' for no-execute.  The current mode will be used if omitted." },
 };
 
@@ -314 +325 @@
     { "dpdg",       0,        1,        &g_aArgDumpPD[0],   RT_ELEMENTS(g_aArgDumpPD),     NULL,               0,       dbgcCmdDumpPageDir, "[addr] [index]",       "Dumps page directory entries of the guest." },
     { "dpdh",       0,        1,        &g_aArgDumpPD[0],   RT_ELEMENTS(g_aArgDumpPD),     NULL,               0,       dbgcCmdDumpPageDir, "[addr] [index]",       "Dumps page directory entries of the hypervisor. " },
+    { "dph",        0,        3,        &g_aArgDumpPH[0],   RT_ELEMENTS(g_aArgDumpPH),     NULL,               0, dbgcCmdDumpPageHierarchy, "[addr [cr3 [mode]]",   "Dumps the paging hierarchy at for specfied address range. Default context." },
+    { "dphg",       0,        3,        &g_aArgDumpPH[0],   RT_ELEMENTS(g_aArgDumpPH),     NULL,               0, dbgcCmdDumpPageHierarchy, "[addr [cr3 [mode]]",   "Dumps the paging hierarchy at for specfied address range. Guest context." },
+    { "dphh",       0,        3,        &g_aArgDumpPH[0],   RT_ELEMENTS(g_aArgDumpPH),     NULL,               0, dbgcCmdDumpPageHierarchy, "[addr [cr3 [mode]]",   "Dumps the paging hierarchy at for specfied address range. Hypervisor context." },
     { "dpt",        1,        1,        &g_aArgDumpPT[0],   RT_ELEMENTS(g_aArgDumpPT),     NULL,               0,       dbgcCmdDumpPageTable,"<addr>",              "Dumps page table entries of the default context." },
     { "dpta",       1,        1,        &g_aArgDumpPTAddr[0],RT_ELEMENTS(g_aArgDumpPTAddr), NULL,              0,       dbgcCmdDumpPageTable,"<addr>",              "Dumps specified page table." },
@@ -979 +993 @@
     else
         pDbgc->DisasmPos = paArgs[0];
+    pDbgc->pLastPos = &pDbgc->DisasmPos;
 
     /*
@@ -1137 +1152 @@
     else
         pDbgc->SourcePos = paArgs[0];
+    pDbgc->pLastPos = &pDbgc->SourcePos;
 
     /*
@@ -2377 +2393 @@
     }
 
+    pDbgc->pLastPos = &pDbgc->DumpPos;
+
     /*
      * Do the dumping.
@@ -2850 +2868 @@
 
 /**
+ * The 'dph*' commands.
+ *
+ * @returns VBox status.
+ * @param   pCmd        Pointer to the command descriptor (as registered).
+ * @param   pCmdHlp     Pointer to command helper functions.
+ * @param   pVM         Pointer to the current VM (if any).
+ * @param   paArgs      Pointer to (readonly) array of arguments.
+ * @param   cArgs       Number of arguments in the array.
+ */
+static DECLCALLBACK(int) dbgcCmdDumpPageHierarchy(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
+{
+    PDBGC pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
+    if (!pVM)
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "No VM.\n");
+
+    /*
+     * Figure the context.
+     */
+    uint32_t fFlags = 0;
+    if (pCmd->pszCmd[3] == '\0')
+        fFlags |= pDbgc->fRegCtxGuest ? DBGFPGDMP_FLAGS_GUEST : DBGFPGDMP_FLAGS_SHADOW;
+    else if (pCmd->pszCmd[3] == 'g')
+        fFlags |= DBGFPGDMP_FLAGS_GUEST;
+    else if (pCmd->pszCmd[3] == 'h')
+        fFlags |= DBGFPGDMP_FLAGS_SHADOW;
+    else
+        fFlags |= DBGFPGDMP_FLAGS_GUEST | DBGFPGDMP_FLAGS_SHADOW;
+
+    /*
+     * Get the range.
+     */
+    PCDBGCVAR   pRange = cArgs > 0 ? &paArgs[0] : pDbgc->pLastPos;
+    RTGCPTR     GCPtrFirst;
+    int rc = DBGCCmdHlpVarToFlatAddr(pCmdHlp, pRange, &GCPtrFirst);
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "Failed to convert %DV to a flat address: %Rrc", pRange, rc);
+
+    uint64_t cbRange;
+    rc = DBGCCmdHlpVarGetRange(pCmdHlp, pRange, 1, PAGE_SIZE * 8, &cbRange);
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "Failed to obtain the range of %DV: %Rrc", pRange, rc);
+
+    RTGCPTR GCPtrLast = RTGCPTR_MAX - GCPtrFirst;
+    if (cbRange >= GCPtrLast)
+        GCPtrLast = RTGCPTR_MAX;
+    else if (!cbRange)
+        GCPtrLast = GCPtrFirst;
+    else
+        GCPtrLast = GCPtrFirst + cbRange - 1;
+
+    /*
+     * Do we have a CR3?
+     */
+    uint64_t cr3 = 0;
+    if (cArgs > 1)
+    {
+        if ((fFlags & (DBGFPGDMP_FLAGS_GUEST | DBGFPGDMP_FLAGS_SHADOW)) == (DBGFPGDMP_FLAGS_GUEST | DBGFPGDMP_FLAGS_SHADOW))
+            return DBGCCmdHlpFail(pCmdHlp, pCmd, "No CR3 or mode arguments when dumping both context, please.");
+        if (paArgs[1].enmType != DBGCVAR_TYPE_NUMBER)
+            return DBGCCmdHlpFail(pCmdHlp, pCmd, "The CR3 argument is not a number: %DV", &paArgs[1]);
+        cr3 = paArgs[1].u.u64Number;
+    }
+    else
+        fFlags |= DBGFPGDMP_FLAGS_CURRENT_CR3;
+
+    /*
+     * Do we have a mode?
+     */
+    if (cArgs > 2)
+    {
+        if (paArgs[2].enmType != DBGCVAR_TYPE_STRING)
+            return DBGCCmdHlpFail(pCmdHlp, pCmd, "The mode argument is not a string: %DV", &paArgs[2]);
+        static const struct MODETOFLAGS
+        {
+            const char *pszName;
+            uint32_t    fFlags;
+        } s_aModeToFlags[] =
+        {
+            { "ept",        DBGFPGDMP_FLAGS_EPT },
+            { "legacy",     0 },
+            { "legacy-np",  DBGFPGDMP_FLAGS_NP },
+            { "pse",        DBGFPGDMP_FLAGS_PSE },
+            { "pse-np",     DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_NP },
+            { "pae",        DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE },
+            { "pae-np",     DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_NP },
+            { "pae-nx",     DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_NXE },
+            { "pae-nx-np",  DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_NXE | DBGFPGDMP_FLAGS_NP },
+            { "long",       DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_LME },
+            { "long-np",    DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_LME | DBGFPGDMP_FLAGS_NP },
+            { "long-nx",    DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_LME | DBGFPGDMP_FLAGS_NXE },
+            { "long-nx-np", DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_LME | DBGFPGDMP_FLAGS_NXE | DBGFPGDMP_FLAGS_NP }
+        };
+        int i = RT_ELEMENTS(s_aModeToFlags);
+        while (i-- > 0)
+            if (!strcmp(s_aModeToFlags[i].pszName, paArgs[2].u.pszString))
+            {
+                fFlags |= s_aModeToFlags[i].fFlags;
+                break;
+            }
+        if (i < 0)
+            return DBGCCmdHlpFail(pCmdHlp, pCmd, "Unknown mode: \"%s\"", paArgs[2].u.pszString);
+    }
+    else
+        fFlags |= DBGFPGDMP_FLAGS_CURRENT_MODE;
+
+    /*
+     * Call the worker.
+     */
+    rc = DBGFR3PagingDumpEx(pVM, pDbgc->idCpu, fFlags, cr3, GCPtrFirst, GCPtrLast, 99 /*cMaxDepth*/,
+                            DBGCCmdHlpGetDbgfOutputHlp(pCmdHlp));
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "DBGFR3PagingDumpEx: %Rrc\n", rc);
+    return VINF_SUCCESS;
+}
+
+
+
+/**
  * The 'dpg*' commands.
  *

trunk/src/VBox/Debugger/DBGCInternal.h

@@ -145 +145 @@
     /** Command helpers. */
     DBGCCMDHLP          CmdHlp;
+    /** Wrappers for DBGF output. */
+    DBGFINFOHLP         DbgfOutputHlp;
     /** Pointer to backend callback structure. */
     PDBGCBACK           pBack;
@@ -176 +178 @@
     /** Size of the previous dump element. */
     unsigned            cbDumpElement;
+    /** Points to DisasmPos, SourcePos or DumpPos depending on which was
+     *  used last. */
+    PCDBGCVAR           pLastPos;
 
     /** Number of variables in papVars. */

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -1966 +1966 @@
     //pDbgc->SourcePos        = {0};
     //pDbgc->DumpPos          = {0};
+    pDbgc->pLastPos          = &pDbgc->DisasmPos;
     //pDbgc->cbDumpElement    = 0;
     //pDbgc->cVars            = 0;

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -185 +185 @@
     return VERR_INTERNAL_ERROR;
 }
+VMMDECL(int) DBGFR3PagingDumpEx(PVM pVM, VMCPUID idCpu, uint32_t fFlags, uint64_t cr3, uint64_t u64FirstAddr,
+                                uint64_t u64LastAddr, uint32_t cMaxDepth, PCDBGFINFOHLP pHlp)
+{
+    return VERR_INTERNAL_ERROR;
+}
 VMMR3DECL(int) DBGFR3RegQueryU8(  PVM pVM, VMCPUID idCpu, DBGFREG enmReg, uint8_t     *pu8)
 {