52,7 → 52,7 |
void _rtld_main(void) |
{ |
static module_t prog; |
module_t *rtld; |
// module_t *rtld; |
|
printf("Hello, world! (from rtld)\n"); |
|
63,9 → 63,9 |
*/ |
|
/* rtld_dynamic and rtld->bias were filled out by the bootstrap code */ |
rtld = &runtime_env.rtld; |
printf("Parse rtld .dynamic section at 0x%x\n", runtime_env.rtld_dynamic); |
dynamic_parse(runtime_env.rtld_dynamic, rtld->bias, &rtld->dyn); |
// rtld = &runtime_env.rtld; |
// printf("Parse rtld .dynamic section at 0x%x\n", runtime_env.rtld_dynamic); |
// dynamic_parse(runtime_env.rtld_dynamic, rtld->bias, &rtld->dyn); |
|
printf("Parse program .dynamic section at 0x%x\n", __pcb->dynamic); |
dynamic_parse(__pcb->dynamic, 0, &prog.dyn); |
75,7 → 75,7 |
/* Initialize list of loaded modules */ |
list_initialize(&runtime_env.modules_head); |
list_append(&prog.modules_link, &runtime_env.modules_head); |
list_append(&rtld->modules_link, &runtime_env.modules_head); |
// list_append(&rtld->modules_link, &runtime_env.modules_head); |
|
/* Pointer to program module. Used as root of the dependency graph */ |
runtime_env.program = &prog; |