Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3561 → Rev 3562

/branches/dynload/uspace/lib/rtld/arch/ia32/src/reloc.c
69,16 → 69,16
elf_symbol_t *sym_def;
module_t *dest;
 
printf("parse relocation table\n");
DPRINTF("parse relocation table\n");
 
sym_table = m->dyn.sym_tab;
rt_entries = rt_size / sizeof(elf_rel_t);
str_tab = m->dyn.str_tab;
 
printf("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
for (i = 0; i < rt_entries; ++i) {
// printf("symbol %d: ", i);
// DPRINTF("symbol %d: ", i);
r_offset = rt[i].r_offset;
r_info = rt[i].r_info;
 
85,7 → 85,7
sym_idx = ELF32_R_SYM(r_info);
sym = &sym_table[sym_idx];
 
/* printf("name '%s', value 0x%x, size 0x%x\n",
/* DPRINTF("name '%s', value 0x%x, size 0x%x\n",
str_tab + sym->st_name,
sym->st_value,
sym->st_size);
94,16 → 94,16
r_ptr = (uint32_t *)(r_offset + m->bias);
 
if (sym->st_name != 0) {
// printf("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
// DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
sym_def = symbol_def_find(str_tab + sym->st_name,
m, &dest);
// printf("dest name: '%s'\n", dest->dyn.soname);
// printf("dest bias: 0x%x\n", dest->bias);
// DPRINTF("dest name: '%s'\n", dest->dyn.soname);
// DPRINTF("dest bias: 0x%x\n", dest->bias);
if (sym_def) {
sym_addr = symbol_get_addr(sym_def, dest);
// printf("symbol definition found, addr=0x%x\n", sym_addr);
// DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
} else {
printf("symbol definition not found\n");
DPRINTF("symbol definition not found\n");
continue;
}
}
111,17 → 111,17
switch (rel_type) {
case R_386_GLOB_DAT:
case R_386_JUMP_SLOT:
// printf("fixup R_386_GLOB_DAT/JUMP_SLOT (b+v)\n");
// DPRINTF("fixup R_386_GLOB_DAT/JUMP_SLOT (b+v)\n");
*r_ptr = sym_addr;
break;
 
case R_386_32:
// printf("fixup R_386_32 (b+v+a)\n");
// DPRINTF("fixup R_386_32 (b+v+a)\n");
*r_ptr += sym_addr;
break;
case R_386_RELATIVE:
// printf("fixup R_386_RELATIVE (b+a)\n");
// DPRINTF("fixup R_386_RELATIVE (b+a)\n");
*r_ptr += m->bias;
break;
}