Usermode/ld-acess - Fixes for clang compilation
[tpg/acess2.git] / Usermode / Libraries / ld-acess.so_src / elf.c
index dcde746..531b32d 100644 (file)
-/*\r
- * AcessOS 1 - Dynamic Loader\r
- * By thePowersGang\r
- */\r
-#include "common.h"\r
-#include "elf32.h"\r
+/*
+ * Acess2 Dynamic Linker
+ * - By John Hodge (thePowersGang)
+ *
+ * elf.c
+ * - ELF32/ELF64 relocation
+ */
+#ifndef DEBUG  // This code is #include'd from the kernel, so DEBUG may already be defined
+# define DEBUG 0
+#endif
+
+#ifndef PAGE_SIZE
+# define PAGE_SIZE     4096
+#endif
 
-#define DEBUG  0
+#include "common.h"
+#include <stdint.h>
+#include "elf32.h"
+#include "elf64.h"
 
-#if DEBUG\r
-# define       DEBUGS(v...)    SysDebug(v)\r
+#if DEBUG
+# define       DEBUGS(v...)    SysDebug("ld-acess - " v)
 #else
 # define       DEBUGS(...)     
 #endif
-\r
+
+#ifndef DISABLE_ELF64
+# define SUPPORT_ELF64
+#endif
+
 // === CONSTANTS ===
-#if DEBUG\r
-//static const char    *csaDT_NAMES[] = {"DT_NULL", "DT_NEEDED", "DT_PLTRELSZ", "DT_PLTGOT", "DT_HASH", "DT_STRTAB", "DT_SYMTAB", "DT_RELA", "DT_RELASZ", "DT_RELAENT", "DT_STRSZ", "DT_SYMENT", "DT_INIT", "DT_FINI", "DT_SONAME", "DT_RPATH", "DT_SYMBOLIC", "DT_REL", "DT_RELSZ", "DT_RELENT", "DT_PLTREL", "DT_DEBUG", "DT_TEXTREL", "DT_JMPREL"};\r
+#if DEBUG
+//static const char    *csaDT_NAMES[] = {"DT_NULL", "DT_NEEDED", "DT_PLTRELSZ", "DT_PLTGOT", "DT_HASH", "DT_STRTAB", "DT_SYMTAB", "DT_RELA", "DT_RELASZ", "DT_RELAENT", "DT_STRSZ", "DT_SYMENT", "DT_INIT", "DT_FINI", "DT_SONAME", "DT_RPATH", "DT_SYMBOLIC", "DT_REL", "DT_RELSZ", "DT_RELENT", "DT_PLTREL", "DT_DEBUG", "DT_TEXTREL", "DT_JMPREL"};
 static const char      *csaR_NAMES[] = {"R_386_NONE", "R_386_32", "R_386_PC32", "R_386_GOT32", "R_386_PLT32", "R_386_COPY", "R_386_GLOB_DAT", "R_386_JMP_SLOT", "R_386_RELATIVE", "R_386_GOTOFF", "R_386_GOTPC", "R_386_LAST"};
