Changeset 74981 in vbox for trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp

Timestamp:

Oct 22, 2018 7:48:54 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/Dbg: Made the codeview debug info parser prefer symbols with sizes. This helps MakeAlternativeSource avoiding jump tables.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp (modified) (2 diffs)

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

@@ -592 +592 @@
         if (RT_SUCCESS(rc))
         {
-            rc = RTDbgModSymbolAdd(pThis->hCnt, pszName, iSeg, off, cbSym, 0 /*fFlags*/, NULL);
+            rc = RTDbgModSymbolAdd(pThis->hCnt, pszName, iSeg, off, cbSym, RTDBGSYMBOLADD_F_ADJUST_SIZES_ON_CONFLICT, NULL);
 
             /* Simple duplicate symbol mangling, just to get more details. */
@@ -609 +609 @@
 
             }
+            else if (rc == VERR_DBG_ADDRESS_CONFLICT && cbSym)
+                rc = RTDbgModSymbolAdd(pThis->hCnt, pszName, iSeg, off, cbSym,
+                                       RTDBGSYMBOLADD_F_REPLACE_SAME_ADDR | RTDBGSYMBOLADD_F_ADJUST_SIZES_ON_CONFLICT, NULL);
 
             Log(("Symbol: %04x:%08x %.*s [%Rrc]\n", iSeg, off, cchName, pchName, rc));