Changes in uspace/lib/c/generic/rtld/rtld.c [6adb775f:5035ba05] in mainline

File:

• uspace/lib/c/generic/rtld/rtld.c (modified) (7 diffs)

uspace/lib/c/generic/rtld/rtld.c

@@ -43 +43 @@
 rtld_t *runtime_env;
 static rtld_t rt_env_static;
+static module_t prog_mod;
 
 /** Initialize the runtime linker for use in a statically-linked executable. */
@@ -61 +62 @@
 {
         rtld_t *env;
-        module_t *prog;
 
         DPRINTF("Load dynamically linked program.\n");
@@ -70 +70 @@
                 return ENOMEM;
 
-        env->next_id = 1;
-
-        prog = calloc(1, sizeof(module_t));
-        if (prog == NULL) {
-                free(env);
-                return ENOMEM;
-        }
-
         /*
          * First we need to process dynamic sections of the executable
@@ -84 +76 @@
 
         DPRINTF("Parse program .dynamic section at %p\n", p_info->dynamic);
-        dynamic_parse(p_info->dynamic, 0, &prog->dyn);
-        prog->bias = 0;
-        prog->dyn.soname = "[program]";
-        prog->rtld = env;
-        prog->id = rtld_get_next_id(env);
-
-        prog->tdata = p_info->tls.tdata;
-        prog->tdata_size = p_info->tls.tdata_size;
-        prog->tbss_size = p_info->tls.tbss_size;
-
-        printf("prog tdata at %p size %zu, tbss size %zu\n",
-            prog->tdata, prog->tdata_size, prog->tbss_size);
+        dynamic_parse(p_info->dynamic, 0, &prog_mod.dyn);
+        prog_mod.bias = 0;
+        prog_mod.dyn.soname = "[program]";
+        prog_mod.rtld = env;
+        prog_mod.exec = true;
+        prog_mod.local = false;
 
         /* Initialize list of loaded modules */
         list_initialize(&env->modules);
-        list_append(&prog->modules_link, &env->modules);
+        list_append(&prog_mod.modules_link, &env->modules);
 
         /* Pointer to program module. Used as root of the module graph. */
-        env->program = prog;
+        env->program = &prog_mod;
 
         /* Work around non-existent memory space allocation. */
@@ -112 +98 @@
 
         DPRINTF("Load all program dependencies\n");
-        module_load_deps(prog);
+        module_load_deps(&prog_mod, 0);
 
         /*
@@ -120 +106 @@
         /* Process relocations in all modules */
         DPRINTF("Relocate all modules\n");
-        modules_process_relocs(env, prog);
-
-        modules_process_tls(env);
+        modules_process_relocs(env, &prog_mod);
 
         *rre = env;
@@ -128 +112 @@
 }
 
-/** Create TLS (Thread Local Storage) data structures.
- *
- * @return Pointer to TCB.
- */
-tcb_t *rtld_tls_make(rtld_t *rtld)
-{
-        void *data;
-        tcb_t *tcb;
-        size_t offset;
-
-        tcb = tls_alloc_arch(&data, rtld->tls_size);
-        if (tcb == NULL)
-                return NULL;
-
-        /*
-         * Copy thread local data from the modules' initialization images.
-         * Zero out thread-local uninitialized data.
-         */
-
-        offset = 0;
-        list_foreach(rtld->modules, modules_link, module_t, m) {
-                memcpy(data + offset, m->tdata, m->tdata_size);
-                offset += m->tdata_size;
-                memset(data + offset, 0, m->tbss_size);
-                offset += m->tbss_size;
-        }
-
-        return tcb;
-}
-
-unsigned long rtld_get_next_id(rtld_t *rtld)
-{
-        return rtld->next_id++;
-}
-
-void *rtld_tls_get_addr(rtld_t *rtld, void *tls, unsigned long mod_id,
-    unsigned long offset)
-{
-        module_t *m;
-
-        m = module_by_id(rtld, mod_id);
-        assert(m != NULL);
-
-        return tls + m->ioffs + offset;
-}
-
-
 /** @}
  */