-#endif\r
-\r
-// === PROTOTYPES ===\r
-void elf_doRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symtab, Uint base);\r
-Uint ElfHashString(char *name);\r
-\r
-// === CODE ===\r
-/**\r
- \fn int ElfRelocate(void *Base, char **envp, char *Filename)\r
- \brief Relocates a loaded ELF Executable\r
-*/\r
-int ElfRelocate(void *Base, char **envp, char *Filename)\r
-{\r
-       Elf32_Ehdr      *hdr = Base;\r
-       Elf32_Phdr      *phtab;\r
-        int    i, j;   // Counters\r
-       char    *libPath;\r
-       Uint    iRealBase = -1;\r
-       Uint    iBaseDiff;\r
-        int    iSegmentCount;\r
-        int    iSymCount;\r
-       Elf32_Rel       *rel = NULL;\r
-       Elf32_Rela      *rela = NULL;\r
-       Uint32  *pltgot = NULL;\r
-       void    *plt = NULL;\r
-        int    relSz=0, relEntSz=8;\r
-        int    relaSz=0, relaEntSz=8;\r
-        int    pltSz=0, pltType=0;\r
-       Elf32_Dyn       *dynamicTab = NULL;     // Dynamic Table Pointer\r
-       char    *dynstrtab = NULL;      // .dynamic String Table\r
-       Elf32_Sym       *dynsymtab;\r
-       \r
-       DEBUGS("ElfRelocate: (Base=0x%x)\n", Base);\r
-       \r
-       // Check magic header\r
-       \r
-       \r
-       // Parse Program Header to get Dynamic Table\r
-       phtab = Base + hdr->phoff;\r
-       iSegmentCount = hdr->phentcount;\r
-       for(i=0;i<iSegmentCount;i++)\r
-       {\r
-               // Determine linked base address\r
-               if(phtab[i].Type == PT_LOAD && iRealBase > phtab[i].VAddr)\r
-                       iRealBase = phtab[i].VAddr;\r
-               \r
-               // Find Dynamic Section\r
-               if(phtab[i].Type == PT_DYNAMIC) {\r
-                       if(dynamicTab) {\r
-                               DEBUGS(" WARNING - elf_relocate: Multiple PT_DYNAMIC segments\n");\r
-                               continue;\r
-                       }\r
-                       dynamicTab = (void *) phtab[i].VAddr;\r
-                       j = i;  // Save Dynamic Table ID\r
-               }\r
-       }\r
-       \r
-       // Page Align real base\r
-       iRealBase &= ~0xFFF;\r
-       DEBUGS(" elf_relocate: True Base = 0x%x, Compiled Base = 0x%x\n", Base, iRealBase);\r
-       \r
-       // Adjust "Real" Base\r
-       iBaseDiff = (Uint)Base - iRealBase;\r
-       \r
-       hdr->entrypoint += iBaseDiff;   // Adjust Entrypoint\r
-       \r
-       // Check if a PT_DYNAMIC segement was found\r
-       if(!dynamicTab) {\r
-               SysDebug(" elf_relocate: No PT_DYNAMIC segment in image, returning\n");\r
-               return hdr->entrypoint;\r
-       }\r
-       \r
-       // Adjust Dynamic Table\r
-       dynamicTab = (void *) ((Uint)dynamicTab + iBaseDiff);\r
+#endif
+
+// === PROTOTYPES ===
+void   *ElfRelocate(void *Base, char **envp, const char *Filename);
+ int   ElfGetSymbol(void *Base, const char *Name, void **Ret, size_t *Size);
+void   *Elf32Relocate(void *Base, char **envp, const char *Filename);
+ int   Elf32GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size);
+ int   elf_doRelocate_386(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff);
+ int   elf_doRelocate_arm(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff);
+ int   elf_doRelocate_unk(uint32_t , uint32_t *, Elf32_Addr , int , int , const char *, intptr_t);
+#ifdef SUPPORT_ELF64
+void   *Elf64Relocate(void *Base, char **envp, const char *Filename);
+ int   Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size);
+#endif
+uint32_t       ElfHashString(const char *name);
+
+// === CODE ===
+/**
+ * \fn int ElfRelocate(void *Base, char **envp, const char *Filename)
+ * \brief Relocates a loaded ELF Executable
+ */
+void *ElfRelocate(void *Base, char **envp, const char *Filename)
+{
+       Elf32_Ehdr      *hdr = Base;
+       
+       switch(hdr->e_ident[4])
+       {
+       case ELFCLASS32:
+               return Elf32Relocate(Base, envp, Filename);
+#ifdef SUPPORT_ELF64
+       case ELFCLASS64:
+               return Elf64Relocate(Base, envp, Filename);
+#endif
+       default:
+               SysDebug("ld-acess - ElfRelocate: Unknown file class %i", hdr->e_ident[4]);
+               return NULL;
+       }
+}
+
+/**
+ * \fn int ElfGetSymbol(Uint Base, const char *name, void **ret)
+ */
+int ElfGetSymbol(void *Base, const char *Name, void **ret, size_t *Size)
+{
+       Elf32_Ehdr      *hdr = Base;
+
+       switch(hdr->e_ident[4])
+       {
+       case ELFCLASS32:
+               return Elf32GetSymbol(Base, Name, ret, Size);
+#ifdef SUPPORT_ELF64
+       case ELFCLASS64:
+               return Elf64GetSymbol(Base, Name, ret, Size);
+#endif
+       default:
+               SysDebug("ld-acess - ElfRelocate: Unknown file class %i", hdr->e_ident[4]);
+               return 0;
+       }
+}
+
+int elf_doRelocate_386(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type,
+               int bRela, const char *Sym, intptr_t iBaseDiff)
+{
+       void    *symval;
+       switch( type )
+       {
+       // Standard 32 Bit Relocation (S+A)
+       case R_386_32:
+               if( !GetSymbol(Sym, &symval, NULL) )
+                       return 1;
+               DEBUGS(" elf_doRelocate: R_386_32 *0x%x += %p('%s')",
+                               ptr, symval, Sym);
+               *ptr = (intptr_t)symval + addend;
+               break;
+               
+       // 32 Bit Relocation wrt. Offset (S+A-P)
+       case R_386_PC32:
+               DEBUGS(" elf_doRelocate: '%s'", Sym);
+               if( !GetSymbol(Sym, &symval, NULL) )    return 1;
+               DEBUGS(" elf_doRelocate: R_386_PC32 *0x%x = 0x%x + 0x%p - 0x%x",
+                       ptr, *ptr, symval, (intptr_t)ptr );
+               *ptr = (intptr_t)symval + addend - (intptr_t)ptr;
+               //*ptr = val + addend - ((Uint)ptr - iBaseDiff);
+               break;
+
+       // Absolute Value of a symbol (S)
+       case R_386_GLOB_DAT:
+       case R_386_JMP_SLOT:
+               DEBUGS(" elf_doRelocate: '%s'", Sym);
+               if( !GetSymbol(Sym, &symval, NULL) )    return 1;
+               DEBUGS(" elf_doRelocate: %s *0x%x = %p", csaR_NAMES[type], ptr, symval);
+               *ptr = (intptr_t)symval;
+               break;
+
+       // Base Address (B+A)
+       case R_386_RELATIVE:
+               DEBUGS(" elf_doRelocate: R_386_RELATIVE *0x%x = 0x%x + 0x%x", ptr, iBaseDiff, addend);
+               *ptr = iBaseDiff + addend;
+               break;
+
+       case R_386_COPY: {
+               size_t  size;
+               if( !GetSymbol(Sym, &symval, &size) )   return 1;
+               DEBUGS(" elf_doRelocate_386: R_386_COPY (%p, %p, %i)", ptr, symval, size);
+               memcpy(ptr, symval, size);
+               break; }
+
+       default:
+               SysDebug("elf_doRelocate_386: Unknown relocation %i", type);
+               return 2;
+       }
+       return 0;
+}
+
+int elf_doRelocate_arm(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff)
+{
+       uint32_t        val;
+       switch(type)
+       {
+       // (S + A) | T
+       case R_ARM_ABS32:
+               DEBUGS(" elf_doRelocate_arm: R_ARM_ABS32 %p (%s + %x)", ptr, Sym, addend);
+               if( !GetSymbol(Sym, (void**)&val, NULL) )       return 1;
+               *ptr = val + addend;
+               break;
+       case R_ARM_GLOB_DAT:
+               DEBUGS(" elf_doRelocate_arm: R_ARM_GLOB_DAT %p (%s + %x)", ptr, Sym, addend);
+               if( !GetSymbol(Sym, (void**)&val, NULL) )       return 1;
+               *ptr = val + addend;
+               break;
+       case R_ARM_JUMP_SLOT:
+               if(!bRela)      addend = 0;
+               DEBUGS(" elf_doRelocate_arm: R_ARM_JUMP_SLOT %p (%s + %x)", ptr, Sym, addend);
+               if( !GetSymbol(Sym, (void**)&val, NULL) )       return 1;
+               *ptr = val + addend;
+               break;
+       // Copy
+       case R_ARM_COPY: {
+               size_t  size;
+               void    *src;
+               if( !GetSymbol(Sym, &src, &size) )      return 1;
+               DEBUGS(" elf_doRelocate_arm: R_ARM_COPY (%p, %p, %i)", ptr, src, size);
+               memcpy(ptr, src, size);
+               break; }
+       // Delta between link and runtime locations + A
+       case R_ARM_RELATIVE:
+               DEBUGS(" elf_doRelocate_arm: R_ARM_RELATIVE %p (0x%x + 0x%x)", ptr, iBaseDiff, addend);
+               if(Sym[0] != '\0') {
+                       // TODO: Get delta for a symbol
+                       SysDebug("elf_doRelocate_arm: TODO - Implment R_ARM_RELATIVE for symbols");
+                       return 2;
+               }
+               else {
+                       *ptr = iBaseDiff + addend;
+               }
+               break;
+       default:
+               SysDebug("elf_doRelocate_arm: Unknown Relocation, %i", type);
+               return 2;
+       }
+       return 0;
+}
+
+int elf_doRelocate_unk(uint32_t r_info, uint32_t *ptr, Elf32_Addr addend, int type, int bRela, const char *Sym, intptr_t iBaseDiff)
+{
+       return 1;
+}
+
+void *Elf32Relocate(void *Base, char **envp, const char *Filename)
+{
+       Elf32_Ehdr      *hdr = Base;
+       Elf32_Phdr      *phtab;
+        int    i, j;   // Counters
+       char    *libPath;
+       intptr_t        iRealBase = -1;
+       intptr_t        iBaseDiff;
+        int    iSegmentCount;
+//      int    iSymCount;
+       Elf32_Rel       *rel = NULL;
+       Elf32_Rela      *rela = NULL;
+       void    *plt = NULL;
+        int    relSz=0, relEntSz=8;
+        int    relaSz=0, relaEntSz=8;
+        int    pltSz=0, pltType=0;
+       Elf32_Dyn       *dynamicTab = NULL;     // Dynamic Table Pointer
+       char    *dynstrtab = NULL;      // .dynamic String Table
+       Elf32_Sym       *dynsymtab;
+       int     (*do_relocate)(uint32_t t_info, uint32_t *ptr, Elf32_Addr addend, int Type, int bRela, const char *Sym, intptr_t iBaseDiff);
+       
+       DEBUGS("ElfRelocate: (Base=0x%x)", Base);
+       
+       // Check magic header
+       
+       
+       // Parse Program Header to get Dynamic Table
+       phtab = (void*)( (uintptr_t)Base + hdr->phoff );
+       iSegmentCount = hdr->phentcount;
+       for(i=0;i<iSegmentCount;i++)
+       {
+               // Determine linked base address
+               if(phtab[i].Type == PT_LOAD && iRealBase > phtab[i].VAddr)
+                       iRealBase = phtab[i].VAddr;
+               
+               // Find Dynamic Section
+               if(phtab[i].Type == PT_DYNAMIC) {
+                       if(dynamicTab) {
+                               DEBUGS(" WARNING - elf_relocate: Multiple PT_DYNAMIC segments");
+                               continue;
+                       }
+                       dynamicTab = (void *) (intptr_t) phtab[i].VAddr;
+                       j = i;  // Save Dynamic Table ID
+               }
+       }
+       
+       // Page Align real base
+       iRealBase &= ~0xFFF;
+       DEBUGS(" elf_relocate: True Base = 0x%x, Compiled Base = 0x%x", Base, iRealBase);
+       
+       // Adjust "Real" Base
+       iBaseDiff = (intptr_t)Base - iRealBase;
+
+//     hdr->entrypoint += iBaseDiff;   // Adjust Entrypoint
+       
+       // Check if a PT_DYNAMIC segement was found
+       if(!dynamicTab) {
+               SysDebug(" elf_relocate: No PT_DYNAMIC segment in image %p, returning", Base);
+               return (void *)(intptr_t)(hdr->entrypoint + iBaseDiff);
+       }
+
+       // Allow writing to read-only segments, just in case they need to be relocated
+       // - Will be reversed at the end of the function
+       for( i = 0; i < iSegmentCount; i ++ )
+       {
+               if(phtab[i].Type == PT_LOAD && !(phtab[i].Flags & PF_W) ) {
+                       uintptr_t       addr = phtab[i].VAddr + iBaseDiff;
+                       uintptr_t       end = addr + phtab[i].MemSize;
+                       for( ; addr < end; addr += PAGE_SIZE )
+                               _SysSetMemFlags(addr, 0, 1);    // Unset RO
+               }
+       }
+
+       // Adjust Dynamic Table
+       dynamicTab = (void *)( (intptr_t)dynamicTab + iBaseDiff );
        
-       // === Get Symbol table and String Table ===\r
-       for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++)\r
+       // === Get Symbol table and String Table ===
+       dynsymtab = NULL;
+       for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++)
        {
                switch(dynamicTab[j].d_tag)
                {
-               // --- Symbol Table ---\r
-               case DT_SYMTAB:\r
-                       DEBUGS(" elf_relocate: DYNAMIC Symbol Table 0x%x (0x%x)\n",\r
-                               dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff);\r
-                       dynamicTab[j].d_val += iBaseDiff;\r
-                       dynsymtab = (void*)(dynamicTab[j].d_val);\r
-                       hdr->misc.SymTable = dynamicTab[j].d_val;       // Saved in unused bytes of ident\r
-                       break;\r
-               // --- String Table ---\r
-               case DT_STRTAB:\r
-                       DEBUGS(" elf_relocate: DYNAMIC String Table 0x%x (0x%x)\n",\r
-                               dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff);\r
-                       dynamicTab[j].d_val += iBaseDiff;\r
-                       dynstrtab = (void*)(dynamicTab[j].d_val);\r
-                       break;\r
-               // --- Hash Table --\r
-               case DT_HASH:\r
-                       dynamicTab[j].d_val += iBaseDiff;\r
-                       iSymCount = ((Uint*)(dynamicTab[j].d_val))[1];\r
-                       hdr->misc.HashTable = dynamicTab[j].d_val;      // Saved in unused bytes of ident\r
+               // --- Symbol Table ---
+               case DT_SYMTAB:
+                       DEBUGS(" elf_relocate: DYNAMIC Symbol Table 0x%x (0x%x)",
+                               dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff);
+                       if(iBaseDiff != 0)      dynamicTab[j].d_val += iBaseDiff;
+                       dynsymtab = (void*)(intptr_t)dynamicTab[j].d_val;
+                       break;
+               // --- String Table ---
+               case DT_STRTAB:
+                       DEBUGS(" elf_relocate: DYNAMIC String Table 0x%x (0x%x)",
+                               dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff);
+                       if(iBaseDiff != 0)      dynamicTab[j].d_val += iBaseDiff;
+                       dynstrtab = (void*)(intptr_t)dynamicTab[j].d_val;
+                       break;
+               // --- Hash Table --
+               case DT_HASH:
+                       if(iBaseDiff != 0)      dynamicTab[j].d_val += iBaseDiff;
+//                     iSymCount = ((Elf32_Word*)(intptr_t)dynamicTab[j].d_val)[1];
                        break;
                }
        }
