Changeset 91e4567 in mainline

Timestamp:

2016-05-06T15:21:22Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0dc9a474

Parents:

7c4b26c

Message:

runtime_env must be set early, before calling fibril_setup.

Location:

uspace/lib/c/generic

Files:

• libc.c (modified) (3 diffs)
• rtld/rtld.c (modified) (1 diff)
• tls.c (modified) (2 diffs)

uspace/lib/c/generic/libc.c

@@ -65 +65 @@
 void __main(void *pcb_ptr)
 {
+        /* Save the PCB pointer */
+        __pcb = (pcb_t *) pcb_ptr;
+        
+#ifdef CONFIG_RTLD
+        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+                runtime_env = (rtld_t *) __pcb->rtld_runtime;
+        }
+#endif
         /* Initialize user task run-time environment */
         __malloc_init();
@@ -74 +82 @@
         __tcb_set(fibril->tcb);
         
-        /* Save the PCB pointer */
-        __pcb = (pcb_t *) pcb_ptr;
         
 #ifdef FUTEX_UPGRADABLE
@@ -89 +95 @@
         char **argv;
         
-#ifdef CONFIG_RTLD
-        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
-                runtime_env = (rtld_t *) __pcb->rtld_runtime;
-        }
-#endif
         /*
          * Get command line arguments and initialize

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

@@ -151 +151 @@
         offset = 0;
         list_foreach(rtld->modules, modules_link, module_t, m) {
+                assert(offset + m->tdata_size + m->tbss_size <= rtld->tls_size);
                 memcpy(data + offset, m->tdata, m->tdata_size);
                 offset += m->tdata_size;

uspace/lib/c/generic/tls.c

@@ -47 +47 @@
 size_t tls_get_size(void)
 {
+#ifdef CONFIG_RTLD
+        if (runtime_env != NULL)
+                return runtime_env->tls_size;
+#endif
         return &_tbss_end - &_tdata_start;
 }
@@ -83 +87 @@
 void tls_free(tcb_t *tcb)
 {
-        size_t tls_size = &_tbss_end - &_tdata_start;
-
-#ifdef CONFIG_RTLD
-        if (runtime_env != NULL)
-                tls_size = runtime_env->tls_size;
-#endif
-        tls_free_arch(tcb, tls_size);
+        tls_free_arch(tcb, tls_get_size());
 }