Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2982 → Rev 2983

/branches/dynload/uspace/lib/rtld/arch/ia32/src/reloc.c
72,7 → 72,7
printf("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
for (i = 0; i < rt_entries; ++i) {
printf("symbol %d: ", i);
// printf("symbol %d: ", i);
r_offset = rt[i].r_offset;
r_info = rt[i].r_info;
 
79,22 → 79,27
sym_idx = ELF32_R_SYM(r_info);
sym = &sym_table[sym_idx];
 
printf("name '%s', value 0x%x, size 0x%x\n",
/* printf("name '%s', value 0x%x, size 0x%x\n",
str_tab + sym->st_name,
sym->st_value,
sym->st_size);
 
*/
rel_type = ELF32_R_TYPE(r_info);
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);
// printf("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
sym_def = symbol_def_find(str_tab + sym->st_name, &dest);
printf("dest name: '%s'\n", dest->dyn.soname);
printf("dest bias: 0x%x\n", dest->bias);
// printf("dest name: '%s'\n", dest->dyn.soname);
// printf("dest bias: 0x%x\n", dest->bias);
if (sym_def) {
sym_addr = sym_def->st_value + dest->bias;
printf("symbol definition found, addr=0x%x\n", sym_addr);
if (sym_def->st_shndx == SHN_ABS) {
/* Do not add bias to absolute symbols */
sym_addr = sym_def->st_value;
} else {
sym_addr = sym_def->st_value + dest->bias;
}
// printf("symbol definition found, addr=0x%x\n", sym_addr);
} else {
printf("symbol definition not found\n");
continue;
104,17 → 109,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");
// printf("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");
// printf("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");
// printf("fixup R_386_RELATIVE (b+a)\n");
*r_ptr += m->bias;
break;
}