Changes in uspace/lib/c/generic/rtld/rtld.c [32254d6:b83c5e4] in mainline

File:

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

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

@@ -43 +43 @@
 
 rtld_t *runtime_env;
-
-/** Initialize and process an executable.
+static rtld_t rt_env_static;
+
+/** Initialize the runtime linker for use in a statically-linked executable. */
+errno_t rtld_init_static(void)
+{
+        errno_t rc;
+
+        runtime_env = &rt_env_static;
+        list_initialize(&runtime_env->modules);
+        list_initialize(&runtime_env->imodules);
+        runtime_env->program = NULL;
+        runtime_env->next_id = 1;
+
+        rc = module_create_static_exec(runtime_env, NULL);
+        if (rc != EOK)
+                return rc;
+
+        modules_process_tls(runtime_env);
+
+        return EOK;
+}
+
+/** Initialize and process a dynamically linked executable.
  *
  * @param p_info Program info
@@ -52 +73 @@
 {
         rtld_t *env;
-        bool is_dynamic = p_info->dynamic != NULL;
-        DPRINTF("rtld_prog_process\n");
+        module_t *prog;
+
+        DPRINTF("Load dynamically linked program.\n");
 
         /* Allocate new RTLD environment to pass to the loaded program */
@@ -60 +82 @@
                 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
+         * program and insert it into the module graph.
+         */
+
+        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->exec = true;
+        prog->local = false;
+
+        prog->tdata = p_info->tls.tdata;
+        prog->tdata_size = p_info->tls.tdata_size;
+        prog->tbss_size = p_info->tls.tbss_size;
+        prog->tls_align = p_info->tls.tls_align;
+
+        DPRINTF("prog tdata at %p size %zu, tbss size %zu\n",
+            prog->tdata, prog->tdata_size, prog->tbss_size);
+
+        /* Initialize list of loaded modules */
         list_initialize(&env->modules);
         list_initialize(&env->imodules);
-        env->next_id = 1;
-
-        module_t *module;
-        errno_t rc = module_create_entrypoint(p_info, env, &module);
+        list_append(&prog->modules_link, &env->modules);
+
+        /* Pointer to program module. Used as root of the module graph. */
+        env->program = prog;
+
+        /*
+         * Now we can continue with loading all other modules.
+         */
+
+        DPRINTF("Load all program dependencies\n");
+        errno_t rc = module_load_deps(prog, 0);
         if (rc != EOK) {
-                free(env);
                 return rc;
-        }
-
-        /* Pointer to program module. Used as root of the module graph. */
-        env->program = module;
-
-        /*
-         * Now we can continue with loading all other modules.
-         */
-
-        if (is_dynamic) {
-                DPRINTF("Load all program dependencies\n");
-                rc = module_load_deps(module, 0);
-                if (rc != EOK) {
-                        free(module);
-                        free(env);
-                        return rc;
-                }
         }
 
@@ -95 +137 @@
          */
 
-        if (is_dynamic) {
-                /* Process relocations in all modules */
-                DPRINTF("Relocate all modules\n");
-                modules_process_relocs(env, module);
-        }
-
-        if (rre != NULL)
-                *rre = env;
+        /* Process relocations in all modules */
+        DPRINTF("Relocate all modules\n");
+        modules_process_relocs(env, prog);
+
+        *rre = env;
         return EOK;
 }