-\r
-       if(dynsymtab == NULL) {\r
-               SysDebug("ld-acess.so - WARNING: No Dynamic Symbol table, returning\n");\r
-               return hdr->entrypoint;\r
-       }\r
-       \r
-       // Alter Symbols to true base\r
-       for(i=0;i<iSymCount;i++)\r
-       {\r
-               dynsymtab[i].value += iBaseDiff;
-               dynsymtab[i].nameOfs += (Uint)dynstrtab;\r
-               //DEBUGS("elf_relocate: Sym '%s' = 0x%x (relocated)\n", dynsymtab[i].name, dynsymtab[i].value);\r
-       }\r
-       
+
+       if(dynsymtab == NULL) {
+               SysDebug("ld-acess.so - WARNING: No Dynamic Symbol table in %p, returning", hdr);
+               return (void *)(intptr_t) (hdr->entrypoint + iBaseDiff);
+       }
+
        // === Add to loaded list (can be imported now) ===
-       AddLoaded( Filename, (Uint)Base );
-
-       // === Parse Relocation Data ===\r
-       DEBUGS(" elf_relocate: dynamicTab = 0x%x\n", dynamicTab);\r
-       for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++)\r
-       {\r
-               switch(dynamicTab[j].d_tag)\r
-               {\r
-               // --- Shared Library Name ---\r
-               case DT_SONAME:\r
-                       DEBUGS(" elf_relocate: .so Name '%s'\n", dynstrtab+dynamicTab[j].d_val);\r
-                       break;\r
-               // --- Needed Library ---\r
-               case DT_NEEDED:\r
-                       libPath = dynstrtab + dynamicTab[j].d_val;\r
-                       DEBUGS(" Required Library '%s'\n", libPath);\r
-                       if(LoadLibrary(libPath, NULL, envp) == 0) {\r
-                               #if DEBUG\r
-                                       DEBUGS(" elf_relocate: Unable to load '%s'\n", libPath);\r
-                               #else\r
-                               SysDebug("Unable to load required library '%s'\n", libPath);\r
-                               #endif\r
-                               return 0;\r
-                       }\r
-                       break;\r
-               // --- PLT/GOT ---\r
-               case DT_PLTGOT: pltgot = (void*)iBaseDiff+(dynamicTab[j].d_val);        break;\r
-               case DT_JMPREL: plt = (void*)(iBaseDiff+dynamicTab[j].d_val);   break;\r
-               case DT_PLTREL: pltType = dynamicTab[j].d_val;  break;\r
-               case DT_PLTRELSZ:       pltSz = dynamicTab[j].d_val;    break;\r
-               \r
-               // --- Relocation ---\r
-               case DT_REL:    rel = (void*)(iBaseDiff + dynamicTab[j].d_val); break;\r
-               case DT_RELSZ:  relSz = dynamicTab[j].d_val;    break;\r
-               case DT_RELENT: relEntSz = dynamicTab[j].d_val; break;\r
-               case DT_RELA:   rela = (void*)(iBaseDiff + dynamicTab[j].d_val);        break;\r
-               case DT_RELASZ: relaSz = dynamicTab[j].d_val;   break;\r
-               case DT_RELAENT:        relaEntSz = dynamicTab[j].d_val;        break;\r
-               \r
-               // --- Symbol Table ---\r
-               case DT_SYMTAB:\r
-               // --- Hash Table ---\r
-               case DT_HASH:\r
-               // --- String Table ---\r
-               case DT_STRTAB:\r
-                       break;\r
-               \r
-               // --- Unknown ---\r
-               default:\r
-                       if(dynamicTab[j].d_tag > DT_JMPREL)     continue;\r
-                       //DEBUGS(" elf_relocate: %i-%i = %s,0x%x\n",\r
-                       //      i,j, csaDT_NAMES[dynamicTab[j].d_tag],dynamicTab[j].d_val);\r
-                       break;\r
-               }\r
-       }\r
-       \r
-       DEBUGS(" elf_relocate: Beginning Relocation\n");\r
-       \r
-       // Parse Relocation Entries\r
-       if(rel && relSz)\r
-       {\r
-               Uint32  *ptr;\r
-               DEBUGS(" elf_relocate: rel=0x%x, relSz=0x%x, relEntSz=0x%x\n", rel, relSz, relEntSz);\r
-               j = relSz / relEntSz;\r
-               for( i = 0; i < j; i++ )\r
+       AddLoaded( Filename, Base );
+
+       // === Parse Relocation Data ===
+       DEBUGS(" elf_relocate: dynamicTab = 0x%x", dynamicTab);
+       for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++)
+       {
+               switch(dynamicTab[j].d_tag)
                {
-                       //DEBUGS("  Rel %i: 0x%x+0x%x\n", i, iBaseDiff, rel[i].r_offset);\r
-                       ptr = (void*)(iBaseDiff + rel[i].r_offset);\r
-                       elf_doRelocate(rel[i].r_info, ptr, *ptr, dynsymtab, iBaseDiff);\r
-               }\r
-       }\r
-       // Parse Relocation Entries\r
-       if(rela && relaSz)\r
-       {\r
-               Uint32  *ptr;\r
-               DEBUGS(" elf_relocate: rela=0x%x, relaSz=0x%x, relaEntSz=0x%x\n", rela, relaSz, relaEntSz);\r
-               j = relaSz / relaEntSz;\r
-               for( i = 0; i < j; i++ )\r
-               {\r
-                       ptr = (void*)(iBaseDiff + rela[i].r_offset);\r
-                       elf_doRelocate(rel[i].r_info, ptr, rela[i].r_addend, dynsymtab, iBaseDiff);\r
-               }\r
-       }\r
-       \r
-       // === Process PLT (Procedure Linkage Table) ===\r
-       if(plt && pltSz)\r
-       {\r
-               Uint32  *ptr;\r
-               DEBUGS(" elf_relocate: Relocate PLT, plt=0x%x\n", plt);\r
-               if(pltType == DT_REL)\r
-               {\r
-                       Elf32_Rel       *pltRel = plt;\r
-                       j = pltSz / sizeof(Elf32_Rel);\r
-                       DEBUGS(" elf_relocate: PLT Reloc Type = Rel, %i entries\n", j);\r
-                       for(i=0;i<j;i++)\r
-                       {\r
-                               ptr = (void*)(iBaseDiff + pltRel[i].r_offset);\r
-                               elf_doRelocate(pltRel[i].r_info, ptr, *ptr, dynsymtab, iRealBase);\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       Elf32_Rela      *pltRela = plt;\r
-                       j = pltSz / sizeof(Elf32_Rela);\r
-                       DEBUGS(" elf_relocate: PLT Reloc Type = Rela, %i entries\n", j);\r
-                       for(i=0;i<j;i++)\r
-                       {\r
-                               ptr = (void*)(iRealBase + pltRela[i].r_offset);\r
-                               elf_doRelocate(pltRela[i].r_info, ptr, pltRela[i].r_addend, dynsymtab, iRealBase);\r
-                       }\r
-               }\r
-       }\r
-       \r
-       DEBUGS("ElfRelocate: RETURN 0x%x", hdr->entrypoint);\r
-       return hdr->entrypoint;\r
-}\r
-\r
-void elf_doRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symtab, Uint base)\r
-{\r
-        int    type = ELF32_R_TYPE(r_info);\r
-        int    sym = ELF32_R_SYM(r_info);\r
-       Uint32  val;\r
-       switch( type )\r
-       {\r
-       // Standard 32 Bit Relocation (S+A)\r
-       case R_386_32:\r
-               val = GetSymbol( symtab[sym].name );\r
-               DEBUGS(" elf_doRelocate: R_386_32 *0x%x += 0x%x('%s')\n",\r
-                       ptr, val, symtab[sym].name);\r
-               *ptr = val + addend;\r
-               break;\r
-               \r
-       // 32 Bit Relocation wrt. Offset (S+A-P)\r
-       case R_386_PC32:\r
-               DEBUGS(" elf_doRelocate: #%i: '%s'\n", sym, symtab[sym].name);\r
-               val = GetSymbol( symtab[sym].name );\r
-               DEBUGS(" elf_doRelocate: R_386_PC32 *0x%x = 0x%x + 0x%x - 0x%x\n",\r
-                       ptr, *ptr, val, (Uint)ptr );\r
-               *ptr = val + addend - (Uint)ptr;\r
-               //*ptr = val + addend - ((Uint)ptr - base);\r
+               // --- Shared Library Name ---
+               case DT_SONAME:
+                       DEBUGS(" elf_relocate: .so Name '%s'", dynstrtab+dynamicTab[j].d_val);
+                       break;
+               // --- Needed Library ---
+               case DT_NEEDED:
+                       libPath = dynstrtab + dynamicTab[j].d_val;
+                       DEBUGS(" Required Library '%s'", libPath);
+                       if(LoadLibrary(libPath, NULL, envp) == 0) {
+                               #if DEBUG
+                               DEBUGS(" elf_relocate: Unable to load '%s'", libPath);
+                               #else
+                               SysDebug("Unable to load required library '%s'", libPath);
+                               #endif
+                               return 0;
+                       }
+                       DEBUGS(" Lib loaded");
+                       break;
+               // --- PLT/GOT ---
+//             case DT_PLTGOT: pltgot = (void*)(iBaseDiff + dynamicTab[j].d_val);      break;
+               case DT_JMPREL: plt = (void*)(iBaseDiff + dynamicTab[j].d_val); break;
+               case DT_PLTREL: pltType = dynamicTab[j].d_val;  break;
+               case DT_PLTRELSZ:       pltSz = dynamicTab[j].d_val;    break;
+               
+               // --- Relocation ---
+               case DT_REL:    rel = (void*)(iBaseDiff + dynamicTab[j].d_val); break;
+               case DT_RELSZ:  relSz = dynamicTab[j].d_val;    break;
+               case DT_RELENT: relEntSz = dynamicTab[j].d_val; break;
+               case DT_RELA:   rela = (void*)(iBaseDiff + dynamicTab[j].d_val);        break;
+               case DT_RELASZ: relaSz = dynamicTab[j].d_val;   break;
+               case DT_RELAENT:        relaEntSz = dynamicTab[j].d_val;        break;
+               
+               // --- Symbol Table ---
+               case DT_SYMTAB:
+               // --- Hash Table ---
+               case DT_HASH:
+               // --- String Table ---
+               case DT_STRTAB:
+                       break;
+               
+               // --- Unknown ---
+               default:
+                       if(dynamicTab[j].d_tag > DT_JMPREL)     continue;
+                       //DEBUGS(" elf_relocate: %i-%i = %s,0x%x",
+                       //      i,j, csaDT_NAMES[dynamicTab[j].d_tag],dynamicTab[j].d_val);
+                       break;
+               }
+       }
+       
+       DEBUGS(" elf_relocate: Beginning Relocation");
+
+        int    fail = 0;
+
+       switch(hdr->machine)
+       {
+       case EM_386:
+               do_relocate = elf_doRelocate_386;
                break;
-\r
-       // Absolute Value of a symbol (S)\r
-       case R_386_GLOB_DAT:\r
-       case R_386_JMP_SLOT:
-               DEBUGS(" elf_doRelocate: #%i: '%s'\n", sym, symtab[sym].name);\r
-               val = GetSymbol( symtab[sym].name );\r
-               DEBUGS(" elf_doRelocate: %s *0x%x = 0x%x\n", csaR_NAMES[type], ptr, val);\r
-               *ptr = val;\r
-               break;\r
-\r
-       // Base Address (B+A)\r
-       case R_386_RELATIVE:\r
-               DEBUGS(" elf_doRelocate: R_386_RELATIVE *0x%x = 0x%x + 0x%x\n", ptr, base, addend);\r
-               *ptr = base + addend;\r
-               break;\r
-               \r
-       default:\r
-               DEBUGS(" elf_doRelocate: Rel 0x%x: 0x%x,%s\n", ptr, sym, csaR_NAMES[type]);\r
-               break;\r
-       }\r
-       \r
+       case EM_ARM:
+               do_relocate = elf_doRelocate_arm;
+               break;
+       default:
+               SysDebug("Elf32Relocate: Unknown machine type %i", hdr->machine);
+               do_relocate = elf_doRelocate_unk;
+               fail = 1;
+               break;
+       }
+       
+       DEBUGS("do_relocate = %p (%p or %p)", do_relocate, &elf_doRelocate_386, &elf_doRelocate_arm);
+
+       #define _doRelocate(r_info, ptr, bRela, addend) \
+               do_relocate(r_info, ptr, addend, ELF32_R_TYPE(r_info), bRela, \
+                       dynstrtab + dynsymtab[ELF32_R_SYM(r_info)].nameOfs, iBaseDiff);
+
+       // Parse Relocation Entries
+       if(rel && relSz)
+       {
+               Elf32_Word      *ptr;
+               DEBUGS(" elf_relocate: rel=0x%x, relSz=0x%x, relEntSz=0x%x", rel, relSz, relEntSz);
+               j = relSz / relEntSz;
+               for( i = 0; i < j; i++ )
+               {
+                       //DEBUGS("  Rel %i: 0x%x+0x%x", i, iBaseDiff, rel[i].r_offset);
+                       ptr = (void*)(iBaseDiff + rel[i].r_offset);
+                       fail |= _doRelocate(rel[i].r_info, ptr, 0, *ptr);
+               }
+       }
+       // Parse Relocation Entries
+       if(rela && relaSz)
+       {
+               Elf32_Word      *ptr;
+               DEBUGS(" elf_relocate: rela=0x%x, relaSz=0x%x, relaEntSz=0x%x", rela, relaSz, relaEntSz);
+               j = relaSz / relaEntSz;
+               for( i = 0; i < j; i++ )
+               {
+                       ptr = (void*)(iBaseDiff + rela[i].r_offset);
+                       fail |= _doRelocate(rel[i].r_info, ptr, 1, rela[i].r_addend);
+               }
+       }
+       
+       // === Process PLT (Procedure Linkage Table) ===
+       if(plt && pltSz)
+       {
+               Elf32_Word      *ptr;
+               DEBUGS(" elf_relocate: Relocate PLT, plt=0x%x", plt);
+               if(pltType == DT_REL)
+               {
+                       Elf32_Rel       *pltRel = plt;
+                       j = pltSz / sizeof(Elf32_Rel);
+                       DEBUGS(" elf_relocate: PLT Reloc Type = Rel, %i entries", j);
+                       for(i=0;i<j;i++)
+                       {
+                               ptr = (void*)(iBaseDiff + pltRel[i].r_offset);
+                               fail |= _doRelocate(pltRel[i].r_info, ptr, 0, *ptr);
+                       }
+               }
+               else
+               {
+                       Elf32_Rela      *pltRela = plt;
+                       j = pltSz / sizeof(Elf32_Rela);
+                       DEBUGS(" elf_relocate: PLT Reloc Type = Rela, %i entries", j);
+                       for(i=0;i<j;i++)
+                       {
+                               ptr = (void*)(iRealBase + pltRela[i].r_offset);
+                               fail |= _doRelocate(pltRela[i].r_info, ptr, 1, pltRela[i].r_addend);
+                       }
+               }
+       }
+
+       // Re-set readonly
+       for( i = 0; i < iSegmentCount; i ++ )
+       {
+               // If load and not writable
+               if(phtab[i].Type == PT_LOAD && !(phtab[i].Flags & PF_W) ) {
+                       uintptr_t       addr = phtab[i].VAddr + iBaseDiff;
+                       uintptr_t       end = addr + phtab[i].MemSize;
+                       for( ; addr < end; addr += PAGE_SIZE )
+                               _SysSetMemFlags(addr, 1, 1);    // Unset RO
+               }
+       }
+
+       if( fail ) {
+               DEBUGS("ElfRelocate: Failure");
+               return NULL;
+       }       
+
+       #undef _doRelocate
+
+       DEBUGS("ElfRelocate: RETURN 0x%x to %p", hdr->entrypoint + iBaseDiff, __builtin_return_address(0));
+       return (void*)(intptr_t)( hdr->entrypoint + iBaseDiff );
 }
