Changeset 46156 in vbox

Timestamp:

May 18, 2013 1:35:16 AM (12 years ago)

Author:

vboxsync

Message:

List near, unassemble, hyper register and more tiny debugger fixes.

Location:

trunk/src/VBox/Debugger

Files:

• DBGCEmulateCodeView.cpp (modified) (13 diffs)
• DBGCOps.cpp (modified) (3 diffs)
• DBGConsole.cpp (modified) (1 diff)
• testcase/tstDBGCStubs.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -689 +689 @@
     RTINTPTR    off;
     DBGFADDRESS Addr;
-    int rc = DBGFR3AsSymbolByAddr(pUVM, pDbgc->hDbgAs, DBGFR3AddrFromFlat(pDbgc->pUVM, &Addr, pBp->GCPtr), &off, &Sym, NULL);
+    int rc = DBGFR3AsSymbolByAddr(pUVM, pDbgc->hDbgAs, DBGFR3AddrFromFlat(pDbgc->pUVM, &Addr, pBp->GCPtr),
+                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, &off, &Sym, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -697 +698 @@
             DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%s+%RGv", Sym.szName, off);
         else
-            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%s+%RGv", Sym.szName, -off);
+            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%s-%RGv", Sym.szName, -off);
     }
 
@@ -854 +855 @@
     }
     return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "Failed to set REM breakpoint at %RGv", Address.FlatPtr);
+}
+
+
+/**
+ * Helps the unassmble ('u') command display symbols it starts at and passes.
+ *
+ * @param   pUVM            The user mode VM handle.
+ * @param   pCmdHlp         The command helpers for printing via.
+ * @param   hDbgAs          The address space to look up addresses in.
+ * @param   pAddress        The current address.
+ * @param   pcbCallAgain    Where to return the distance to the next check (in
+ *                          instruction bytes).
+ */
+static void dbgcCmdUnassambleHelpListNear(PUVM pUVM, PDBGCCMDHLP pCmdHlp, RTDBGAS hDbgAs, PCDBGFADDRESS pAddress,
+                                         PRTUINTPTR pcbCallAgain)
+{
+    RTDBGSYMBOL Symbol;
+    RTGCINTPTR  offDispSym;
+    int rc = DBGFR3AsSymbolByAddr(pUVM, hDbgAs, pAddress, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, &offDispSym, &Symbol, NULL);
+    if (RT_FAILURE(rc) || offDispSym > _1G)
+        rc = DBGFR3AsSymbolByAddr(pUVM, hDbgAs, pAddress, RTDBGSYMADDR_FLAGS_GREATER_OR_EQUAL, &offDispSym, &Symbol, NULL);
+    if (RT_SUCCESS(rc) && offDispSym < _1G)
+    {
+        if (!offDispSym)
+        {
+            DBGCCmdHlpPrintf(pCmdHlp, "%s:\n", Symbol.szName);
+            *pcbCallAgain = Symbol.cb;
+        }
+        else if (offDispSym > 0)
+        {
+            DBGCCmdHlpPrintf(pCmdHlp, "%s+%#llx:\n", Symbol.szName, (uint64_t)offDispSym);
+            *pcbCallAgain = Symbol.cb > (RTGCUINTPTR)offDispSym ? Symbol.cb - (RTGCUINTPTR)offDispSym : 1;
+        }
+        else
+        {
+            DBGCCmdHlpPrintf(pCmdHlp, "%s-%#llx:\n", Symbol.szName, (uint64_t)-offDispSym);
+            *pcbCallAgain = (RTGCUINTPTR)-offDispSym + Symbol.cb;
+        }
+    }
+    else
+        *pcbCallAgain = UINT32_MAX;
 }
 
@@ -887 +929 @@
         case 'v':   fFlags |= DBGF_DISAS_FLAGS_16BIT_REAL_MODE; break;
     }
