Changeset f570cdf in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2016-05-24T15:32:57Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c170438

Parents:

dcc150cb (diff), 0a981e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

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

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

@@ -37 +37 @@
 #include <adt/list.h>
 #include <elf/elf_load.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <loader/pcb.h>
@@ -48 +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.
@@ -135 +169 @@
 
         m = calloc(1, sizeof(module_t));
-        if (!m) {
+        if (m == NULL) {
                 printf("malloc failed\n");
                 exit(1);
@@ -141 +175 @@
 
         m->rtld = rtld;
+        m->id = rtld_get_next_id(rtld);
+
         if ((flags & mlf_local) != 0)
                 m->local = true;
@@ -181 +217 @@
         /* Insert into the list of loaded modules */
         list_append(&m->modules_link, &rtld->modules);
+
+        /* Copy TLS info */
+        m->tdata = info.tls.tdata;
+        m->tdata_size = info.tls.tdata_size;
+        m->tbss_size = info.tls.tbss_size;
+        m->tls_align = info.tls.tls_align;
+
+        DPRINTF("tdata at %p size %zu, tbss size %zu\n",
+            m->tdata, m->tdata_size, m->tbss_size);
 
         return m;
@@ -243 +288 @@
 }
 
+/** Find module structure by ID. */
+module_t *module_by_id(rtld_t *rtld, unsigned long id)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                if (m->id == id)
+                        return m;
+        }
+
+        return NULL;
+}
+
 /** Process relocations in modules.
  *
@@ -260 +316 @@
 }
 
+void modules_process_tls(rtld_t *rtld)
+{
+#ifdef CONFIG_TLS_VARIANT_1
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                m->ioffs = rtld->tls_size;
+                list_append(&m->imodules_link, &rtmd->imodules);
+                rtld->tls_size += m->tdata_size + m->tbss_size;
+        }
+#else /* CONFIG_TLS_VARIANT_2 */
+        size_t offs;
+
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                rtld->tls_size += m->tdata_size + m->tbss_size;
+        }
+
+        offs = 0;
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                offs += m->tdata_size + m->tbss_size;
+                m->ioffs = rtld->tls_size - offs;
+                list_append(&m->imodules_link, &rtld->imodules);
+        }
+#endif
+}
+
 /** Clear BFS tags of all modules.
  */