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

Timestamp:

Oct 27, 2021 7:55:58 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/dbgmoddwarf: Don't barf on DW_TAG_label w/o any symbol name (isolinux-debug.elf). Don't assert on DW_LNE_set_descriminator appearing in v3 tables (gcc 10).

File:

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

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

@@ -3825 +3825 @@
 
                         /*
-                         * Note! Was defined in DWARF 4.  But... Watcom used it
-                         *       for setting the segment in DWARF 2, creating
-                         *       an incompatibility with the newer standard.
+                         * Note! Was defined in DWARF 4.  But... Watcom used it for setting the
+                         *       segment in DWARF 2, creating an incompatibility with the newer
+                         *       standard.  And gcc 10 uses v3 for these.
                          */
                         case DW_LNE_set_descriminator:
                             if (pLnState->Hdr.uVer != 2)
                             {
-                                Assert(pLnState->Hdr.uVer >= 4);
+                                Assert(pLnState->Hdr.uVer >= 3);
                                 pLnState->Regs.uDiscriminator = rtDwarfCursor_GetULeb128AsU32(pCursor, UINT32_MAX);
                                 Log2(("%08x: DW_LNE_set_descriminator: %u\n", offOpCode, pLnState->Regs.uDiscriminator));
@@ -5160 +5160 @@
                 if (pThis->iWatcomPass == 1)
                     rc = rtDbgModDwarfRecordSegOffset(pThis, pLabel->uSegment, pLabel->Address.uAddress);
-                else
+                else if (pLabel->pszName && *pLabel->pszName != '\0') /* Seen empty labels with isolinux. */
                 {
                     RTDBGSEGIDX iSeg;