Changeset 46167 in vbox for trunk/src/VBox

Timestamp:

May 19, 2013 10:12:49 PM (12 years ago)

Author:

vboxsync

Message:

Buried DBGFSym.cpp and with it loadsyms - rip.

Location:

trunk/src/VBox

Files:

• Debugger/DBGCCommands.cpp (modified) (4 diffs)
• Debugger/testcase/tstDBGCStubs.cpp (modified) (1 diff)
• VMM/Makefile.kmk (modified) (1 diff)
• VMM/VMMR3/DBGF.cpp (modified) (1 diff)
• VMM/VMMR3/DBGFAddrSpace.cpp (modified) (2 diffs)
• VMM/VMMR3/DBGFSym.cpp (deleted)
• VMM/VMMR3/PATMR3Dbg.cpp (modified) (1 diff)
• VMM/include/DBGFInternal.h (modified) (2 diffs)
• VMM/testcase/tstVMStruct.h (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCCommands.cpp

@@ -61 +61 @@
 static FNDBGCCMD dbgcCmdLoadMap;
 static FNDBGCCMD dbgcCmdLoadSeg;
-static FNDBGCCMD dbgcCmdLoadSyms;
 static FNDBGCCMD dbgcCmdSet;
 static FNDBGCCMD dbgcCmdUnset;
@@ -155 +154 @@
     {  1,           1,          DBGCVAR_CAT_NUMBER,     0,                              "seg",          "The module segment number (0-based)." },
     {  0,           1,          DBGCVAR_CAT_STRING,     DBGCVD_FLAGS_DEP_PREV,          "name",         "The module name. Empty string means default. (optional)" },
-};
-
-
-/** loadsyms arguments. */
-static const DBGCVARDESC    g_aArgLoadSyms[] =
-{
-    /* cTimesMin,   cTimesMax,  enmCategory,            fFlags,                         pszName,        pszDescription */
-    {  1,           1,          DBGCVAR_CAT_STRING,     0,                              "path",         "Filename string." },
-    {  0,           1,          DBGCVAR_CAT_NUMBER,     0,                              "delta",        "Delta to add to the loaded symbols. (optional)" },
-    {  0,           1,          DBGCVAR_CAT_STRING,     0,                              "module name",  "Module name. (optional)" },
-    {  0,           1,          DBGCVAR_CAT_POINTER,    DBGCVD_FLAGS_DEP_PREV,          "module address", "Module address. (optional)" },
-    {  0,           1,          DBGCVAR_CAT_NUMBER,     0,                              "module size",  "The module size. (optional)" },
 };
 
@@ -250 +237 @@
                                                                                                                                        "Loads the symbols of a segment in the executable image at the specified address. "
                                                                                                                                        /*"Optionally giving the module a name other than the file name stem."*/ },
-    { "loadsyms",   1,        5,        &g_aArgLoadSyms[0],  RT_ELEMENTS(g_aArgLoadSyms),  0, dbgcCmdLoadSyms,  "<filename> [delta] [module] [module address]", "Loads symbols from a text file. Optionally giving a delta and a module." },
     { "loadvars",   1,        1,        &g_aArgFilename[0],  RT_ELEMENTS(g_aArgFilename),  0, dbgcCmdLoadVars,  "<filename>",           "Load variables from file. One per line, same as the args to the set command." },
     { "log",        1,        1,        &g_aArgLog[0],       RT_ELEMENTS(g_aArgLog),       0, dbgcCmdLog,       "<group string>",       "Modifies the logging group settings (VBOX_LOG)" },
