Changeset 47824 in vbox

Timestamp:

Aug 17, 2013 11:32:21 PM (11 years ago)

Author:

vboxsync

Message:

RTDbgDwarf: Read gcc 4.8.1 dwarf output.

File:

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

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

@@ -142 +142 @@
 #define DW_TAG_template_alias               UINT16_C(0x0043)
 #define DW_TAG_lo_user                      UINT16_C(0x4080)
+#define DW_TAG_GNU_call_site                UINT16_C(0x4109)
+#define DW_TAG_GNU_call_site_parameter      UINT16_C(0x410a)
 #define DW_TAG_hi_user                      UINT16_C(0xffff)
 /** @} */
@@ -695 +697 @@
     uint8_t             fHaveLowAddress  : 1;
     uint8_t             fHaveHighAddress : 1;
+    uint8_t             fHaveHighIsAddress : 1;
     uint8_t             fHaveRanges      : 1;
 } RTDWARFADDRRANGE;
@@ -1200 +1203 @@
 
 
+
 /** @callback_method_impl{FNRTLDRENUMSEGS} */
 static DECLCALLBACK(int) rtDbgModDwarfScanSegmentsCallback(RTLDRMOD hLdrMod, PCRTLDRSEG pSeg, void *pvUser)
@@ -1500 +1504 @@
     }
 
-    //return pThis->pImgMod->pImgVt->pfnRvaToSegOffset(pThis->pImgMod, LinkAddress, piSeg, poffSeg);
-    return pThis->pImgMod->pImgVt->pfnLinkAddressToSegOffset(pThis->pImgMod, LinkAddress, piSeg, poffSeg);
+    return pThis->pImgMod->pImgVt->pfnRvaToSegOffset(pThis->pImgMod, LinkAddress, piSeg, poffSeg);
+    //return pThis->pImgMod->pImgVt->pfnLinkAddressToSegOffset(pThis->pImgMod, LinkAddress, piSeg, poffSeg);
 }
 
@@ -3180 +3184 @@
         }
         pRange->fHaveHighAddress = true;
-        pRange->uHighAddress     = uAddr;
+        pRange->fHaveHighIsAddress = uForm == DW_FORM_addr;
+        if (!pRange->fHaveHighIsAddress && pRange->fHaveLowAddress)
+        {
+            pRange->fHaveHighIsAddress = true;
+            pRange->uHighAddress     = uAddr + pRange->uLowAddress;
+        }
+        else
+            pRange->uHighAddress     = uAddr;
+
     }
     pRange->cAttrs++;
@@ -3201 +3213 @@
     switch (uForm)
     {
-        case DW_FORM_addr:  off = rtDwarfCursor_GetNativeUOff(pCursor, 0); break;
-        case DW_FORM_data4: off = rtDwarfCursor_GetU32(pCursor, 0); break;
-        case DW_FORM_data8: off = rtDwarfCursor_GetU64(pCursor, 0); break;
+        case DW_FORM_addr:          off = rtDwarfCursor_GetNativeUOff(pCursor, 0); break;
+        case DW_FORM_data4:         off = rtDwarfCursor_GetU32(pCursor, 0); break;
+        case DW_FORM_data8:         off = rtDwarfCursor_GetU64(pCursor, 0); break;
+        case DW_FORM_sec_offset:    off = rtDwarfCursor_GetUOff(pCursor, 0); break;
         default:
             AssertMsgFailedReturn(("%#x\n", uForm), VERR_DWARF_UNEXPECTED_FORM);
@@ -3831 +3844 @@
                             if (RT_SUCCESS(rc))
                             {
+                                uint64_t cb;
+                                if (pSubProgram->PcRange.uHighAddress >= pSubProgram->PcRange.uLowAddress)
+                                    cb = pSubProgram->PcRange.uHighAddress - pSubProgram->PcRange.uLowAddress;
+                               else
+                                    cb = 1;
                                 rc = RTDbgModSymbolAdd(pThis->hCnt,
                                                        rtDwarfInfo_SelectName(pSubProgram->pszName, pSubProgram->pszLinkageName),
-                                                       iSeg, offSeg,
-                                                       pSubProgram->PcRange.uHighAddress - pSubProgram->PcRange.uLowAddress,
-                                                       0 /*fFlags*/, NULL /*piOrdinal*/);
+                                                       iSeg, offSeg, cb, 0 /*fFlags*/, NULL /*piOrdinal*/);
                                 AssertMsg(RT_SUCCESS(rc) || rc == VERR_DBG_DUPLICATE_SYMBOL, ("%Rrc\n", rc));
                             }
@@ -4313 +4329 @@
             {
                 pszName  = "<unknown>";
-                pDieDesc = g_aTagDescs[0].pDesc;
+                pDieDesc = &g_CoreDieDesc;
             }
             Log4(("%08x: %*stag=%s (%#x, abbrev %u)%s\n", offLog, cDepth * 2, "", pszName,