Changeset 17aca1c in mainline for uspace/srv/loader/elf_load.c

Timestamp:

2011-02-04T20:56:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (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

File:

• uspace/srv/loader/elf_load.c (modified) (7 diffs)

uspace/srv/loader/elf_load.c

@@ -109 +109 @@
         int fd;
         int rc;
-
+        
         fd = open(file_name, O_RDONLY);
         if (fd < 0) {
@@ -300 +300 @@
         case PT_NULL:
         case PT_PHDR:
+        case PT_NOTE:
                 break;
         case PT_LOAD:
@@ -310 +311 @@
         case PT_DYNAMIC:
         case PT_SHLIB:
-        case PT_NOTE:
         case PT_LOPROC:
         case PT_HIPROC:
@@ -344 +344 @@
         seg_ptr = (void *) seg_addr;
 
-        DPRINTF("Load segment at addr %p, size 0x%x\n", seg_addr,
+        DPRINTF("Load segment at addr %p, size 0x%x\n", (void *) seg_addr,
                 entry->p_memsz);
 
@@ -372 +372 @@
         mem_sz = entry->p_memsz + (entry->p_vaddr - base);
 
-        DPRINTF("Map to seg_addr=%p-%p.\n", seg_addr,
-        entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE));
+        DPRINTF("Map to seg_addr=%p-%p.\n", (void *) seg_addr,
+            (void *) (entry->p_vaddr + bias +
+            ALIGN_UP(entry->p_memsz, PAGE_SIZE)));
 
         /*
@@ -386 +387 @@
         }
 
-        DPRINTF("as_area_create(%p, 0x%x, %d) -> 0x%lx\n",
-                base + bias, mem_sz, flags, (uintptr_t)a);
+        DPRINTF("as_area_create(%p, %#zx, %d) -> %p\n",
+            (void *) (base + bias), mem_sz, flags, (void *) a);
 
         /*
@@ -464 +465 @@
                     (void *)((uint8_t *)entry->sh_addr + elf->bias);
                 DPRINTF("Dynamic section found at %p.\n",
-                        (uintptr_t)elf->info->dynamic);
+                    (void *) elf->info->dynamic);
                 break;
         default: