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

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (3 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\n", (void *) seg_addr,
-            entry->p_memsz);
+        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' : '-',
+            (entry->p_flags & PF_W) ? 'w' : '-',
+            (entry->p_flags & PF_X) ? 'x' : '-');
 
         if (entry->p_align > 1) {
@@ -427 +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;
                 }
@@ -484 +489 @@
                 return EE_OK;
 
-        rc = as_area_change_flags(seg_ptr, flags);
+        DPRINTF("as_area_change_flags(%p, %x)\n",
+            (uint8_t *) base + bias, flags);
+        rc = as_area_change_flags((uint8_t *) base + bias, flags);
         if (rc != EOK) {
                 DPRINTF("Failed to set memory area flags.\n");