/branches/dynload/uspace/lib/rtld/include/rtld.h |
---|
45,8 → 45,10 |
} module_t; |
typedef struct { |
elf_dyn_t *rtld_dynamic; |
module_t rtld; |
module_t *program; |
module_t *rtld; |
module_t *libc; |
} runtime_env_t; |
/branches/dynload/uspace/lib/rtld/rtld.c |
---|
52,11 → 52,16 |
elf_info_t lib_info; |
static module_t prog; |
static module_t lib; |
module_t *rtld; |
int rc; |
printf("Hello, world! (from rtld)\n"); |
getchar(); |
/* rtld_dynamic and rtld->bias were filled out by the bootstrap code */ |
rtld = &runtime_env.rtld; |
dynamic_parse(runtime_env.rtld_dynamic, rtld->bias, &rtld->dyn); |
printf("Parse .dynamic section\n"); |
pcb = (pcb_t *)PCB_ADDRESS; |
dynamic_parse(pcb->dynamic, 0, &prog.dyn); |
77,12 → 82,17 |
runtime_env.program = &prog; |
runtime_env.libc = &lib; |
runtime_env.rtld = NULL; |
/* Parse program's relocation tables */ |
printf("Resolve references in program\n"); |
rel_table_process(&prog, prog.dyn.rel, prog.dyn.rel_sz); |
rel_table_process(&prog, prog.dyn.jmp_rel, prog.dyn.plt_rel_sz); |
/* Parse lib's relocation tables */ |
printf("Resolve references in library\n"); |
rel_table_process(&lib, lib.dyn.rel, lib.dyn.rel_sz); |
rel_table_process(&lib, lib.dyn.jmp_rel, lib.dyn.plt_rel_sz); |
printf("lib.bias=0x%x\n", lib.bias); |
printf("Run program..\n"); |
/branches/dynload/uspace/lib/rtld/symbol.c |
---|
52,7 → 52,7 |
char *module_name; |
module_name = m->dyn.soname; |
printf("def_find_in_module('%s', %s)\n", name, module_name); |
// printf("def_find_in_module('%s', %s)\n", name, module_name); |
sym_table = m->dyn.sym_tab; |
nchain = m->dyn.hash[1]; |
60,19 → 60,19 |
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); |
// printf("cmp sym '%s'\n", s_name); |
if (strcmp(name, s_name) == 0) { |
printf("name match\n"); |
// printf("name match\n"); |
if (sym->st_shndx != SHN_UNDEF) { |
printf("definition found. idx=%d\n", i); |
// printf("definition found. idx=%d\n", i); |
return sym; |
} else { |
printf("not a definition\n"); |
// printf("not a definition\n"); |
} |
} |
} |
printf("not found\n"); |
// printf("not found\n"); |
return NULL; |
} |
87,8 → 87,8 |
sym = def_find_in_module(name, runtime_env.libc); |
if (sym != NULL) { *m = runtime_env.libc; return sym; } |
/* sym = def_find_in_module(name, runtime_env.rtld); |
if (sym != NULL) { *m = runtime_env.rtld; return sym; }*/ |
sym = def_find_in_module(name, &runtime_env.rtld); |
if (sym != NULL) { *m = &runtime_env.rtld; return sym; } |
printf("symbol found nowhere\n"); |
*m = NULL; |
/branches/dynload/uspace/lib/rtld/arch/ia32/src/bootstrap.c |
---|
213,6 → 213,10 |
} |
kputint(-1); |
/* This will come in handy */ |
runtime_env.rtld_dynamic = dynamic; |
runtime_env.rtld.bias = bias; |
/* Init libc and run rtld main */ |
__main(); |