X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Felf.c;h=bcec1dc664dbd3d027e286409dcd72b3746a3b9b;hb=846645bd8f738dc22641e96866fffd2f59b5639b;hp=56f75e2b62daa5156a09b54898d041177d37c98f;hpb=17e16b3110b4c5124b0707435e0427993d696545;p=tpg%2Facess2.git diff --git a/Usermode/Libraries/ld-acess.so_src/elf.c b/Usermode/Libraries/ld-acess.so_src/elf.c index 56f75e2b..bcec1dc6 100644 --- a/Usermode/Libraries/ld-acess.so_src/elf.c +++ b/Usermode/Libraries/ld-acess.so_src/elf.c @@ -1,379 +1,426 @@ -/* - AcessOS 1 - Dynamic Loader - By thePowersGang -*/ -#include "common.h" -#include "elf32.h" +/* + * AcessOS 1 - Dynamic Loader + * By thePowersGang + */ +#include "common.h" +#include +#include "elf32.h" #define DEBUG 0 -#if DEBUG -# define DEBUGS(v...) SysDebug(v) +#if DEBUG +# define DEBUGS(v...) SysDebug(v) #else # define DEBUGS(...) #endif - + // === CONSTANTS === -#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"}; +#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 - -// === PROTOTYPES === -void elf_doRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symtab, Uint base); -Uint ElfHashString(char *name); - -// === CODE === -/** - \fn int ElfRelocate(void *Base, char **envp, char *Filename) - \brief Relocates a loaded ELF Executable -*/ -int ElfRelocate(void *Base, char **envp, char *Filename) -{ - Elf32_Ehdr *hdr = Base; - Elf32_Phdr *phtab; - int i, j; // Counters - char *libPath; - Uint iRealBase = -1; - Uint iBaseDiff; - int iSegmentCount; - int iSymCount; - Elf32_Rel *rel = NULL; - Elf32_Rela *rela = NULL; - Uint32 *pltgot = 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; - - DEBUGS("ElfRelocate: (Base=0x%x)\n", Base); - - // Parse Program Header to get Dynamic Table - phtab = Base + hdr->phoff; - iSegmentCount = hdr->phentcount; - for(i=0;i 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\n"); - continue; - } - dynamicTab = (void *) 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\n", Base, iRealBase); - - // Adjust "Real" Base - iBaseDiff = (Uint)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, returning\n"); - return hdr->entrypoint; - } - - // Adjust Dynamic Table - dynamicTab = (void *) ((Uint)dynamicTab + iBaseDiff); +#endif + +// === PROTOTYPES === +void elf_doRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symtab, Uint base); +Uint ElfHashString(char *name); + +// === CODE === +/** + \fn int ElfRelocate(void *Base, char **envp, char *Filename) + \brief Relocates a loaded ELF Executable +*/ +void *ElfRelocate(void *Base, char **envp, char *Filename) +{ + Elf32_Ehdr *hdr = Base; + Elf32_Phdr *phtab; + int i, j; // Counters + char *libPath; + Uint iRealBase = -1; + Uint iBaseDiff; + int iSegmentCount; + int iSymCount; + Elf32_Rel *rel = NULL; + Elf32_Rela *rela = NULL; + Uint32 *pltgot = 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; + + DEBUGS("ElfRelocate: (Base=0x%x)\n", Base); + + // Check magic header + + + // Parse Program Header to get Dynamic Table + phtab = Base + hdr->phoff; + iSegmentCount = hdr->phentcount; + for(i=0;i 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\n"); + 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\n", 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, returning\n"); + return (void *)hdr->entrypoint; + } - // === Get Symbol table and String Table === - for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++) + // Adjust Dynamic Table + dynamicTab = (void *)( (intptr_t)dynamicTab + iBaseDiff ); + + // === Get Symbol table and String Table === + for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++) { switch(dynamicTab[j].d_tag) { - // --- Symbol Table --- - case DT_SYMTAB: - DEBUGS(" elf_relocate: DYNAMIC Symbol Table 0x%x (0x%x)\n", - dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff); - dynamicTab[j].d_val += iBaseDiff; - dynsymtab = (void*)(dynamicTab[j].d_val); - hdr->misc.SymTable = dynamicTab[j].d_val; // Saved in unused bytes of ident - break; - // --- String Table --- - case DT_STRTAB: - DEBUGS(" elf_relocate: DYNAMIC String Table 0x%x (0x%x)\n", - dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff); - dynamicTab[j].d_val += iBaseDiff; - dynstrtab = (void*)(dynamicTab[j].d_val); - break; - // --- Hash Table -- - case DT_HASH: - dynamicTab[j].d_val += iBaseDiff; - iSymCount = ((Uint*)(dynamicTab[j].d_val))[1]; - hdr->misc.HashTable = dynamicTab[j].d_val; // Saved in unused bytes of ident + // --- Symbol Table --- + case DT_SYMTAB: + DEBUGS(" elf_relocate: DYNAMIC Symbol Table 0x%x (0x%x)\n", + dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff); + dynamicTab[j].d_val += iBaseDiff; + dynsymtab = (void*)(dynamicTab[j].d_val); + hdr->misc.SymTable = dynamicTab[j].d_val; // Saved in unused bytes of ident + break; + // --- String Table --- + case DT_STRTAB: + DEBUGS(" elf_relocate: DYNAMIC String Table 0x%x (0x%x)\n", + dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff); + dynamicTab[j].d_val += iBaseDiff; + dynstrtab = (void*)(dynamicTab[j].d_val); + break; + // --- Hash Table -- + case DT_HASH: + dynamicTab[j].d_val += iBaseDiff; + iSymCount = ((Uint*)(dynamicTab[j].d_val))[1]; + hdr->misc.HashTable = dynamicTab[j].d_val; // Saved in unused bytes of ident break; } } - - if(dynsymtab == NULL) { - SysDebug("WARNING: No Dynamic Symbol table, returning\n"); - return hdr->entrypoint; - } - - // Alter Symbols to true base - for(i=0;ientrypoint; + } + + // Alter Symbols to true base + for(i=0;i DT_JMPREL) continue; - //DEBUGS(" elf_relocate: %i-%i = %s,0x%x\n", - // i,j, csaDT_NAMES[dynamicTab[j].d_tag],dynamicTab[j].d_val); - break; - } - } - - DEBUGS(" elf_relocate: Beginning Relocation\n"); - - // Parse Relocation Entries - if(rel && relSz) - { - Uint32 *ptr; - DEBUGS(" elf_relocate: rel=0x%x, relSz=0x%x, relEntSz=0x%x\n", rel, relSz, relEntSz); - j = relSz / relEntSz; - for( i = 0; i < j; i++ ) + // === Parse Relocation Data === + DEBUGS(" elf_relocate: dynamicTab = 0x%x\n", dynamicTab); + for( j = 0; dynamicTab[j].d_tag != DT_NULL; j++) + { + switch(dynamicTab[j].d_tag) + { + // --- Shared Library Name --- + case DT_SONAME: + DEBUGS(" elf_relocate: .so Name '%s'\n", dynstrtab+dynamicTab[j].d_val); + break; + // --- Needed Library --- + case DT_NEEDED: + libPath = dynstrtab + dynamicTab[j].d_val; + DEBUGS(" Required Library '%s'\n", libPath); + if(LoadLibrary(libPath, NULL, envp) == 0) { + #if DEBUG + DEBUGS(" elf_relocate: Unable to load '%s'\n", libPath); + #else + SysDebug("Unable to load required library '%s'\n", libPath); + #endif + return 0; + } + 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\n", + // i,j, csaDT_NAMES[dynamicTab[j].d_tag],dynamicTab[j].d_val); + break; + } + } + + DEBUGS(" elf_relocate: Beginning Relocation\n"); + + // Parse Relocation Entries + if(rel && relSz) + { + Uint32 *ptr; + DEBUGS(" elf_relocate: rel=0x%x, relSz=0x%x, relEntSz=0x%x\n", rel, relSz, relEntSz); + j = relSz / relEntSz; + for( i = 0; i < j; i++ ) + { + //DEBUGS(" Rel %i: 0x%x+0x%x\n", i, iBaseDiff, rel[i].r_offset); + ptr = (void*)(iBaseDiff + rel[i].r_offset); + elf_doRelocate(rel[i].r_info, ptr, *ptr, dynsymtab, iBaseDiff); + } + } + // Parse Relocation Entries + if(rela && relaSz) + { + Uint32 *ptr; + DEBUGS(" elf_relocate: rela=0x%x, relaSz=0x%x, relaEntSz=0x%x\n", rela, relaSz, relaEntSz); + j = relaSz / relaEntSz; + for( i = 0; i < j; i++ ) + { + ptr = (void*)(iBaseDiff + rela[i].r_offset); + elf_doRelocate(rel[i].r_info, ptr, rela[i].r_addend, dynsymtab, iBaseDiff); + } + } + + // === Process PLT (Procedure Linkage Table) === + if(plt && pltSz) + { + Uint32 *ptr; + DEBUGS(" elf_relocate: Relocate PLT, plt=0x%x\n", plt); + if(pltType == DT_REL) + { + Elf32_Rel *pltRel = plt; + j = pltSz / sizeof(Elf32_Rel); + DEBUGS(" elf_relocate: PLT Reloc Type = Rel, %i entries\n", j); + for(i=0;ientrypoint); - return hdr->entrypoint; -} - -void elf_doRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symtab, Uint base) -{ - int type = ELF32_R_TYPE(r_info); - int sym = ELF32_R_SYM(r_info); - Uint32 val; - switch( type ) - { - // Standard 32 Bit Relocation (S+A) - case R_386_32: - val = GetSymbol( symtab[sym].name ); - DEBUGS(" elf_doRelocate: R_386_32 *0x%x += 0x%x('%s')\n", - ptr, val, symtab[sym].name); - *ptr = val + addend; - break; - - // 32 Bit Relocation wrt. Offset (S+A-P) - case R_386_PC32: - DEBUGS(" elf_doRelocate: #%i: '%s'\n", sym, symtab[sym].name); - val = GetSymbol( symtab[sym].name ); - DEBUGS(" elf_doRelocate: R_386_PC32 *0x%x = 0x%x + 0x%x - 0x%x\n", - ptr, *ptr, val, (Uint)ptr ); - *ptr = val + addend - (Uint)ptr; - //*ptr = val + addend - ((Uint)ptr - base); + Elf32_Rela *pltRela = plt; + j = pltSz / sizeof(Elf32_Rela); + DEBUGS(" elf_relocate: PLT Reloc Type = Rela, %i entries\n", j); + for(i=0;ientrypoint); + return (void*)hdr->entrypoint; +} + +void elf_doRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symtab, Uint base) +{ + int type = ELF32_R_TYPE(r_info); + int sym = ELF32_R_SYM(r_info); + Uint32 val; + switch( type ) + { + // Standard 32 Bit Relocation (S+A) + case R_386_32: + val = (intptr_t) GetSymbol( symtab[sym].name ); + DEBUGS(" elf_doRelocate: R_386_32 *0x%x += 0x%x('%s')\n", + ptr, val, symtab[sym].name); + *ptr = val + addend; + break; + + // 32 Bit Relocation wrt. Offset (S+A-P) + case R_386_PC32: + DEBUGS(" elf_doRelocate: #%i: '%s'\n", sym, symtab[sym].name); + val = (intptr_t) GetSymbol( symtab[sym].name ); + DEBUGS(" elf_doRelocate: R_386_PC32 *0x%x = 0x%x + 0x%x - 0x%x\n", + ptr, *ptr, val, (Uint)ptr ); + *ptr = val + addend - (intptr_t)ptr; + //*ptr = val + addend - ((Uint)ptr - base); break; - - // Absolute Value of a symbol (S) - case R_386_GLOB_DAT: + + // Absolute Value of a symbol (S) + case R_386_GLOB_DAT: case R_386_JMP_SLOT: - DEBUGS(" elf_doRelocate: #%i: '%s'\n", sym, symtab[sym].name); - val = GetSymbol( symtab[sym].name ); - DEBUGS(" elf_doRelocate: %s *0x%x = 0x%x\n", csaR_NAMES[type], ptr, val); - *ptr = val; - break; - - // Base Address (B+A) - case R_386_RELATIVE: - DEBUGS(" elf_doRelocate: R_386_RELATIVE *0x%x = 0x%x + 0x%x\n", ptr, base, addend); - *ptr = base + addend; - break; - - default: - DEBUGS(" elf_doRelocate: Rel 0x%x: 0x%x,%s\n", ptr, sym, csaR_NAMES[type]); - break; - } - + DEBUGS(" elf_doRelocate: #%i: '%s'\n", sym, symtab[sym].name); + val = (intptr_t) GetSymbol( symtab[sym].name ); + DEBUGS(" elf_doRelocate: %s *0x%x = 0x%x\n", csaR_NAMES[type], ptr, val); + *ptr = val; + break; + + // Base Address (B+A) + case R_386_RELATIVE: + DEBUGS(" elf_doRelocate: R_386_RELATIVE *0x%x = 0x%x + 0x%x\n", ptr, base, addend); + *ptr = base + addend; + break; + + default: + DEBUGS(" elf_doRelocate: Rel 0x%x: 0x%x,%s\n", ptr, sym, csaR_NAMES[type]); + break; + } + } - -/** - * \fn int ElfGetSymbol(Uint Base, char *name, Uint *ret) + +/** + * \fn int ElfGetSymbol(Uint Base, char *name, void **ret) */ -int ElfGetSymbol(Uint Base, char *Name, Uint *ret) +int ElfGetSymbol(void *Base, char *Name, void **ret) { - Elf32_Ehdr *hdr = (void*)Base; + Elf32_Ehdr *hdr = Base; Elf32_Sym *symtab; - int nbuckets = 0; + int nbuckets = 0; int iSymCount = 0; - int i; - Uint *pBuckets; - Uint *pChains; + int i; + Uint *pBuckets; + Uint *pChains; Uint iNameHash; - - //DEBUGS("ElfGetSymbol: (Base=0x%x, Name='%s')\n", Base, Name); - - pBuckets = (void *) hdr->misc.HashTable; - symtab = (void *) hdr->misc.SymTable; + + //DEBUGS("ElfGetSymbol: (Base=0x%x, Name='%s')\n", Base, Name); + + // Catch the current executable + #if 0 + if( !hdr->misc.HashTable ) + { + Elf32_Phdr *phtab; + Elf32_Dyn *dynTab = NULL; + int j; + + // Locate the tables + phtab = (void*)( Base + hdr->phoff ); + for( i = 0; i < hdr->phentcount; i ++ ) + { + if( phtab[i].Type == PT_DYNAMIC ) { + dynTab = (void*)phtab[i].VAddr; + break ; + } + } + if( !dynTab ) { + SysDebug("ERROR - Unable to find DYNAMIC segment in %p", (void*)Base); + return 0; + } + + for( j = 0; dynTab[j].d_tag != DT_NULL; j++) + { + switch(dynTab[j].d_tag) + { + // --- Symbol Table --- + case DT_SYMTAB: + hdr->misc.SymTable = dynTab[j].d_val; + break; + // --- Hash Table -- + case DT_HASH: + hdr->misc.HashTable = dynTab[j].d_val; + break; + } + } + } + #endif + + if( !hdr->misc.SymTable || !hdr->misc.HashTable ) { + return 0; + } + + pBuckets = (void *) (intptr_t) hdr->misc.HashTable; + symtab = (void *) (intptr_t) hdr->misc.SymTable; + + nbuckets = pBuckets[0]; + iSymCount = pBuckets[1]; + pBuckets = &pBuckets[2]; + pChains = &pBuckets[ nbuckets ]; - nbuckets = pBuckets[0]; - iSymCount = pBuckets[1]; - pBuckets = &pBuckets[2]; - pChains = &pBuckets[ nbuckets ]; - // Get hash - iNameHash = ElfHashString(Name); - iNameHash %= nbuckets; - //DEBUGS(" ElfGetSymbol: iNameHash = 0x%x\n", iNameHash); + iNameHash = ElfHashString(Name); + iNameHash %= nbuckets; + //DEBUGS(" ElfGetSymbol: iNameHash = 0x%x\n", iNameHash); - // Walk Chain - i = pBuckets[ iNameHash ]; - //DEBUGS(" ElfGetSymbol: strcmp(Name, \"%s\")\n", symtab[i].name); - if(symtab[i].shndx != SHN_UNDEF && strcmp(symtab[i].name, Name) == 0) { - *ret = symtab[ i ].value; - return 1; - } - - //DEBUGS(" ElfGetSymbol: Hash of first = 0x%x\n", ElfHashString( symtab[i].name ) % nbuckets); - while(pChains[i] != STN_UNDEF) - { - //DEBUGS(" pChains[%i] = %i\n", i, pChains[i]); - i = pChains[i]; - //DEBUGS(" ElfGetSymbol: strcmp(Name, \"%s\")\n", symtab[ i ].name); - if(symtab[i].shndx != SHN_UNDEF && strcmp(symtab[ i ].name, Name) == 0) { - //DEBUGS("ElfGetSymbol: RETURN 1, '%s' = 0x%x\n", symtab[ i ].name, symtab[ i ].value); - *ret = symtab[ i ].value; - return 1; - } - } - + // Walk Chain + i = pBuckets[ iNameHash ]; + //DEBUGS(" ElfGetSymbol: strcmp(Name, \"%s\")\n", symtab[i].name); + if(symtab[i].shndx != SHN_UNDEF && strcmp(symtab[i].name, Name) == 0) { + *ret = (void*) (intptr_t) symtab[ i ].value; + return 1; + } + + //DEBUGS(" ElfGetSymbol: Hash of first = 0x%x\n", ElfHashString( symtab[i].name ) % nbuckets); + while(pChains[i] != STN_UNDEF) + { + //DEBUGS(" pChains[%i] = %i\n", i, pChains[i]); + i = pChains[i]; + //DEBUGS(" ElfGetSymbol: strcmp(Name, \"%s\")\n", symtab[ i ].name); + if(symtab[i].shndx != SHN_UNDEF && strcmp(symtab[ i ].name, Name) == 0) { + //DEBUGS("ElfGetSymbol: RETURN 1, '%s' = 0x%x\n", symtab[ i ].name, symtab[ i ].value); + *ret = (void*)(intptr_t)symtab[ i ].value; + return 1; + } + } + //DEBUGS("ElfGetSymbol: RETURN 0, Symbol '%s' not found\n", Name); return 0; -} - -Uint ElfHashString(char *name) -{ - Uint h = 0, g; - while(*name) - { - h = (h << 4) + *name++; - if( (g = h & 0xf0000000) ) - h ^= g >> 24; - h &= ~g; - } - return h; -} - -#if 0 -unsigned long elf_hash(const unsigned char *name) -{ - unsigned long h = 0, g; - while (*name) - { - h = (h << 4) + *name++; - if (g = h & 0xf0000000) - h ^= g >> 24; - h &= ~g; - } - return h; -} -#endif +} + +Uint ElfHashString(char *name) +{ + Uint h = 0, g; + while(*name) + { + h = (h << 4) + *name++; + if( (g = h & 0xf0000000) ) + h ^= g >> 24; + h &= ~g; + } + return h; +} + +#if 0 +unsigned long elf_hash(const unsigned char *name) +{ + unsigned long h = 0, g; + while (*name) + { + h = (h << 4) + *name++; + if (g = h & 0xf0000000) + h ^= g >> 24; + h &= ~g; + } + return h; +} +#endif