Changeset 04803bf in mainline for uspace/lib/c/rtld/symbol.c

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 changes (needs fixes).

File:

• uspace/lib/c/rtld/symbol.c (moved) (moved from uspace/lib/libc/rtld/symbol.c ) (6 diffs)

uspace/lib/c/rtld/symbol.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+//#include <string.h>
 
 #include <rtld.h>
@@ -60 +60 @@
 }
 
-static elf_symbol_t *def_find_in_module(char *name, module_t *m)
+static elf_symbol_t *def_find_in_module(const char *name, module_t *m)
 {
         elf_symbol_t *sym_table;
@@ -114 +114 @@
  *                      that contains the symbol.
  */
-elf_symbol_t *symbol_bfs_find(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;
@@ -191 +191 @@
  *                      that contains the symbol.
  */
-elf_symbol_t *symbol_def_find(char *name, module_t *origin, module_t **mod)
-{
-        module_t *m, *dm;
-        elf_symbol_t *sym, *s;
-        link_t queue_head;
-        size_t i;
+elf_symbol_t *symbol_def_find(const char *name, module_t *origin, module_t **mod)
+{
+        elf_symbol_t *s;
 
         if (origin->dyn.symbolic) {
@@ -216 +213 @@
                 /* Program is dynamic -- start with program as root. */
                 return symbol_bfs_find(name, runtime_env->program, mod);
-        } else {        
+        } else {
                 /* Program is static -- start with @a origin as root. */
                 return symbol_bfs_find(name, origin, mod);
@@ -222 +219 @@
 }
 
-uintptr_t symbol_get_addr(elf_symbol_t *sym, module_t *m)
+void *symbol_get_addr(elf_symbol_t *sym, module_t *m)
 {
         if (sym->st_shndx == SHN_ABS) {
                 /* Do not add bias to absolute symbols */
-                return sym->st_value;
+                return (void *) sym->st_value;
         } else {
-                return sym->st_value + m->bias;
+                return (void *) (sym->st_value + m->bias);
         }
 }