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

File:

• uspace/lib/c/generic/rtld/module.c (modified) (11 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>
@@ -62 +63 @@
         module_process_pre_arch(m);
 
-        /* jmp_rel table */
-        if (m->dyn.jmp_rel != NULL) {
-                DPRINTF("jmp_rel table\n");
-                if (m->dyn.plt_rel == DT_REL) {
-                        DPRINTF("jmp_rel table type DT_REL\n");
+        if (m->dyn.plt_rel == DT_REL) {
+                DPRINTF("table type DT_REL\n");
+                if (m->dyn.rel != NULL) {
+                        DPRINTF("non-empty\n");
+                        rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
+                }
+                /* FIXME: this seems wrong */
+                if (m->dyn.jmp_rel != NULL) {
+                DPRINTF("table type jmp-rel\n");
+                        DPRINTF("non-empty\n");
                         rel_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
-                } else {
-                        assert(m->dyn.plt_rel == DT_RELA);
-                        DPRINTF("jmp_rel table type DT_RELA\n");
-                        rela_table_process(m, m->dyn.jmp_rel, m->dyn.plt_rel_sz);
-                }
-        }
-
-        /* rel table */
-        if (m->dyn.rel != NULL) {
-                DPRINTF("rel table\n");
-                rel_table_process(m, m->dyn.rel, m->dyn.rel_sz);
-        }
-
-        /* rela table */
-        if (m->dyn.rela != NULL) {
-                DPRINTF("rela table\n");
-                rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
+                }
+        } else { /* (m->dyn.plt_rel == DT_RELA) */
+                DPRINTF("table type DT_RELA\n");
+                if (m->dyn.rela != NULL) {
+                        DPRINTF("non-empty\n");
+                        rela_table_process(m, m->dyn.rela, m->dyn.rela_sz);
+                }
         }
 
@@ -117 +113 @@
                 }
         }
-
+        
         return NULL; /* Not found */
 }
@@ -127 +123 @@
  * Currently this trivially tries to load '/<name>'.
  */
-module_t *module_load(rtld_t *rtld, const char *name, mlflags_t flags)
+module_t *module_load(rtld_t *rtld, const char *name)
 {
         elf_finfo_t info;
@@ -133 +129 @@
         module_t *m;
         int rc;
-
+        
         m = calloc(1, sizeof(module_t));
-        if (!m) {
+        if (m == NULL) {
                 printf("malloc failed\n");
                 exit(1);
@@ -141 +137 @@
 
         m->rtld = rtld;
-        if ((flags & mlf_local) != 0)
-                m->local = true;
+        m->id = rtld_get_next_id(rtld);
 
         if (str_size(name) > NAME_BUF_SIZE - 2) {
@@ -182 +177 @@
         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;
+
+        printf("tdata at %p size %zu, tbss size %zu\n",
+            m->tdata, m->tdata_size, m->tbss_size);
+
         return m;
 }
@@ -187 +190 @@
 /** Load all modules on which m (transitively) depends.
  */
-void module_load_deps(module_t *m, mlflags_t flags)
+void module_load_deps(module_t *m)
 {
         elf_dyn_t *dp;
@@ -232 +235 @@
                         dm = module_find(m->rtld, dep_name);
                         if (!dm) {
-                                dm = module_load(m->rtld, dep_name, flags);
-                                module_load_deps(dm, flags);
+                                dm = module_load(m->rtld, dep_name);
+                                module_load_deps(dm);
                         }
 
@@ -241 +244 @@
                 ++dp;
         }
+}
+
+/** 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;
 }
 
@@ -260 +274 @@
 }
 
+void modules_process_tls(rtld_t *rtld)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                m->ioffs = rtld->tls_size;
+                rtld->tls_size += m->tdata_size + m->tbss_size;
+        }
+}
+
 /** Clear BFS tags of all modules.
  */