Changes in uspace/lib/c/generic/rtld/symbol.c [9d58539:d2bb25e7] in mainline

File:

• uspace/lib/c/generic/rtld/symbol.c (modified) (5 diffs)

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

@@ -39 +39 @@
 
 #include <elf/elf.h>
+#include <rtld/module.h>
 #include <rtld/rtld.h>
 #include <rtld/rtld_debug.h>
@@ -114 +115 @@
  *                      that contains the symbol.
  */
-elf_symbol_t *symbol_bfs_find(const char *name, module_t *start, module_t **mod)
+elf_symbol_t *symbol_bfs_find(const char *name, module_t *start,
+    module_t **mod)
 {
         module_t *m, *dm;
@@ -129 +131 @@
 
         /* Mark all vertices (modules) as unvisited */  
-        modules_untag();
+        modules_untag(start->rtld);
 
         /* Insert root (the program) into the queue and tag it */
@@ -145 +147 @@
                 list_remove(&m->queue_link);
 
+                /* If ssf_noroot is specified, do not look in start module */
                 s = def_find_in_module(name, m);
                 if (s != NULL) {
@@ -179 +182 @@
 
 
-/** Find the definition of a symbol..
+/** Find the definition of a symbol.
  *
  * 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_noexec to not look for the symbol
+ *                      in the executable program.
  * @param mod           (output) Will be filled with a pointer to the module 
  *                      that contains the symbol.
  */
-elf_symbol_t *symbol_def_find(const char *name, module_t *origin, module_t **mod)
+elf_symbol_t *symbol_def_find(const char *name, module_t *origin,
+    symbol_search_flags_t flags, module_t **mod)
 {
         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 (runtime_env->program) {
-                /* Program is dynamic -- start with program as root. */
-                return symbol_bfs_find(name, runtime_env->program, mod);
-        } else {
-                /* Program is static -- start with @a origin as root. */
-                return symbol_bfs_find(name, origin, mod);
-        }
-}
-
-void *symbol_get_addr(elf_symbol_t *sym, module_t *m)
-{
-        if (sym->st_shndx == SHN_ABS) {
+        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;
+}
+
+/** Get symbol address.
+ *
+ * @param sym Symbol
+ * @param m Module contaning the symbol
+ * @param tcb TCB of the thread whose thread-local variable instance should
+ *            be returned. If @a tcb is @c NULL then @c NULL is returned for
+ *            thread-local variables.
+ *
+ * @return Symbol address
+ */
+void *symbol_get_addr(elf_symbol_t *sym, module_t *m, tcb_t *tcb)
+{
+        if (ELF_ST_TYPE(sym->st_info) == STT_TLS) {
+                if (tcb == NULL)
+                        return NULL;
+                return rtld_tls_get_addr(m->rtld, tcb, m->id, sym->st_value);
+        } else if (sym->st_shndx == SHN_ABS) {
                 /* Do not add bias to absolute symbols */
                 return (void *) sym->st_value;