+
+    /** @todo should use DBGFADDRESS for everything */
 
     /*
@@ -913 +957 @@
                 fFlags |= DBGF_DISAS_FLAGS_CURRENT_GUEST;
             else
-                fFlags |= DBGF_DISAS_FLAGS_CURRENT_HYPER;
+                fFlags |= DBGF_DISAS_FLAGS_CURRENT_HYPER | DBGF_DISAS_FLAGS_HYPER;
         }
         pDbgc->DisasmPos.enmRangeType = DBGCVAR_RANGE_NONE;
@@ -948 +992 @@
      * Convert physical and host addresses to guest addresses.
      */
+    RTDBGAS hDbgAs = pDbgc->hDbgAs;
     int rc;
     switch (pDbgc->DisasmPos.enmType)
@@ -955 +1000 @@
             break;
         case DBGCVAR_TYPE_GC_PHYS:
+            hDbgAs = DBGF_AS_PHYS;
         case DBGCVAR_TYPE_HC_FLAT:
         case DBGCVAR_TYPE_HC_PHYS:
@@ -968 +1014 @@
     }
 
-    /*
-     * Print address.
-     * todo: Change to list near.
-     */
-#if 0
-    rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "%DV:\n", &pDbgc->DisasmPos);
+    DBGFADDRESS CurAddr;
+    rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &pDbgc->DisasmPos, &CurAddr);
     if (RT_FAILURE(rc))
-        return rc;
-#endif
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGCCmdHlpVarToDbgfAddr failed on '%Dv'", &pDbgc->DisasmPos);
+
+    if (CurAddr.fFlags & DBGFADDRESS_FLAGS_HMA)
+        fFlags |= DBGF_DISAS_FLAGS_HYPER; /* This crap is due to not using DBGFADDRESS as DBGFR3Disas* input. */
+
+    /*
+     * Figure out where we are and display it.  Also calculate when we need to
+     * check for a new symbol if possible.
+     */
+    RTGCUINTPTR cbCheckSymbol;
+    dbgcCmdUnassambleHelpListNear(pUVM, pCmdHlp, hDbgAs, &CurAddr, &cbCheckSymbol);
 
     /*
@@ -1008 +1059 @@
         {
             /* bitch. */
-            rc = DBGCCmdHlpPrintf(pCmdHlp, "Failed to disassemble instruction, skipping one byte.\n");
-            if (RT_FAILURE(rc))
-                return rc;
+            int rc2 = DBGCCmdHlpPrintf(pCmdHlp, "Failed to disassemble instruction, skipping one byte.\n");
+            if (RT_FAILURE(rc2))
+                return rc2;
             if (cTries-- > 0)
                 return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "Too many disassembly failures. Giving up");
@@ -1029 +1080 @@
             break;
         fFlags &= ~(DBGF_DISAS_FLAGS_CURRENT_GUEST | DBGF_DISAS_FLAGS_CURRENT_HYPER);
+
+        /* Print next symbol? */
+        if (cbCheckSymbol <= cbInstr)
+        {
+            rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &pDbgc->DisasmPos, &CurAddr);
+            if (RT_SUCCESS(rc))
+                dbgcCmdUnassambleHelpListNear(pUVM, pCmdHlp, hDbgAs, &CurAddr, &cbCheckSymbol);
+            else
+                cbCheckSymbol = UINT32_MAX;
+        }
+        else
+            cbCheckSymbol -= cbInstr;
     }
 
@@ -3818 +3881 @@
         RTINTPTR    offDisp;
         DBGFADDRESS Addr;
-        rc = DBGFR3AsSymbolByAddr(pUVM, pDbgc->hDbgAs, DBGFR3AddrFromFlat(pDbgc->pUVM, &Addr, AddrVar.u.GCFlat), &offDisp, &Symbol, NULL);
+        rc = DBGFR3AsSymbolByAddr(pUVM, pDbgc->hDbgAs, DBGFR3AddrFromFlat(pDbgc->pUVM, &Addr, AddrVar.u.GCFlat),
+                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, &offDisp, &Symbol, NULL);
         if (RT_FAILURE(rc))
             return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3ASymbolByAddr(,,%RGv,,)\n", AddrVar.u.GCFlat);
