Changeset 75482 in vbox for trunk/src/VBox/Runtime/common/dbg

Timestamp:

Nov 15, 2018 12:40:53 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/dbgmodcontainer.cpp: Fix for symbol replacement for the case that we're replacing the most recently added symbol (ordinal = next-ordinal - 1).

File:

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

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_DBG
 #include <iprt/dbg.h>
 #include "internal/iprt.h"
@@ -34 +35 @@
 #include <iprt/avl.h>
 #include <iprt/err.h>
+#include <iprt/log.h>
 #include <iprt/mem.h>
 #define RTDBGMODCNT_WITH_MEM_CACHE
@@ -410 +412 @@
 static void rtDbgModContainer_SymbolReplace(PRTDBGMODCTN pThis, PAVLRUINTPTRTREE pAddrTree, PRTDBGMODCTNSYMBOL pToRemove)
 {
+    RTLogPrintf("rtDbgModContainer_SymbolReplace: pToRemove=%p ordinal=%u %04x:%08RX64 %s\n",
+         pToRemove, pToRemove->OrdinalCore.Key, pToRemove->iSeg, pToRemove->AddrCore.Key, pToRemove->NameCore.pszString);
+
     /* Unlink it. */
     PRTSTRSPACECORE pRemovedName = RTStrSpaceRemove(&pThis->Names, pToRemove->NameCore.pszString);
@@ -426 +431 @@
     RTMemFree(pToRemove);
 
-    /* Jump the last symbol ordinal to take its place. */
-    PAVLU32NODECORE pLastOrdinal = RTAvlU32Remove(&pThis->SymbolOrdinalTree, pThis->iNextSymbolOrdinal - 1);
-    AssertReturnVoid(pLastOrdinal);
-
-    pThis->iNextSymbolOrdinal -= 1;
-    pLastOrdinal->Key = iOrdinal;
-    bool fInsert = RTAvlU32Insert(&pThis->SymbolOrdinalTree, pLastOrdinal);
-    Assert(fInsert); RT_NOREF_PV(fInsert);
+    /* Jump the last symbol ordinal to take its place, unless pToRemove is the last one. */
+    if (iOrdinal >= pThis->iNextSymbolOrdinal - 1)
+        pThis->iNextSymbolOrdinal -= 1;
+    else
+    {
+        PAVLU32NODECORE pLastOrdinal = RTAvlU32Remove(&pThis->SymbolOrdinalTree, pThis->iNextSymbolOrdinal - 1);
+        AssertReturnVoid(pLastOrdinal);
+
+        pThis->iNextSymbolOrdinal -= 1;
+        pLastOrdinal->Key = iOrdinal;
+        bool fInsert = RTAvlU32Insert(&pThis->SymbolOrdinalTree, pLastOrdinal);
+        Assert(fInsert); RT_NOREF_PV(fInsert);
+    }
 }
 
@@ -494 +504 @@
                     if (piOrdinal)
                         *piOrdinal = pThis->iNextSymbolOrdinal;
+                    RTLogPrintf("rtDbgModContainer_SymbolAdd: ordinal=%u %04x:%08RX64 LB %#RX64 %s\n",
+                           pThis->iNextSymbolOrdinal, iSeg, off, cb, pSymbol->NameCore.pszString);
                     pThis->iNextSymbolOrdinal++;
                     return rc;
@@ -559 +571 @@
                                 *piOrdinal = pThis->iNextSymbolOrdinal;
                             pThis->iNextSymbolOrdinal++;
+                            RTLogPrintf("rtDbgModContainer_SymbolAdd: ordinal=%u %04x:%08RX64 LB %#RX64 %s [replace codepath]\n",
+                                   pThis->iNextSymbolOrdinal, iSeg, off, cb, pSymbol->NameCore.pszString);
                             return rc;
                         }