-\r
-/**\r
- * \fn int ElfGetSymbol(Uint Base, char *name, Uint *ret)\r
- */
-int ElfGetSymbol(Uint Base, char *Name, Uint *ret)
+
+int Elf32GetSymbol(void *Base, const char *Name, void **ret, size_t *Size)
 {
-       Elf32_Ehdr      *hdr = (void*)Base;\r
-       Elf32_Sym       *symtab;
-        int    nbuckets = 0;\r
-        int    iSymCount = 0;
-        int    i;\r
-       Uint    *pBuckets;\r
-       Uint    *pChains;\r
-       Uint    iNameHash;
-\r
-       //DEBUGS("ElfGetSymbol: (Base=0x%x, Name='%s')\n", Base, Name);\r
-\r
-       // Catch the current executable\r
-       #if 0\r
-       if( !hdr->misc.HashTable )\r
-       {\r
-               Elf32_Phdr      *phtab;\r
-               Elf32_Dyn       *dynTab = NULL;\r
-                int    j;\r
-               \r
-               // Locate the tables\r
-               phtab = (void*)( Base + hdr->phoff );\r
-               for( i = 0; i < hdr->phentcount; i ++ )\r
-               {\r
-                       if( phtab[i].Type == PT_DYNAMIC ) {\r
-                               dynTab = (void*)phtab[i].VAddr;\r
-                               break ;\r
-                       }\r
-               }\r
-               if( !dynTab ) {\r
-                       SysDebug("ERROR - Unable to find DYNAMIC segment in %p", (void*)Base);\r
-                       return 0;\r
-               }\r
-               \r
-               for( j = 0; dynTab[j].d_tag != DT_NULL; j++)\r
-               {\r
-                       switch(dynTab[j].d_tag)\r
-                       {\r
-                       // --- Symbol Table ---\r
-                       case DT_SYMTAB:\r
-                               hdr->misc.SymTable = dynTab[j].d_val;\r
-                               break;\r
-                       // --- Hash Table --\r
-                       case DT_HASH:\r
-                               hdr->misc.HashTable = dynTab[j].d_val;\r
-                               break;\r
-                       }\r
-               }\r
-       }\r
-       #endif\r
-       \r
-       if( !hdr->misc.SymTable || !hdr->misc.HashTable ) {\r
-               return 0;\r
-       }\r
-\r
-       pBuckets = (void *) hdr->misc.HashTable;\r
-       symtab = (void *) hdr->misc.SymTable;\r
+       Elf32_Ehdr      *hdr = Base;
+       Elf32_Sym       *symtab = NULL;
+        int    nbuckets = 0;
+       Elf32_Word      *pBuckets = NULL;
+       Elf32_Word      *pChains;
+       uint32_t        iNameHash;
+       const char      *dynstrtab = NULL;
+       uintptr_t       iBaseDiff = -1;
+       Elf32_Phdr      *phtab;
+       Elf32_Dyn       *dynTab = NULL;
+        int    i;
+
+       // Locate the tables
+       phtab = (void*)( (uintptr_t)Base + hdr->phoff );
+       for( i = 0; i < hdr->phentcount; i ++ )
+       {
+               if(phtab[i].Type == PT_LOAD && iBaseDiff > phtab[i].VAddr)
+                       iBaseDiff = phtab[i].VAddr;
+               if( phtab[i].Type == PT_DYNAMIC ) {
+                       dynTab = (void*)(intptr_t)phtab[i].VAddr;
+               }
+       }
+       if( !dynTab ) {
+               SysDebug("ERROR - Unable to find DYNAMIC segment in %p", Base);
+               return 0;
+       }
+       iBaseDiff = (intptr_t)Base - iBaseDiff; // Make iBaseDiff actually the diff
+       dynTab = (void*)( (intptr_t)dynTab + iBaseDiff );
+       for( i = 0; dynTab[i].d_tag != DT_NULL; i++)
+       {
+               switch(dynTab[i].d_tag)
+               {
+               // --- Symbol Table ---
+               case DT_SYMTAB:
+                       symtab = (void*)(intptr_t) dynTab[i].d_val;     // Rebased in Relocate
+                       break;
+               case DT_STRTAB:
+                       dynstrtab = (void*)(intptr_t) dynTab[i].d_val;
+                       break;
+               // --- Hash Table --
+               case DT_HASH:
+                       pBuckets = (void*)(intptr_t) dynTab[i].d_val;
+                       break;
+               }
+       }
        
-       nbuckets = pBuckets[0];\r
-       iSymCount = pBuckets[1];\r
-       pBuckets = &pBuckets[2];\r
-       pChains = &pBuckets[ nbuckets ];\r
-       \r
+       if( !symtab ) {
+               SysDebug("ERRO - No DT_SYMTAB in %p", Base);
+               return 0;
+       }
+       if( !pBuckets ) {
+               SysDebug("ERRO - No DT_HASH in %p", Base);
+               return 0;
+       }
+       if( !dynstrtab ) {
+               SysDebug("ERRO - No DT_STRTAB in %p", Base);
+               return 0;
+       }
+
+       // ... ok... maybe they haven't been relocated
+       if( (uintptr_t)symtab < (uintptr_t)Base )
+       {
+               symtab    = (void*)( (uintptr_t)symtab    + iBaseDiff );
+               pBuckets  = (void*)( (uintptr_t)pBuckets  + iBaseDiff );
+               dynstrtab = (void*)( (uintptr_t)dynstrtab + iBaseDiff );
+               SysDebug("Executable not yet relocated");
+       }
+
+       nbuckets = pBuckets[0];
+//     iSymCount = pBuckets[1];
+       pBuckets = &pBuckets[2];
+       pChains = &pBuckets[ nbuckets ];
+
        // Get hash
-       iNameHash = ElfHashString(Name);\r
-       iNameHash %= nbuckets;\r
-       //DEBUGS(" ElfGetSymbol: iNameHash = 0x%x\n", iNameHash);\r
-
-       // Walk Chain\r
-       i = pBuckets[ iNameHash ];\r
-       //DEBUGS(" ElfGetSymbol: strcmp(Name, \"%s\")\n", symtab[i].name);\r
-       if(symtab[i].shndx != SHN_UNDEF && strcmp(symtab[i].name, Name) == 0) {\r
-               *ret = symtab[ i ].value;\r
-               return 1;\r
-       }\r
-       \r
-       //DEBUGS(" ElfGetSymbol: Hash of first = 0x%x\n", ElfHashString( symtab[i].name ) % nbuckets);\r
-       while(pChains[i] != STN_UNDEF)\r
-       {\r
-               //DEBUGS(" pChains[%i] = %i\n", i, pChains[i]);\r
-               i = pChains[i];\r
-               //DEBUGS(" ElfGetSymbol: strcmp(Name, \"%s\")\n", symtab[ i ].name);\r
-               if(symtab[i].shndx != SHN_UNDEF && strcmp(symtab[ i ].name, Name) == 0) {\r
-                       //DEBUGS("ElfGetSymbol: RETURN 1, '%s' = 0x%x\n", symtab[ i ].name, symtab[ i ].value);\r
-                       *ret = symtab[ i ].value;\r
-                       return 1;\r
-               }\r
-       }\r
-       \r
-       //DEBUGS("ElfGetSymbol: RETURN 0, Symbol '%s' not found\n", Name);
+       iNameHash = ElfHashString(Name);
+       iNameHash %= nbuckets;
+
+       // Walk Chain
+       i = pBuckets[ iNameHash ];
+       if(symtab[i].shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[i].nameOfs, Name) == 0) {
+               *ret = (void*)( (uintptr_t) symtab[ i ].value + iBaseDiff );
+               if(Size)        *Size = symtab[i].size;
+               return 1;
+       }
+       
+       while(pChains[i] != STN_UNDEF)
+       {
+               i = pChains[i];
+               if(symtab[i].shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[ i ].nameOfs, Name) == 0) {
+                       *ret = (void*)( (uintptr_t)symtab[ i ].value + iBaseDiff );
+                       if(Size)        *Size = symtab[i].size;
+                       return 1;
+               }
+       }
+       
+       return 0;
+}
+
+#ifdef SUPPORT_ELF64
+typedef int (*t_elf64_doreloc)(void *Base, const char *strtab, Elf64_Sym *symtab, Elf64_Xword r_info, void *ptr, Elf64_Sxword addend);
+
+int _Elf64DoReloc_X86_64(void *Base, const char *strtab, Elf64_Sym *symtab, Elf64_Xword r_info, void *ptr, Elf64_Sxword addend)
+{
+        int    sym = ELF64_R_SYM(r_info);
+        int    type = ELF64_R_TYPE(r_info);
+       const char      *symname = strtab + symtab[sym].st_name;
+       void    *symval;
+       //DEBUGS("_Elf64DoReloc: %s", symname);
+       switch( type )
+       {
+       case R_X86_64_NONE:
+               break;
+       case R_X86_64_64:
+               if( !GetSymbol(symname, &symval, NULL)  )       return 1;
+               *(uint64_t*)ptr = (uintptr_t)symval + addend;
+               break;
+       case R_X86_64_COPY: {
+               size_t  size;
+               if( !GetSymbol(symname, &symval, &size)  )      return 1;
+               memcpy(ptr, symval, size);
+               } break;
+       case R_X86_64_GLOB_DAT:
+               if( !GetSymbol(symname, &symval, NULL)  )       return 1;
+               *(uint64_t*)ptr = (uintptr_t)symval;
+               break;
+       case R_X86_64_JUMP_SLOT:
+               if( !GetSymbol(symname, &symval, NULL)  )       return 1;
+               *(uint64_t*)ptr = (uintptr_t)symval;
+               break;
+       case R_X86_64_RELATIVE:
+               *(uint64_t*)ptr = (uintptr_t)Base + addend;
+               break;
+       default:
+               SysDebug("ld-acess - _Elf64DoReloc: Unknown relocation type %i", type);
+               return 2;
+       }
+       //DEBUGS("_Elf64DoReloc: - Good");
        return 0;
-}\r
-\r
-Uint ElfHashString(char *name)\r
-{\r
-       Uint    h = 0, g;\r
-       while(*name)\r
-       {\r
-               h = (h << 4) + *name++;\r
-               if( (g = h & 0xf0000000) )\r
-                       h ^= g >> 24;\r
-               h &= ~g;\r
-       }\r
-       return h;\r
-}\r
-\r
-#if 0\r
-unsigned long elf_hash(const unsigned char *name)\r
-{\r
-       unsigned long   h = 0, g;\r
-       while (*name)\r
-       {\r
-               h = (h << 4) + *name++;\r
-               if (g = h & 0xf0000000)\r
-                       h ^= g >> 24;\r
-               h &= ~g;\r
-       }\r
-       return h;\r
-}\r
-#endif\r
+}
+
+void *Elf64Relocate(void *Base, char **envp, const char *Filename)
+{
+        int    i;
+       Elf64_Ehdr      *hdr = Base;
+       Elf64_Phdr      *phtab;
+       Elf64_Dyn       *dyntab = NULL;
+       Elf64_Addr      compiledBase = -1, baseDiff;
+       Elf64_Sym       *symtab = NULL;
+       char    *strtab = NULL;
+       Elf64_Word      *hashtab = NULL;
+       Elf64_Rel       *rel = NULL;
+        int    rel_count = 0;
+       Elf64_Rela      *rela = NULL;
+        int    rela_count = 0;
+       void    *pltrel = NULL;
+        int    plt_size = 0, plt_type = 0;
+
+       DEBUGS("Elf64Relocate: hdr = {");
+       DEBUGS("Elf64Relocate:  e_ident = '%.16s'", hdr->e_ident);
+       DEBUGS("Elf64Relocate:  e_type = 0x%x", hdr->e_type);
+       DEBUGS("Elf64Relocate:  e_machine = 0x%x", hdr->e_machine);
+       DEBUGS("Elf64Relocate:  e_version = 0x%x", hdr->e_version);
+       DEBUGS("Elf64Relocate:  e_entry = %p", hdr->e_entry);
+       DEBUGS("Elf64Relocate:  e_phoff = 0x%llx", hdr->e_phoff);
+       DEBUGS("Elf64Relocate:  e_shoff = 0x%llx", hdr->e_shoff);
+       DEBUGS("Elf64Relocate:  e_flags = 0x%x", hdr->e_flags);
+       DEBUGS("Elf64Relocate:  e_ehsize = 0x%x", hdr->e_ehsize);
+       DEBUGS("Elf64Relocate:  e_phentsize = 0x%x", hdr->e_phentsize);
+       DEBUGS("Elf64Relocate:  e_phnum = %i", hdr->e_phnum);
+
+       // Scan for the dynamic table (and find the compiled base)
+       phtab = (void*)((uintptr_t)Base + (uintptr_t)hdr->e_phoff);
+       for( i = 0; i < hdr->e_phnum; i ++ )
+       {
+               if(phtab[i].p_type == PT_DYNAMIC)
+                       dyntab = (void *)(intptr_t)phtab[i].p_vaddr;
+               if(phtab[i].p_type == PT_LOAD && compiledBase > phtab[i].p_vaddr)
+                       compiledBase = phtab[i].p_vaddr;
+       }
+
+       baseDiff = (uintptr_t)Base - compiledBase;
+
+       DEBUGS("baseDiff = %p", baseDiff);
+
+       if(dyntab == NULL) {
+               SysDebug(" Elf64Relocate: No PT_DYNAMIC segment in image %p, returning", Base);
+               return (void *)(uintptr_t)(hdr->e_entry + baseDiff);
+       }
+
+       dyntab = (void *)(uintptr_t)((uintptr_t)dyntab + baseDiff);
+
+       // Parse the dynamic table (first pass)
+       // - Search for String, Symbol and Hash tables
+       for(i = 0; dyntab[i].d_tag != DT_NULL; i ++)
+       {
+               switch(dyntab[i].d_tag)
+               {
+               case DT_SYMTAB:
+                       dyntab[i].d_un.d_ptr += baseDiff;
+                       symtab = (void *)(uintptr_t)dyntab[i].d_un.d_ptr;
+                       break;
+               case DT_STRTAB:
+                       dyntab[i].d_un.d_ptr += baseDiff;
+                       strtab = (void *)(uintptr_t)dyntab[i].d_un.d_ptr;
+                       break;
+               case DT_HASH:
+                       dyntab[i].d_un.d_ptr += baseDiff;
+                       hashtab = (void *)(uintptr_t)dyntab[i].d_un.d_ptr;
+                       break;
+               }
+       }
+
+       if( !symtab || !strtab || !hashtab ) {
+               SysDebug("ld-acess - Elf64Relocate: Missing Symbol, string or hash table");
+               return NULL;
+       }
+
+       // Ready for symbol use 
+       AddLoaded( Filename, Base );
+
+       // Second pass on dynamic table
+       for(i = 0; dyntab[i].d_tag != DT_NULL; i ++)
+       {
+               DEBUGS("dyntab[%i].d_tag = %i", i, dyntab[i].d_tag);
+               switch(dyntab[i].d_tag)
+               {
+               case DT_SONAME: break;
+
+               case DT_NEEDED: {
+                       char *libPath = strtab + dyntab[i].d_un.d_val;
+                       DEBUGS("Elf64Relocate: libPath = '%s'", libPath);
+                       if(LoadLibrary(libPath, NULL, envp) == 0) {
+                               SysDebug("ld-acess - Elf64Relocate: Unable to load '%s'", libPath);
+                               return NULL;
+                       }
+                       } break;
+               
+               // Relocation entries
+               case DT_REL:
+                       dyntab[i].d_un.d_ptr += baseDiff;
+                       rel = (void *)(uintptr_t)dyntab[i].d_un.d_ptr;
+                       break;
+               case DT_RELSZ:
+                       rel_count = dyntab[i].d_un.d_val / sizeof(Elf64_Rel);
+                       break;
+               case DT_RELENT:
+                       if( dyntab[i].d_un.d_val != sizeof(Elf64_Rel) ) {
+                               SysDebug("ld-acess - Elf64Relocate: DT_RELENT(%i) != sizeof(Elf64_Rel)(%i)",
+                                       dyntab[i].d_un.d_val, sizeof(Elf64_Rel));
+                               return NULL;
+                       }
+                       break;
+               case DT_RELA:
+                       dyntab[i].d_un.d_ptr += baseDiff;
+                       rela = (void *)(uintptr_t)dyntab[i].d_un.d_ptr;
+                       break;
+               case DT_RELASZ:
+                       rela_count = dyntab[i].d_un.d_val / sizeof(Elf64_Rela);
+                       break;
+               case DT_RELAENT:
+                       if( dyntab[i].d_un.d_val != sizeof(Elf64_Rela) ) {
+                               SysDebug("ld-acess - Elf64Relocate: DT_RELAENT(%i) != sizeof(Elf64_Rela)(%i)",
+                                       dyntab[i].d_un.d_val, sizeof(Elf64_Rela));
+                               return NULL;
+                       }
+                       break;
+               case DT_JMPREL:
+                       dyntab[i].d_un.d_ptr += baseDiff;
+                       pltrel = (void *)(uintptr_t)dyntab[i].d_un.d_ptr;
+                       break;
+               case DT_PLTREL:
+                       plt_type = dyntab[i].d_un.d_val;
+                       break;
+               case DT_PLTRELSZ:
+                       plt_size = dyntab[i].d_un.d_val;
+                       break;
+               }
+       }
+
+       // Relocation function
+       t_elf64_doreloc fpElf64DoReloc = &_Elf64DoReloc_X86_64;
+       #define _Elf64DoReloc(info, ptr, addend)        fpElf64DoReloc(Base, strtab, symtab, info, ptr, addend)
+
+       int fail = 0;
+       if( rel )
+       {
+               DEBUGS("rel_count = %i", rel_count);
+               for( i = 0; i < rel_count; i ++ )
+               {
+                       uint64_t *ptr = (void *)(uintptr_t)( rel[i].r_offset + baseDiff );
+                       fail |= _Elf64DoReloc( rel[i].r_info, ptr, *ptr);
+               }
+       }
+
+       if( rela )
+       {
+               DEBUGS("rela_count = %i", rela_count);
+               for( i = 0; i < rela_count; i ++ )
+               {
+                       uint64_t *ptr = (void *)(uintptr_t)( rela[i].r_offset + baseDiff );
+                       fail |= _Elf64DoReloc( rela[i].r_info, ptr, rela[i].r_addend );
+               }
+       }
+
+       if( pltrel && plt_type )
+       {
+               if( plt_type == DT_REL ) {
+                       Elf64_Rel       *plt = pltrel;
+                        int    count = plt_size / sizeof(Elf64_Rel);
+                       DEBUGS("plt rel count = %i", count);
+                       for( i = 0; i < count; i ++ )
+                       {
+                               uint64_t *ptr = (void *)(uintptr_t)( plt[i].r_offset + baseDiff );
+                               fail |= _Elf64DoReloc( plt[i].r_info, ptr, *ptr);
+                       }
+               }
+               else {
+                       Elf64_Rela      *plt = pltrel;
+                        int    count = plt_size / sizeof(Elf64_Rela);
+                       DEBUGS("plt rela count = %i", count);
+                       for( i = 0; i < count; i ++ )
+                       {
+                               uint64_t *ptr = (void *)(uintptr_t)( plt[i].r_offset + baseDiff );
+                               fail |= _Elf64DoReloc( plt[i].r_info, ptr, plt[i].r_addend);
+                       }
+               }
+       }
+
+       if( fail ) {
+               DEBUGS("Elf64Relocate: Failure");
+               return NULL;
+       }
+
+       {
+       void *ret = (void *)(uintptr_t)(hdr->e_entry + baseDiff);
+       DEBUGS("Elf64Relocate: Relocations done, return %p", ret);
+       return ret;
+       }
+}
+
+int Elf64GetSymbol(void *Base, const char *Name, void **Ret, size_t *Size)
+{
+       Elf64_Ehdr      *hdr = Base;
+       Elf64_Sym       *symtab;
+        int    nbuckets = 0;
+//      int    iSymCount = 0;
+        int    i;
+       Elf64_Word      *pBuckets;
+       Elf64_Word      *pChains;
+       uint32_t        iNameHash;
+       const char      *dynstrtab;
+       uintptr_t       iBaseDiff = -1;
+
+       dynstrtab = NULL;
+       pBuckets = NULL;
+       symtab = NULL;
+
+       // Catch the current executable
+       if( !pBuckets )
+       {
+               Elf64_Phdr      *phtab;
+               Elf64_Dyn       *dynTab = NULL;
+                int    j;
+               
+               // Locate the tables
+               phtab = (void*)( (intptr_t)Base + (uintptr_t)hdr->e_phoff );
+               for( i = 0; i < hdr->e_phnum; i ++ )
+               {
+                       if(phtab[i].p_type == PT_LOAD && iBaseDiff > phtab[i].p_vaddr)
+                               iBaseDiff = phtab[i].p_vaddr;
+                       if( phtab[i].p_type == PT_DYNAMIC ) {
+                               dynTab = (void*)(intptr_t)phtab[i].p_vaddr;
+                       }
+               }
+               if( !dynTab ) {
+                       SysDebug("ERROR - Unable to find DYNAMIC segment in %p", Base);
+                       return 0;
+               }
+               iBaseDiff = (intptr_t)Base - iBaseDiff; // Make iBaseDiff actually the diff
+               dynTab = (void*)( (intptr_t)dynTab + iBaseDiff );
+               
+               for( j = 0; dynTab[j].d_tag != DT_NULL; j++)
+               {
+                       switch(dynTab[j].d_tag)
+                       {
+                       // --- Symbol Table ---
+                       case DT_SYMTAB:
+                               symtab = (void*)(intptr_t) dynTab[j].d_un.d_val;        // Rebased in Relocate
+                               break;
+                       case DT_STRTAB:
+                               dynstrtab = (void*)(intptr_t) dynTab[j].d_un.d_val;
+                               break;
+                       // --- Hash Table --
+                       case DT_HASH:
+                               pBuckets = (void*)(intptr_t) dynTab[j].d_un.d_val;
+                               break;
+                       }
+               }
+       }
+
+       nbuckets = pBuckets[0];
+//     iSymCount = pBuckets[1];
+       pBuckets = &pBuckets[2];
+       pChains = &pBuckets[ nbuckets ];
+       
+       // Get hash
+       iNameHash = ElfHashString(Name);
+       iNameHash %= nbuckets;
+
+       // Walk Chain
+       i = pBuckets[ iNameHash ];
+       if(symtab[i].st_shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[i].st_name, Name) == 0) {
+               *Ret = (void*)( (intptr_t)symtab[i].st_value + iBaseDiff );
+               if(Size)        *Size = symtab[i].st_size;
+               DEBUGS("%s = %p", Name, *Ret);
+               return 1;
+       }
+       
+       while(pChains[i] != STN_UNDEF)
+       {
+               i = pChains[i];
+               if(symtab[i].st_shndx != SHN_UNDEF && strcmp(dynstrtab + symtab[i].st_name, Name) == 0) {
+                       *Ret = (void*)((intptr_t)symtab[i].st_value + iBaseDiff);
+                       if(Size)        *Size = symtab[i].st_size;
+                       DEBUGS("%s = %p", Name, *Ret);
+                       return 1;
+               }
+       }
+       
+       return 0;
+}
+#endif
+
+
+uint32_t ElfHashString(const char *name)
+{
+       uint32_t        h = 0, g;
+       while(*name)
+       {
+               h = (h << 4) + *(uint8_t*)name++;
+               if( (g = h & 0xf0000000) )
+                       h ^= g >> 24;
+               h &= ~g;
+       }
+       return h;
+}
+

UCC git Repository :: git.ucc.asn.au