@@ -3843 +3907 @@
 static DECLCALLBACK(int) dbgcCmdListNear(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs)
 {
+    PDBGC pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
     if (!cArgs)
     {
@@ -3849 +3914 @@
          */
         DBGCVAR AddrVar;
-        int rc = DBGCCmdHlpEval(pCmdHlp, &AddrVar, "%%(cs:eip)");
+        const char *pszFmtExpr = pDbgc->fRegCtxGuest ? "%%(cs:eip)" : "%%(.cs:.eip)";
+        int rc = DBGCCmdHlpEval(pCmdHlp, &AddrVar, pszFmtExpr);
         if (RT_FAILURE(rc))
-            return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "%%(cs:eip)\n");
+            return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "%s\n", pszFmtExpr + 1);
         return dbgcDoListNear(pCmdHlp, pUVM, &AddrVar);
     }

trunk/src/VBox/Debugger/DBGCOps.cpp

@@ -456 +456 @@
     AssertReturn(pArg->enmType == DBGCVAR_TYPE_SYMBOL, VERR_DBGC_PARSE_BUG);
 
+    /* Detect references to hypervisor registers. */
+    const char *pszReg = pArg->u.pszString;
+    VMCPUID idCpu = pDbgc->idCpu;
+    if (pszReg[0] == '.')
+    {
+        pszReg++;
+        idCpu |= DBGFREG_HYPER_VMCPUID;
+    }
+
     /*
      * If the desired result is a symbol, pass the argument along unmodified.
@@ -462 +471 @@
     if (enmCat == DBGCVAR_CAT_SYMBOL)
     {
-        int rc = DBGFR3RegNmValidate(pDbgc->pUVM, pDbgc->idCpu, pArg->u.pszString);
+        int rc = DBGFR3RegNmValidate(pDbgc->pUVM, idCpu, pszReg);
         if (RT_SUCCESS(rc))
             DBGCVAR_INIT_STRING(pResult, pArg->u.pszString);
@@ -473 +482 @@
     DBGFREGVALTYPE  enmType;
     DBGFREGVAL      Value;
-    int rc = DBGFR3RegNmQuery(pDbgc->pUVM, pDbgc->idCpu, pArg->u.pszString, &Value, &enmType);
+    int rc = DBGFR3RegNmQuery(pDbgc->pUVM, idCpu, pszReg, &Value, &enmType);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -237 +237 @@
         "ip;"
     ;
-    size_t const cchSymbol = strlen(pszSymbol);
-    if (    (cchSymbol == 2 && strstr(s_szTwoLetterRegisters,   pszSymbol))
-        ||  (cchSymbol == 3 && strstr(s_szThreeLetterRegisters, pszSymbol))
-        ||  (cchSymbol == 6 && strstr(s_szSixLetterRegisters,   pszSymbol)))
+    const char  *pszRegSym = *pszSymbol == '.' ? pszSymbol + 1 : pszSymbol;
+    size_t const cchRegSym = strlen(pszRegSym);
+    if (    (cchRegSym == 2 && strstr(s_szTwoLetterRegisters,   pszRegSym))
+        ||  (cchRegSym == 3 && strstr(s_szThreeLetterRegisters, pszRegSym))
+        ||  (cchRegSym == 6 && strstr(s_szSixLetterRegisters,   pszRegSym)))
     {
         if (!strchr(pszSymbol, ';'))

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

@@ -169 +169 @@
     return VERR_INTERNAL_ERROR;
 }
-VMMR3DECL(int) DBGFR3AsSymbolByAddr(PUVM pUVM, RTDBGAS hDbgAs, PCDBGFADDRESS pAddress, PRTGCINTPTR poffDisplacement, PRTDBGSYMBOL pSymbol, PRTDBGMOD phMod)
+VMMR3DECL(int) DBGFR3AsSymbolByAddr(PUVM pUVM, RTDBGAS hDbgAs, PCDBGFADDRESS pAddress, uint32_t fFlags, PRTGCINTPTR poffDisplacement, PRTDBGSYMBOL pSymbol, PRTDBGMOD phMod)
 {
     return VERR_INTERNAL_ERROR;