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

Timestamp:

Aug 26, 2010 12:33:45 PM (15 years ago)

Author:

vboxsync

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

65230

Message:

PGM,DBGC,DBGF: Dump guest paging structures.

Location:

trunk/src/VBox/Debugger

Files:

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

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -2868 +2868 @@
 
 /**
- * The 'dph*' commands.
+ * The 'dph*' commands and main part of 'm'.
  *
  * @returns VBox status.
@@ -2884 +2884 @@
 
     /*
-     * Figure the context.
-     */
-    uint32_t fFlags = DBGFPGDMP_FLAGS_PAGE_INFO | DBGFPGDMP_FLAGS_HEADER;
-    if (pCmd->pszCmd[3] == '\0')
+     * Figure the context and base flags.
+     */
+    uint32_t fFlags = DBGFPGDMP_FLAGS_PAGE_INFO | DBGFPGDMP_FLAGS_PRINT_CR3;
+    if (pCmd->pszCmd[0] == 'm')
+        fFlags |= DBGFPGDMP_FLAGS_GUEST | DBGFPGDMP_FLAGS_SHADOW;
+    else if (pCmd->pszCmd[3] == '\0')
         fFlags |= pDbgc->fRegCtxGuest ? DBGFPGDMP_FLAGS_GUEST : DBGFPGDMP_FLAGS_SHADOW;
     else if (pCmd->pszCmd[3] == 'g')
@@ -2894 +2896 @@
         fFlags |= DBGFPGDMP_FLAGS_SHADOW;
     else
-        fFlags |= DBGFPGDMP_FLAGS_GUEST | DBGFPGDMP_FLAGS_SHADOW;
+        AssertFailed();
+
+    if (pDbgc->cPagingHierarchyDumps == 0)
+        fFlags |= DBGFPGDMP_FLAGS_HEADER;
+    pDbgc->cPagingHierarchyDumps = (pDbgc->cPagingHierarchyDumps + 1) % 42;
 
     /*
@@ -3586 +3592 @@
     if (!pVM)
         return DBGCCmdHlpFail(pCmdHlp, pCmd, "No VM.\n");
-
-    DBGCCmdHlpPrintf(pCmdHlp, "guest pd (dpdg %DV):\n", &paArgs[0]);
-    int rc1 = pCmdHlp->pfnExec(pCmdHlp, "dpdg %DV",     &paArgs[0]);
-    DBGCCmdHlpPrintf(pCmdHlp, "hyper pd (dpdh %DV):\n", &paArgs[0]);
-    int rc2 = pCmdHlp->pfnExec(pCmdHlp, "dpdh %DV",     &paArgs[0]);
-    DBGCCmdHlpPrintf(pCmdHlp, "guest pt (dptg %DV):\n", &paArgs[0]);
-    int rc3 = pCmdHlp->pfnExec(pCmdHlp, "dptg %DV",     &paArgs[0]);
-    DBGCCmdHlpPrintf(pCmdHlp, "hyper pt (dpth %DV):\n", &paArgs[0]);
-    int rc4 = pCmdHlp->pfnExec(pCmdHlp, "dpth %DV",     &paArgs[0]);
-    if (RT_FAILURE(rc1))
-        return rc1;
-    if (RT_FAILURE(rc2))
-        return rc2;
-    if (RT_FAILURE(rc3))
-        return rc3;
-    NOREF(pCmd); NOREF(cArgs); NOREF(pResult);
-    return rc4;
+    return dbgcCmdDumpPageHierarchy(pCmd, pCmdHlp, pVM, paArgs, cArgs, pResult);
 }
 

trunk/src/VBox/Debugger/DBGCInternal.h

@@ -169 +169 @@
     /** Indicates whether the register are terse or sparse. */
     bool                fRegTerse;
+    /** Counter use to suppress the printing of the headers. */
+    uint8_t             cPagingHierarchyDumps;
 
     /** Current dissassembler position. */

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -1963 +1963 @@
     pDbgc->fRegCtxGuest     = true;
     pDbgc->fRegTerse        = true;
+    //pDbgc->cPagingHierarchyDumps = 0;
     //pDbgc->DisasmPos        = {0};
     //pDbgc->SourcePos        = {0};