Changeset 153c7a29 in mainline

Timestamp:

2016-05-22T17:46:10Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0dc2fec

Parents:

2112a79

Message:

Since dlopen() sets up runtime_env, we would no longer use the static TLS. Thus set up runtime_env right away and convert static TLS to dynamic TLS.

Location:

uspace

Files:

• lib/c/generic/dlfcn.c (modified) (2 diffs)
• lib/c/generic/libc.c (modified) (3 diffs)
• lib/c/generic/rtld/module.c (modified) (2 diffs)
• lib/c/generic/rtld/rtld.c (modified) (3 diffs)
• lib/c/include/rtld/module.h (modified) (1 diff)
• lib/c/include/rtld/rtld.h (modified) (1 diff)
• srv/loader/main.c (modified) (1 diff)

uspace/lib/c/generic/dlfcn.c

@@ -49 +49 @@
         module_t *m;
 
-        if (runtime_env == NULL) {
-                printf("Dynamic linker not set up -- initializing.\n");
-                rtld_init_static();
-        }
-
-        printf("dlopen(\"%s\", %d)\n", path, flag);
-
-        printf("module_find('%s')\n", path);
         m = module_find(runtime_env, path);
         if (m == NULL) {
-                printf("NULL. module_load('%s')\n", path);
                 m = module_load(runtime_env, path, mlf_local);
-                printf("module_load_deps(m)\n");
                 module_load_deps(m, mlf_local);
                 /* Now relocate. */
-                printf("module_process_relocs(m)\n");
                 module_process_relocs(m);
-        } else {
-                printf("not NULL\n");
         }
 
@@ -81 +68 @@
         module_t *sm;
 
-        printf("dlsym(0x%lx, \"%s\")\n", (long)mod, sym_name);
         sd = symbol_bfs_find(sym_name, (module_t *) mod, &sm);
         if (sd != NULL) {

uspace/lib/c/generic/libc.c

@@ -41 +41 @@
  */
 
+#include <errno.h>
 #include <libc.h>
 #include <stdlib.h>
@@ -65 +66 @@
 void __main(void *pcb_ptr)
 {
+        /* Initialize user task run-time environment */
+        __malloc_init();
+        
         /* Save the PCB pointer */
         __pcb = (pcb_t *) pcb_ptr;
@@ -71 +75 @@
         if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
                 runtime_env = (rtld_t *) __pcb->rtld_runtime;
+        } else {
+                if (rtld_init_static() != EOK)
+                        abort();
         }
 #endif
-        /* Initialize user task run-time environment */
-        __malloc_init();
         
         fibril_t *fibril = fibril_setup();

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

@@ -49 +49 @@
 #include <rtld/rtld_arch.h>
 #include <rtld/module.h>
+
+/** Create module for static executable.
+ *
+ * @param rtld Run-time dynamic linker
+ * @param rmodule Place to store pointer to new module or @c NULL
+ * @return EOK on success, ENOMEM if out of memory
+ */
+int module_create_static_exec(rtld_t *rtld, module_t **rmodule)
+{
+        module_t *module;
+
+        module = calloc(1, sizeof(module_t));
+        if (module == NULL)
+                return ENOMEM;
+
+        module->id = rtld_get_next_id(rtld);
+        module->dyn.soname = "[program]";
+
+        module->rtld = rtld;
+        module->exec = true;
+        module->local = true;
+
+        module->tdata = &_tdata_start;
+        module->tdata_size = &_tdata_end - &_tdata_start;
+        module->tbss_size = &_tbss_end - &_tbss_start;
+        module->tls_align = (uintptr_t)&_tls_alignment;
+
+        list_append(&module->modules_link, &rtld->modules);
+
+        if (rmodule != NULL)
+                *rmodule = module;
+        return EOK;
+}
 
 /** (Eagerly) process all relocation tables in a module.
@@ -191 +224 @@
         m->tls_align = info.tls.tls_align;
 
-        printf("tdata at %p size %zu, tbss size %zu\n",
+        DPRINTF("tdata at %p size %zu, tbss size %zu\n",
             m->tdata, m->tdata_size, m->tbss_size);
 

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

@@ -45 +45 @@
 
 /** Initialize the runtime linker for use in a statically-linked executable. */
-void rtld_init_static(void)
-{
+int rtld_init_static(void)
+{
+        int rc;
+
         runtime_env = &rt_env_static;
         list_initialize(&runtime_env->modules);
@@ -52 +54 @@
         runtime_env->next_bias = 0x2000000;
         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;
 }
 
@@ -98 +109 @@
         prog->tls_align = p_info->tls.tls_align;
 
-        printf("prog tdata at %p size %zu, tbss size %zu\n",
+        DPRINTF("prog tdata at %p size %zu, tbss size %zu\n",
             prog->tdata, prog->tdata_size, prog->tbss_size);
 

uspace/lib/c/include/rtld/module.h

@@ -42 +42 @@
 #include <types/rtld/rtld.h>
 
+extern int module_create_static_exec(rtld_t *, module_t **);
 extern void module_process_relocs(module_t *);
 extern module_t *module_find(rtld_t *, const char *);

uspace/lib/c/include/rtld/rtld.h

@@ -46 +46 @@
 extern rtld_t *runtime_env;
 
-extern void rtld_init_static(void);
+extern int rtld_init_static(void);
 extern int rtld_prog_process(elf_finfo_t *, rtld_t **);
 extern tcb_t *rtld_tls_make(rtld_t *);

uspace/srv/loader/main.c

@@ -269 +269 @@
         
         pcb.filc = filc;
-        printf("dynamic=%p rtld_env=%p\n", pcb.dynamic, pcb.rtld_runtime);
         
         async_answer_0(rid, rc);