Changeset 32573ff in mainline for uspace/lib/c/generic

Timestamp:

2016-05-02T20:58:16Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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 mainline, which has dltest and fixes.

Location:

uspace/lib/c/generic

Files:

• dlfcn.c (modified) (2 diffs)
• rtld/module.c (modified) (7 diffs)
• rtld/rtld.c (modified) (2 diffs)
• rtld/symbol.c (modified) (4 diffs)

uspace/lib/c/generic/dlfcn.c

@@ -60 +60 @@
         if (m == NULL) {
                 printf("NULL. module_load('%s')\n", path);
-                m = module_load(runtime_env, path);
+                m = module_load(runtime_env, path, mlf_local);
                 printf("module_load_deps(m)\n");
-                module_load_deps(m);
+                module_load_deps(m, mlf_local);
                 /* Now relocate. */
                 printf("module_process_relocs(m)\n");
@@ -82 +82 @@
 
         printf("dlsym(0x%lx, \"%s\")\n", (long)mod, sym_name);
-        sd = symbol_bfs_find(sym_name, (module_t *) mod, ssf_none, &sm);
+        sd = symbol_bfs_find(sym_name, (module_t *) mod, &sm);
         if (sd != NULL) {
                 return symbol_get_addr(sd, sm);

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

@@ -63 +63 @@
         module_process_pre_arch(m);
 
-        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);
+        /* 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");
+                        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);
                 }
-                /* 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 { /* (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);
-                }
+        }
+
+        /* 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);
         }
 
@@ -113 +118 @@
                 }
         }
-        
+
         return NULL; /* Not found */
 }
@@ -123 +128 @@
  * Currently this trivially tries to load '/<name>'.
  */
-module_t *module_load(rtld_t *rtld, const char *name)
+module_t *module_load(rtld_t *rtld, const char *name, mlflags_t flags)
 {
         elf_finfo_t info;
@@ -129 +134 @@
         module_t *m;
         int rc;
-        
+
         m = calloc(1, sizeof(module_t));
         if (m == NULL) {
@@ -138 +143 @@
         m->rtld = rtld;
         m->id = rtld_get_next_id(rtld);
+
+        if ((flags & mlf_local) != 0)
+                m->local = true;
 
         if (str_size(name) > NAME_BUF_SIZE - 2) {
@@ -190 +198 @@
 /** Load all modules on which m (transitively) depends.
  */
-void module_load_deps(module_t *m)
+void module_load_deps(module_t *m, mlflags_t flags)
 {
         elf_dyn_t *dp;
@@ -235 +243 @@
                         dm = module_find(m->rtld, dep_name);
                         if (!dm) {
-                                dm = module_load(m->rtld, dep_name);
-                                module_load_deps(dm);
+                                dm = module_load(m->rtld, dep_name, flags);
+                                module_load_deps(dm, flags);
                         }
 

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

@@ -89 +89 @@
         prog->rtld = env;
         prog->id = rtld_get_next_id(env);
+        prog->exec = true;
+        prog->local = false;
 
         prog->tdata = p_info->tls.tdata;
@@ -112 +114 @@
 
         DPRINTF("Load all program dependencies\n");
-        module_load_deps(prog);
+        module_load_deps(prog, 0);
 
         /*

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

@@ -112 +112 @@
  * @param name          Name of the symbol to search for.
  * @param start         Module in which to start the search..
- * @param flags         @c ssf_none or @c ssf_noroot to not look for the symbol
- *                      in @a start
  * @param mod           (output) Will be filled with a pointer to the module 
  *                      that contains the symbol.
  */
 elf_symbol_t *symbol_bfs_find(const char *name, module_t *start,
-    symbol_search_flags_t flags, module_t **mod)
+    module_t **mod)
 {
         module_t *m, *dm;
@@ -150 +148 @@
 
                 /* If ssf_noroot is specified, do not look in start module */
-                if (m != start || (flags & ssf_noroot) == 0) { 
-                        s = def_find_in_module(name, m);
-                        if (s != NULL) {
-                                /* Symbol found */
-                                sym = s;
-                                *mod = m;
-                                break;
-                        }
+                s = def_find_in_module(name, m);
+                if (s != NULL) {
+                        /* Symbol found */
+                        sym = s;
+                        *mod = m;
+                        break;
                 }
 
@@ -189 +185 @@
  *
  * By definition in System V ABI, if module origin has the flag DT_SYMBOLIC,
- * origin is searched first. Otherwise, or if the symbol hasn't been found,
- * the module dependency graph is searched breadth-first, beginning
- * from the executable program.
+ * origin is searched first. Otherwise, search global modules in the default
+ * order.
  *
  * @param name          Name of the symbol to search for.
  * @param origin        Module in which the dependency originates.
- * @param flags         @c ssf_none or @c ssf_noroot to not look for the symbol
+ * @param flags         @c ssf_none or @c ssf_noexec to not look for the symbol
  *                      in the executable program.
  * @param mod           (output) Will be filled with a pointer to the module 
@@ -205 +200 @@
         elf_symbol_t *s;
 
-        if (origin->dyn.symbolic) {
-                /* 
+        DPRINTF("symbol_def_find('%s', origin='%s'\n",
+            name, origin->dyn.soname);
+        if (origin->dyn.symbolic && (!origin->exec || (flags & ssf_noexec) == 0)) {
+                DPRINTF("symbolic->find '%s' in module '%s'\n", name, origin->dyn.soname);
+                /*
                  * Origin module has a DT_SYMBOLIC flag.
                  * Try this module first
                  */
-                 s = def_find_in_module(name, origin);
-                 if (s != NULL) {
+                s = def_find_in_module(name, origin);
+                if (s != NULL) {
                         /* Found */
                         *mod = origin;
                         return s;
-                 }
+                }
         }
 
         /* Not DT_SYMBOLIC or no match. Now try other locations. */
 
-        if (origin->rtld->program) {
-                /* Program is dynamic -- start with program as root. */
-                return symbol_bfs_find(name, origin->rtld->program, flags, mod);
-        } else {
-                /* Program is static -- start with @a origin as root. */
-                return symbol_bfs_find(name, origin, ssf_none, mod);
-        }
+        list_foreach(origin->rtld->modules, modules_link, module_t, m) {
+                DPRINTF("module '%s' local?\n", m->dyn.soname);
+                if (!m->local && (!m->exec || (flags & ssf_noexec) == 0)) {
+                        DPRINTF("!local->find '%s' in module '%s'\n", name, m->dyn.soname);
+                        s = def_find_in_module(name, m);
+                        if (s != NULL) {
+                                /* Found */
+                                *mod = m;
+                                return s;
+                        }
+                }
+        }
+
+        /* Finally, try origin. */
+
+        DPRINTF("try finding '%s' in origin '%s'\n", name,
+            origin->dyn.soname);
+
+        if (!origin->exec || (flags & ssf_noexec) == 0) {
+                s = def_find_in_module(name, origin);
+                if (s != NULL) {
+                        /* Found */
+                        *mod = origin;
+                        return s;
+                }
+        }
+
+        DPRINTF("'%s' not found\n", name);
+        return NULL;
 }