Changeset 41510 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

May 30, 2012 8:05:54 PM (13 years ago)

Author:

vboxsync

Message:

IPRT/Elf: Working on loading watcom dwarf symbol files.

File:

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

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

@@ -141 +141 @@
     {
         const uint8_t *pu8 = (const uint8_t *)pModElf->pvBits;
-        pModElf->paSyms = (const Elf_Sym *)(pu8 + pModElf->paShdrs[pModElf->iSymSh].sh_offset);
-        pModElf->pStr   =    (const char *)(pu8 + pModElf->paShdrs[pModElf->iStrSh].sh_offset);
+        if (pModElf->iSymSh != ~0U)
+            pModElf->paSyms = (const Elf_Sym *)(pu8 + pModElf->paShdrs[pModElf->iSymSh].sh_offset);
+        if (pModElf->iStrSh != ~0U)
+            pModElf->pStr   =    (const char *)(pu8 + pModElf->paShdrs[pModElf->iStrSh].sh_offset);
     }
     return rc;
@@ -513 +515 @@
 static DECLCALLBACK(int) RTLDRELF_NAME(GetBits)(PRTLDRMODINTERNAL pMod, void *pvBits, RTUINTPTR BaseAddress, PFNRTLDRIMPORT pfnGetImport, void *pvUser)
 {
-    PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod;
+    PRTLDRMODELF    pModElf = (PRTLDRMODELF)pMod;
+
+    /*
+     * This operation is currently only available on relocatable images.
+     */
+    switch (pModElf->Ehdr.e_type)
+    {
+        case ET_REL:
+            break;
+        case ET_EXEC:
+            Log(("RTLdrELF: %s: Executable images are not supported yet!\n", pModElf->pReader->pfnLogName(pModElf->pReader)));
+            return VERR_LDRELF_EXEC;
+        case ET_DYN:
+            Log(("RTLdrELF: %s: Dynamic images are not supported yet!\n", pModElf->pReader->pfnLogName(pModElf->pReader)));
+            return VERR_LDRELF_DYN;
+        default: AssertFailedReturn(VERR_BAD_EXE_FORMAT);
+    }
 
     /*
@@ -558 +576 @@
                                                  RTUINTPTR OldBaseAddress, PFNRTLDRIMPORT pfnGetImport, void *pvUser)
 {
-    PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod;
+    PRTLDRMODELF    pModElf = (PRTLDRMODELF)pMod;
+#ifdef LOG_ENABLED
+    const char     *pszLogName = pModElf->pReader->pfnLogName(pModElf->pReader);
+#endif
     NOREF(OldBaseAddress);
+
+    /*
+     * This operation is currently only available on relocatable images.
+     */
+    switch (pModElf->Ehdr.e_type)
+    {
+        case ET_REL:
+            break;
+        case ET_EXEC:
+            Log(("RTLdrELF: %s: Executable images are not supported yet!\n", pszLogName));
+            return VERR_LDRELF_EXEC;
+        case ET_DYN:
+            Log(("RTLdrELF: %s: Dynamic images are not supported yet!\n", pszLogName));
+            return VERR_LDRELF_DYN;
+        default: AssertFailedReturn(VERR_BAD_EXE_FORMAT);
+    }
 
     /*
@@ -580 +617 @@
      */
     const Elf_Shdr *paShdrs = pModElf->paShdrs;
-#ifdef LOG_ENABLED
-    const char     *pszLogName = pModElf->pReader->pfnLogName(pModElf->pReader);
     Log2(("rtLdrElf: %s: Fixing up image\n", pszLogName));
-#endif
     for (unsigned iShdr = 0; iShdr < pModElf->Ehdr.e_shnum; iShdr++)
     {
@@ -648 +682 @@
      */
     const char         *pStr  = pModElf->pStr;
-    const Elf_Sym    *paSyms = pModElf->paSyms;
+    const Elf_Sym     *paSyms = pModElf->paSyms;
     unsigned            cSyms = pModElf->cSyms;
     for (unsigned iSym = 1; iSym < cSyms; iSym++)
@@ -859 +893 @@
     {
         case ET_REL:
+        case ET_EXEC:
+        case ET_DYN:
             break;
-        case ET_EXEC:
-            Log(("RTLdrELF: %s: Executable images are not supported yet!\n", pszLogName));
-            return VERR_LDRELF_EXEC;
-        case ET_DYN:
-            Log(("RTLdrELF: %s: Dynamic images are not supported yet!\n", pszLogName));
-            return VERR_LDRELF_DYN;
         default:
             Log(("RTLdrELF: %s: image type %#x is not supported!\n", pszLogName, pEhdr->e_type));
@@ -1161 +1191 @@
                 Log2(("RTLdrElf: iSymSh=%u cSyms=%u iStrSh=%u cbStr=%u rc=%Rrc cbImage=%#zx\n",
                       pModElf->iSymSh, pModElf->cSyms, pModElf->iStrSh, pModElf->cbStr, rc, pModElf->cbImage));
-
+#if 0
                 /*
                  * Are the section headers fine?
@@ -1169 +1199 @@
                     ||  pModElf->iStrSh == ~0U)
                     rc = VERR_LDRELF_NO_SYMBOL_OR_NO_STRING_TABS;
+#endif
                 if (RT_SUCCESS(rc))
                 {