@@ -1388 +1374 @@
 
 /**
- * @interface_method_impl{FNDBCCMD, The 'loadsyms' command.}
- */
-static DECLCALLBACK(int) dbgcCmdLoadSyms(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs)
-{
-    /*
-     * Validate the parsing and make sense of the input.
-     * This is a mess as usual because we don't trust the parser yet.
-     */
-    if (    cArgs < 1
-        ||  paArgs[0].enmType != DBGCVAR_TYPE_STRING)
-    {
-        AssertMsgFailed(("Parse error, first argument required to be string!\n"));
-        return VERR_DBGC_PARSE_INCORRECT_ARG_TYPE;
-    }
-    DBGCVAR     AddrVar;
-    RTGCUINTPTR Delta = 0;
-    const char *pszModule = NULL;
-    RTGCUINTPTR ModuleAddress = 0;
-    unsigned    cbModule = 0;
-    if (cArgs > 1)
-    {
-        unsigned iArg = 1;
-        if (paArgs[iArg].enmType == DBGCVAR_TYPE_NUMBER)
-        {
-            Delta = (RTGCUINTPTR)paArgs[iArg].u.u64Number;
-            iArg++;
-        }
-        if (iArg < cArgs)
-        {
-            if (paArgs[iArg].enmType != DBGCVAR_TYPE_STRING)
-            {
-                AssertMsgFailed(("Parse error, module argument required to be string!\n"));
-                return VERR_DBGC_PARSE_INCORRECT_ARG_TYPE;
-            }
-            pszModule = paArgs[iArg].u.pszString;
-            iArg++;
-            if (iArg < cArgs)
-            {
-                if (!DBGCVAR_ISPOINTER(paArgs[iArg].enmType))
-                {
-                    AssertMsgFailed(("Parse error, module argument required to be GC pointer!\n"));
-                    return VERR_DBGC_PARSE_INCORRECT_ARG_TYPE;
-                }
-                int rc = DBGCCmdHlpEval(pCmdHlp, &AddrVar, "%%(%Dv)", &paArgs[iArg]);
-                if (RT_FAILURE(rc))
-                    return DBGCCmdHlpVBoxError(pCmdHlp, rc, "Module address cast %%(%Dv) failed.", &paArgs[iArg]);
-                ModuleAddress = paArgs[iArg].u.GCFlat;
-                iArg++;
-                if (iArg < cArgs)
-                {
-                    if (paArgs[iArg].enmType != DBGCVAR_TYPE_NUMBER)
-                    {
-                        AssertMsgFailed(("Parse error, module argument required to be an integer!\n"));
-                        return VERR_DBGC_PARSE_INCORRECT_ARG_TYPE;
-                    }
-                    cbModule = (unsigned)paArgs[iArg].u.u64Number;
-                    iArg++;
-                    if (iArg < cArgs)
-                    {
-                        AssertMsgFailed(("Parse error, too many arguments!\n"));
-                        return VERR_DBGC_PARSE_TOO_MANY_ARGUMENTS;
-                    }
-                }
-            }
-        }
-    }
-
-    /*
-     * Call the debug info manager about this loading...
-     */
-    int rc = DBGFR3ModuleLoad(pUVM, paArgs[0].u.pszString, Delta, pszModule, ModuleAddress, cbModule);
-    if (RT_FAILURE(rc))
-        return DBGCCmdHlpVBoxError(pCmdHlp, rc, "DBGInfoSymbolLoad(, '%s', %RGv, '%s', %RGv, 0)\n",
-                                   paArgs[0].u.pszString, Delta, pszModule, ModuleAddress);
-
-    NOREF(pCmd);
-    return VINF_SUCCESS;
-}
-
-
-/**
  * @interface_method_impl{FNDBCCMD, The 'set' command.}
  */

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

@@ -123 +123 @@
 }
 VMMR3DECL(int) DBGFR3LogModifyGroups(PUVM pUVM, const char *pszGroupSettings)
-{
-    return VERR_INTERNAL_ERROR;
-}
-VMMR3DECL(int) DBGFR3ModuleLoad(PUVM pUVM, const char *pszFilename, RTGCUINTPTR AddressDelta, const char *pszName, RTGCUINTPTR ModuleAddress, unsigned cbImage)
 {
     return VERR_INTERNAL_ERROR;

trunk/src/VBox/VMM/Makefile.kmk

@@ -126 +126 @@
         VMMR3/DBGFReg.cpp \
         VMMR3/DBGFStack.cpp \
-        VMMR3/DBGFSym.cpp \
         VMMR3/DBGFR3Trace.cpp \
         VMMR3/EM.cpp \

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

@@ -148 +148 @@
     if (RT_SUCCESS(rc))
         rc = dbgfR3AsInit(pUVM);
-    if (RT_SUCCESS(rc))
-        rc = dbgfR3SymInit(pVM);
     if (RT_SUCCESS(rc))
         rc = dbgfR3BpInit(pVM);

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

@@ -1137 +1137 @@
             RTDbgModRelease(hMod);
     }
