Changeset 1c3c287 in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2019-01-14T16:52:47Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d4ceba0

Parents:

8e3bc063

git-author:

Jiri Svoboda <jiri@…> (2018-01-19 19:52:43)

git-committer:

Jiri Svoboda <jiri@…> (2019-01-14 16:52:47)

Message:

Dynamic linking on sparc64

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (2 diffs)

uspace/lib/c/generic/elf/elf_mod.c

@@ -420 +420 @@
         seg_ptr = (void *) seg_addr;
 
-        DPRINTF("Load segment at addr %p, size 0x%zx, flags %c%c%c\n", (void *) seg_addr,
+        DPRINTF("Load segment v_addr=0x%zx at addr %p, size 0x%zx, flags %c%c%c\n",
+            entry->p_vaddr,
+            (void *) seg_addr,
             entry->p_memsz,
             (entry->p_flags & PF_R) ? 'r' : '-',
@@ -430 +432 @@
                     (seg_addr % entry->p_align)) {
                         DPRINTF("Align check 1 failed offset%%align=0x%zx, "
-                            "vaddr%%align=0x%zx\n",
+                            "vaddr%%align=0x%zx align=0x%zx\n",
                             entry->p_offset % entry->p_align,
-                            seg_addr % entry->p_align);
+                            seg_addr % entry->p_align, entry->p_align);
                         return EE_INVALID;
                 }