Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2997 → Rev 2998

/branches/dynload/uspace/lib/rtld/symbol.c
42,38 → 42,65
#include <symbol.h>
#include <elf.h>
 
/*
* Hash tables are 32-bit (elf_word) even for 64-bit ELF files.
*/
static elf_word elf_hash(const unsigned char *name)
{
elf_word h = 0, g;
 
while (*name) {
h = (h << 4) + *name++;
g = h & 0xf0000000;
if (g != 0) h ^= g >> 24;
h &= ~g;
}
 
return h;
}
 
static elf_symbol_t *def_find_in_module(char *name, module_t *m)
{
elf_symbol_t *sym_table;
elf_symbol_t *sym;
elf_symbol_t *s, *sym;
elf_word nbucket;
elf_word nchain;
size_t i;
elf_word i;
char *s_name;
char *module_name;
elf_word bucket;
 
module_name = m->dyn.soname;
// module_name = m->dyn.soname;
// printf("def_find_in_module('%s', %s)\n", name, module_name);
 
sym_table = m->dyn.sym_tab;
nbucket = m->dyn.hash[0];
nchain = m->dyn.hash[1];
 
for (i = 0; i < nchain; ++i) {
sym = &sym_table[i];
s_name = m->dyn.str_tab + sym->st_name;
// printf("cmp sym '%s'\n", s_name);
bucket = elf_hash((unsigned char *)name) % nbucket;
i = m->dyn.hash[2 + bucket];
 
sym = NULL;
while (i != STN_UNDEF) {
s = &sym_table[i];
s_name = m->dyn.str_tab + s->st_name;
 
if (strcmp(name, s_name) == 0) {
// printf("name match\n");
if (sym->st_shndx != SHN_UNDEF) {
// printf("definition found. idx=%d\n", i);
return sym;
} else {
// printf("not a definition\n");
}
sym = s;
break;
}
 
i = m->dyn.hash[2 + nbucket + i];
}
 
// printf("not found\n");
return NULL;
if (!sym)
return NULL; /* Not found */
 
if (sym->st_shndx == SHN_UNDEF) {
/* Not a definition */
return NULL;
}
 
return sym; /* Found */
}
 
 
95,5 → 122,15
return NULL;
}
 
uintptr_t symbol_get_addr(elf_symbol_t *sym, module_t *m)
{
if (sym->st_shndx == SHN_ABS) {
/* Do not add bias to absolute symbols */
return sym->st_value;
} else {
return sym->st_value + m->bias;
}
}
 
/** @}
*/