-    /* Temporary conversions. */
-    else if (hDbgAs == DBGF_AS_GLOBAL)
-    {
-        DBGFSYMBOL DbgfSym;
-        rc = DBGFR3SymbolByAddr(pUVM->pVM, pAddress->FlatPtr, poffDisp, &DbgfSym);
-        if (RT_SUCCESS(rc))
-            dbgfR3AsSymbolConvert(pSymbol, &DbgfSym);
-    }
-    else if (hDbgAs == DBGF_AS_R0)
-    {
-        RTR0PTR     R0PtrMod;
-        char        szNearSym[260];
-        RTR0PTR     R0PtrNearSym;
-        RTR0PTR     R0PtrNearSym2;
-        VM_ASSERT_VALID_EXT_RETURN(pUVM->pVM, VERR_INVALID_VM_HANDLE);
-        rc = PDMR3LdrQueryR0ModFromPC(pUVM->pVM, pAddress->FlatPtr,
-                                      pSymbol->szName, sizeof(pSymbol->szName) / 2, &R0PtrMod,
-                                      &szNearSym[0],   sizeof(szNearSym),           &R0PtrNearSym,
-                                      NULL,            0,                           &R0PtrNearSym2);
-        if (RT_SUCCESS(rc))
-        {
-            pSymbol->offSeg     = pSymbol->Value = R0PtrNearSym;
-            pSymbol->cb         = R0PtrNearSym2 > R0PtrNearSym ? R0PtrNearSym2 - R0PtrNearSym : 0;
-            pSymbol->iSeg       = 0;
-            pSymbol->fFlags     = 0;
-            pSymbol->iOrdinal   = UINT32_MAX;
-            size_t offName = strlen(pSymbol->szName);
-            pSymbol->szName[offName++] = '!';
-            size_t cchNearSym = strlen(szNearSym);
-            if (cchNearSym + offName >= sizeof(pSymbol->szName))
-                cchNearSym = sizeof(pSymbol->szName) - offName - 1;
-            strncpy(&pSymbol->szName[offName], szNearSym, cchNearSym);
-            pSymbol->szName[offName + cchNearSym] = '\0';
-            if (poffDisp)
-                *poffDisp = pAddress->FlatPtr - pSymbol->Value;
-        }
-    }
 
     return rc;
@@ -1259 +1222 @@
         if (!phMod)
             RTDbgModRelease(hMod);
-    }
-    /* Temporary conversion. */
-    else if (hDbgAs == DBGF_AS_GLOBAL)
-    {
-        DBGFSYMBOL DbgfSym;
-        rc = DBGFR3SymbolByName(pUVM->pVM, pszSymbol, &DbgfSym);
-        if (RT_SUCCESS(rc))
-            dbgfR3AsSymbolConvert(pSymbol, &DbgfSym);
     }
 

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

@@ -191 +191 @@
         if (off + 8 <= sizeof(szName))
         {
-            DBGFSYMBOL Symbol;
-            RTGCINTPTR offDisp;
-
-            int rc = DBGFR3SymbolByAddr(pVM, pPatchRec->patch.pPrivInstrGC, &offDisp, &Symbol);
+            RTDBGSYMBOL Symbol;
+            RTGCINTPTR  offDisp;
+            DBGFADDRESS Addr;
+
+            int rc = DBGFR3AsSymbolByAddr(pVM->pUVM, DBGF_AS_GLOBAL,
+                                          DBGFR3AddrFromFlat(pVM->pUVM, &Addr, pPatchRec->patch.pPrivInstrGC),
+                                          RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+                                          &offDisp, &Symbol, NULL /*phMod*/);
             if (RT_SUCCESS(rc))
             {

trunk/src/VBox/VMM/include/DBGFInternal.h

@@ -234 +234 @@
     DBGFCMDDATA                 VMMCmdData;
 
-    /** Range tree containing the loaded symbols of the a VM.
-     * This tree will never have blind spots. */
-    R3PTRTYPE(AVLRGCPTRTREE)    SymbolTree;
-    /** Symbol name space. */
-    R3PTRTYPE(PRTSTRSPACE)      pSymbolSpace;
-    /** Indicates whether DBGFSym.cpp is initialized or not.
-     * This part is initialized in a lazy manner for performance reasons. */
-    bool                        fSymInited;
-    /** Alignment padding. */
-    uint32_t                    uAlignment0;
-
     /** The number of hardware breakpoints. */
     uint32_t                    cHwBreakpoints;
@@ -358 +347 @@
 int  dbgfR3RegInit(PUVM pUVM);
 void dbgfR3RegTerm(PUVM pUVM);
-int  dbgfR3SymInit(PVM pVM);
-int  dbgfR3SymTerm(PVM pVM);
 int  dbgfR3TraceInit(PVM pVM);
 void dbgfR3TraceRelocate(PVM pVM);

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -221 +221 @@
     //GEN_CHECK_OFF(DBGF, pInfoFirst);
     //GEN_CHECK_OFF(DBGF, InfoCritSect);
-    GEN_CHECK_OFF(DBGF, SymbolTree);
-    GEN_CHECK_OFF(DBGF, pSymbolSpace);
-    GEN_CHECK_OFF(DBGF, fSymInited);
     GEN_CHECK_OFF(DBGF, cHwBreakpoints);
     GEN_CHECK_OFF(DBGF, cBreakpoints);