Changeset 20739 in vbox for trunk/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp

Timestamp:

Jun 20, 2009 9:43:01 PM (16 years ago)

Author:

vboxsync

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

48855

Message:

iprt: RTDbgMod coding in progress.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp

@@ -9 +9 @@
 #include <iprt/mem.h>
 #include <iprt/string.h>
+#include <iprt/strcache.h>
 #include "internal/dbgmod.h"
 
@@ -24 +25 @@
     /** The name space core. */
     RTSTRSPACECORE              NameCore;
-    /** The name. */
-    char                       *pszName;
     /** The segent offset. */
     RTUINTPTR                   off;
@@ -57 +56 @@
     RTSTRSPACE                  Names;
     /** The address space tree. */
-    AVLRUINTPTRTREE             AddrTree;
+    AVLRUINTPTRTREE             Addresses;
     /** Segment table. */
     PRTDBGMODCONTAINERSEGMENT   paSegs;
@@ -71 +70 @@
 
 /** @copydoc RTDBGMODVTDBG::pfnLineByAddr */
-static DECLCALLBACK(int) rtDbgModContainer_LineByAddr(PRTDBGMODINT pMod, uint32_t iSeg, RTGCUINTPTR off, PRTGCINTPTR poffDisp, PRTDBGLINE pLine)
-{
-    return VINF_SUCCESS;
+static DECLCALLBACK(int) rtDbgModContainer_LineByAddr(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, RTGCUINTPTR off, PRTGCINTPTR poffDisp, PRTDBGLINE pLine)
+{
+    /** @todo Make it possible to add line numbers. */
+    return VERR_DBG_NO_LINE_NUMBERS;
 }
 
 
 /** @copydoc RTDBGMODVTDBG::pfnSymbolByAddr */
-static DECLCALLBACK(int) rtDbgModContainer_SymbolByAddr(PRTDBGMODINT pMod, uint32_t iSeg, RTGCUINTPTR off, PRTGCINTPTR poffDisp, PRTDBGSYMBOL pSymbol)
+static DECLCALLBACK(int) rtDbgModContainer_SymbolByAddr(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, RTGCUINTPTR off, PRTGCINTPTR poffDisp, PRTDBGSYMBOL pSymbol)
 {
     return VINF_SUCCESS;
@@ -92 +92 @@
 
 /** @copydoc RTDBGMODVTDBG::pfnSymbolAdd */
-static DECLCALLBACK(int) rtDbgModContainer_SymbolAdd(PRTDBGMODINT pMod, const char *pszSymbol, uint32_t iSeg, RTGCUINTPTR off, RTUINT cbSymbol)
-{
-    return VINF_SUCCESS;
+static DECLCALLBACK(int) rtDbgModContainer_SymbolAdd(PRTDBGMODINT pMod, const char *pszSymbol, RTDBGSEGIDX iSeg, RTGCUINTPTR off, uint32_t cbSymbol)
+{
+    PRTDBGMODCONTAINER pThis = (PRTDBGMODCONTAINER)pMod->pvDbgPriv;
+
+    /*
+     * Address validation. The other arguments have already been validated.
+     */
+    AssertMsgReturn(    (   iSeg >= RTDBGSEGIDX_SPECIAL_FIRST
+                         && iSeg <= RTDBGSEGIDX_SPECIAL_LAST)
+                    ||  iSeg < pThis->cSegs,
+                    ("iSeg=%x cSegs=%x\n", pThis->cSegs),
+                    VERR_DBG_INVALID_SEGMENT_INDEX);
+    AssertMsgReturn(    iSeg >= RTDBGSEGIDX_SPECIAL_FIRST
+                    ||  pThis->paSegs[iSeg].cb <= off + cbSymbol,
+                    ("off=%RTptr cbSymbol=%RTptr cbSeg=%RTptr\n", off, cbSymbol, pThis->paSegs[iSeg].cb),
+                    VERR_DBG_INVALID_SEGMENT_OFFSET);
+
+    /*
+     * Create a new entry.
+     */
+    PRTDBGMODCONTAINERSYMBOL pSymbol = (PRTDBGMODCONTAINERSYMBOL)RTMemAllocZ(sizeof(*pSymbol));
+    if (!pSymbol)
+        return VERR_NO_MEMORY;
+
+#if 0 /* continue on the workstation */
+    pSymbol->AddrCore.Key     = iSeg < RTDBGSEGIDX_SPECIAL_FIRST
+                              ? pThis->paSegs->off + off
+                              : off;
+    pSymbol->AddrCore.KeyLast = pSymbol->AddrCore.Key + cbSymbol;
+    pSymbol->off  = off;
+    pSymbol->iSeg = iSeg;
+    pSymbol->NameCore.pszString = RTStrCacheEnter(g_hDbgModStrCache, pszSymbol);
+    if (pSymbol->NameCore.pszString)
+    {
+        if (RTStrSpaceInsert(&pThis->Names, &pSymbol->NameCore))
+        {
+            if (RTStrSpaceInsert(&pThis->Names, &pSymbol->NameCore))
+            {
+
+            }
+        }
+    }
+#endif
+int rc = VERR_NOT_IMPLEMENTED;
+
+    return rc;
 }
 
@@ -102 +145 @@
 {
     PRTDBGMODCONTAINERSYMBOL pSym = RT_FROM_MEMBER(pNode, RTDBGMODCONTAINERSYMBOL, AddrCore);
-    RTStrFree(pSym->pszName);
+    RTStrCacheRelease(g_hDbgModStrCache, pSym->NameCore.pszString);
     RTMemFree(pSym);
     return 0;
@@ -116 +159 @@
      * Destroy the symbols and instance data.
      */
-    RTAvlrUIntPtrDestroy(&pThis->AddrTree, rtDbgModContainer_DestroyTreeNode, NULL);
+    RTAvlrUIntPtrDestroy(&pThis->Addresses, rtDbgModContainer_DestroyTreeNode, NULL);
     pThis->Names = NULL;
     RTMemFree(pThis->paSegs);
@@ -165 +208 @@
 
     pThis->Names = NULL;
-    pThis->AddrTree = NULL;
+    pThis->Addresses = NULL;
     pThis->paSegs = NULL;
     pThis->cSegs = 0;