Changeset 22111 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 9, 2009 8:12:09 PM (16 years ago)

Author:

vboxsync

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

50866

Message:

RTDbgAs,RTDbgMod: Bugfixes.

Location:

trunk/src/VBox/Runtime/common/dbg

Files:

• dbgas.cpp (modified) (9 diffs)
• dbgmodcontainer.cpp (modified) (1 diff)

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

@@ -500 +500 @@
         pAdjMod = (PRTDBGASMAP)RTAvlrUIntPtrGetBestFit(&pDbgAs->MapTree, Addr, true /* fAbove */);
         if (     pAdjMod
-            &&   pAdjMod->Core.Key >= Addr + cb - 1)
+            &&   pAdjMod->Core.Key <= Addr + cb - 1)
         {
             if (!(fFlags & RTDBGASLINK_FLAGS_REPLACE))
@@ -525 +525 @@
                 return VERR_NO_MEMORY;
             pDbgAs->paModules = (PRTDBGASMOD)pvNew;
+
+            /** @todo this rebuilding of the tree gets a bit silly... */
+            pDbgAs->ModTree = NULL;
+            for (uint32_t iMod = 0; iMod < pDbgAs->cModules; iMod++)
+            {
+                bool fRc = RTAvlPVInsert(&pDbgAs->ModTree, &pDbgAs->paModules[iMod].Core);
+                Assert(fRc); NOREF(fRc);
+            }
         }
         pMod = &pDbgAs->paModules[pDbgAs->cModules];
@@ -551 +559 @@
             {
                 pDbgAs->cModules--;
+                RTAvlPVRemove(&pDbgAs->ModTree, hDbgMod);
                 RTDbgModRelease(hDbgMod);
                 return VERR_NO_MEMORY;
@@ -557 +566 @@
             pName->StrCore.pszString = (char *)memcpy(pName + 1, pszName, cchName + 1);
             pName->pHead = pMod;
+            if (!RTStrSpaceInsert(&pDbgAs->NameSpace, &pName->StrCore))
+                AssertFailed();
         }
         else
@@ -714 +725 @@
      * Unlink it from the name.
      */
-    PRTDBGASNAME pName = (PRTDBGASNAME)RTStrSpaceGet(&pDbgAs->NameSpace, RTDbgModName((RTDBGMOD)pMod->Core.Key));
+    const char  *pszName = RTDbgModName((RTDBGMOD)pMod->Core.Key);
+    PRTDBGASNAME pName   = (PRTDBGASNAME)RTStrSpaceGet(&pDbgAs->NameSpace, pszName);
     AssertReturnVoid(pName);
 
@@ -751 +763 @@
     pDbgAs->cModules--;
     if (iMod <= pDbgAs->cModules)
+    {
+        pNode = RTAvlPVRemove(&pDbgAs->ModTree, pDbgAs->paModules[pDbgAs->cModules].Core.Key);
+        Assert(pNode);
         pDbgAs->paModules[iMod] = pDbgAs->paModules[pDbgAs->cModules];
+        bool fRc = RTAvlPVInsert(&pDbgAs->ModTree, &pMod->Core);
+        Assert(fRc); NOREF(fRc);
+    }
 }
 
@@ -767 +785 @@
     /* remove from the tree */
     PAVLRUINTPTRNODECORE pNode = RTAvlrUIntPtrRemove(&pDbgAs->MapTree, pMap->Core.Key);
-    Assert(pNode);
+    Assert(pNode == &pMap->Core);
 
     /* unlink */
@@ -775 +793 @@
     else
     {
-        bool        fFound = false;
+        bool fFound = false;
         for (PRTDBGASMAP pCur = pMod->pMapHead; pCur; pCur = pCur->pNext)
             if (pCur->pNext == pMap)
@@ -1334 +1352 @@
      */
     RTDBGSEGIDX const iSeg = pSymbol->iSeg;
-    if (iSeg)
+    if (iSeg == RTDBGSEGIDX_ABS)
         return true;
 

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

@@ -415 +415 @@
             if (RTAvlrUIntPtrInsert(pAddrTree, &pSymbol->AddrCore))
             {
-                if (RTAvlU32Insert(&pThis->LineOrdinalTree, &pSymbol->OrdinalCore))
+                if (RTAvlU32Insert(&pThis->SymbolOrdinalTree, &pSymbol->OrdinalCore))
                 {
                     if (piOrdinal)