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

Timestamp:

2018-05-01T19:03:38Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

6e33c2f, 924786bf

Parents:

009c485

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-05-01 19:03:38)

git-committer:

GitHub <noreply@…> (2018-05-01 19:03:38)

Message:

Make some effort to allocate the memory area for shared objects. (#33)

File:

• uspace/lib/c/generic/rtld/module.c (modified) (1 diff)

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

@@ -202 +202 @@
         str_cpy(name_buf + 5, NAME_BUF_SIZE - 5, name);
 
-        /* FIXME: need to real allocation of address space */
-        m->bias = rtld->next_bias;
-        rtld->next_bias += 0x100000;
 
         DPRINTF("filename:'%s'\n", name_buf);
-        DPRINTF("load '%s' at 0x%zx\n", name_buf, m->bias);
-
-        rc = elf_load_file_name(name_buf, m->bias, ELDF_RW, &info);
+
+        rc = elf_load_file_name(name_buf, ELDF_RW, &info);
         if (rc != EE_OK) {
                 printf("Failed to load '%s'\n", name_buf);
                 exit(1);
         }
+
+        m->bias = elf_get_bias(info.base);
+
+        DPRINTF("loaded '%s' at 0x%zx\n", name_buf, m->bias);
 
         if (info.dynamic == NULL) {