Changeset a7bd30f in mainline

Timestamp:

2016-04-19T16:54:21Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

184b600

Parents:

8539cf2

Message:

Fix ELF debug messages with LP64.

File:

• uspace/lib/c/generic/elf/elf_load.c (modified) (6 diffs)

uspace/lib/c/generic/elf/elf_load.c

@@ -175 +175 @@
 
         if (header->e_phentsize != sizeof(elf_segment_header_t)) {
-                DPRINTF("e_phentsize:%d != %d\n", header->e_phentsize,
+                DPRINTF("e_phentsize: %u != %zu\n", header->e_phentsize,
                     sizeof(elf_segment_header_t));
                 return EE_INCOMPATIBLE;
@@ -181 +181 @@
 
         if (header->e_shentsize != sizeof(elf_section_header_t)) {
-                DPRINTF("e_shentsize:%d != %d\n", header->e_shentsize,
+                DPRINTF("e_shentsize: %u != %zu\n", header->e_shentsize,
                     sizeof(elf_section_header_t));
                 return EE_INCOMPATIBLE;
@@ -288 +288 @@
                 elf->info->dynamic =
                     (void *)((uint8_t *)entry->p_vaddr + elf->bias);
-                DPRINTF("dynamic section found at 0x%x\n",
-                        (uintptr_t)elf->info->dynamic);
+                DPRINTF("dynamic section found at %p\n",
+                        (void *)elf->info->dynamic);
                 break;
         case 0x70000000:
@@ -328 +328 @@
         seg_ptr = (void *) seg_addr;
 
-        DPRINTF("Load segment at addr %p, size 0x%x\n", (void *) seg_addr,
+        DPRINTF("Load segment at addr %p, size 0x%zx\n", (void *) seg_addr,
                 entry->p_memsz);
 
@@ -334 +334 @@
                 if ((entry->p_offset % entry->p_align) !=
                     (seg_addr % entry->p_align)) {
-                        DPRINTF("Align check 1 failed offset%%align=%d, "
-                            "vaddr%%align=%d\n",
+                        DPRINTF("Align check 1 failed offset%%align=0x%zx, "
+                            "vaddr%%align=0x%zx\n",
                             entry->p_offset % entry->p_align,
-                            seg_addr % entry->p_align
-                        );
+                            seg_addr % entry->p_align);
                         return EE_INVALID;
                 }
@@ -367 +366 @@
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         if (a == AS_MAP_FAILED) {
-                DPRINTF("memory mapping failed (0x%x, %d)\n",
-                    base + bias, mem_sz);
+                DPRINTF("memory mapping failed (%p, %zu)\n",
+                    (void *) (base + bias), mem_sz);
                 return EE_MEMORY;
         }