Changeset 75235 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Nov 2, 2018 9:01:36 PM (6 years ago)

Author:

vboxsync

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

126333

Message:

IPRT: Starting to get somewhere with DWARF unwinding. bugref:3897

File:

• trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h (modified) (4 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

@@ -1419 +1419 @@
     int rc;
     RTLDRADDR uRva = off;
-    if (iSeg == RTDBGSEGIDX_RVA)
+    if (iSeg == UINT32_MAX)
         rc = RTLDRELF_NAME(RvaToSegOffset)(pMod, uRva, &iSeg, &off);
     else
@@ -1454 +1454 @@
                 && pszName[8] == 'e')
             {
-                if (pszName[8] == '\0')
+                if (pszName[9] == '\0')
                     pThis->iShEhFrame = iShdr;
-                else if (   pszName[8] == '_'
-                         && pszName[9] == 'h'
-                         && pszName[10] == 'd'
-                         && pszName[11] == 'r'
-                         && pszName[12] == '\0')
+                else if (   pszName[9] == '_'
+                         && pszName[10] == 'h'
+                         && pszName[11] == 'd'
+                         && pszName[12] == 'r'
+                         && pszName[13] == '\0')
                     pThis->iShEhFrameHdr = iShdr;
                 else
@@ -1479 +1479 @@
         if (pThis->paShdrs[iShdr].sh_flags & SHF_ALLOC)
             return rtDwarfUnwind_EhData((uint8_t const *)pThis->pvBits + pThis->paShdrs[iShdr].sh_addr,
-                                        pThis->paShdrs[iShdr].sh_size, iSeg, off, uRva, pState, pThis->Core.enmArch);
+                                        pThis->paShdrs[iShdr].sh_size, pThis->paShdrs[iShdr].sh_addr,
+                                        iSeg, off, uRva, pState, pThis->Core.enmArch);
     }
     return VERR_DBG_NO_UNWIND_INFO;
 }
-
-
 
 
@@ -1980 +1979 @@
                         rc = VERR_LDR_GENERAL_FAILURE;
                     }
+                    if (pModElf->Ehdr.e_type == ET_DYN && pModElf->LinkAddress < 0x1000)
+                        pModElf->LinkAddress = 0;
                 }