Changeset 04803bf in mainline for uspace/srv/loader/elf_load.c

Timestamp:

2011-03-21T22:00:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

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

uspace/srv/loader/elf_load.c

@@ -60 +60 @@
 #define DPRINTF(...)
 
-static char *error_codes[] = {
+static const char *error_codes[] = {
         "no error",
         "invalid image",
@@ -95 +95 @@
  * pointed to by @a info.
  *
- * @param file_name     Path to the ELF file.
- * @param so_bias       Bias to use if the file is a shared object.
- * @param info          Pointer to a structure for storing information
- *                      extracted from the binary.
+ * @param file_name Path to the ELF file.
+ * @param so_bias   Bias to use if the file is a shared object.
+ * @param info      Pointer to a structure for storing information
+ *                  extracted from the binary.
  *
  * @return EOK on success or negative error code.
- */
-int elf_load_file(char *file_name, size_t so_bias, eld_flags_t flags,
+ *
+ */
+int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags,
     elf_info_t *info)
 {
@@ -109 +110 @@
         int fd;
         int rc;
-
+        
         fd = open(file_name, O_RDONLY);
         if (fd < 0) {
@@ -269 +270 @@
  * @return NULL terminated description of error.
  */
-char *elf_error(unsigned int rc)
+const char *elf_error(unsigned int rc)
 {
         assert(rc < sizeof(error_codes) / sizeof(char *));
@@ -287 +288 @@
         case PT_NULL:
         case PT_PHDR:
+        case PT_NOTE:
                 break;
         case PT_LOAD:
@@ -306 +308 @@
                 break;
         case PT_SHLIB:
-        case PT_NOTE:
 //      case PT_LOPROC:
 //      case PT_HIPROC:
@@ -340 +341 @@
         seg_ptr = (void *) seg_addr;
 
-        DPRINTF("Load segment at addr 0x%x, size 0x%x\n", seg_addr,
-                entry->p_memsz);        
+        DPRINTF("Load segment at addr %p, size 0x%x\n", (void *) seg_addr,
+                entry->p_memsz);
 
         if (entry->p_align > 1) {
@@ -368 +369 @@
         mem_sz = entry->p_memsz + (entry->p_vaddr - base);
 
-        DPRINTF("Map to seg_addr=0x%x-0x%x.\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)));
 
         /*
@@ -383 +385 @@
         }
 
-        DPRINTF("as_area_create(0x%lx, 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 +466 @@
                 break;
         case SHT_DYNAMIC:
+                /* Record pointer to dynamic section into info structure */
+                elf->info->dynamic =
+                    (void *)((uint8_t *)entry->sh_addr + elf->bias);
+                DPRINTF("Dynamic section found at %p.\n",
+                    (void *) elf->info->dynamic);
                 break;
         default: