Changeset eb522e8 in mainline for uspace/srv/loader/elf_load.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

uspace/srv/loader/elf_load.c

@@ -2 +2 @@
  * Copyright (c) 2006 Sergey Bondari
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -53 +53 @@
 #include <smc.h>
 #include <loader/pcb.h>
+#include <entry_point.h>
 
 #include "elf.h"
 #include "elf_load.h"
-#include "arch.h"
 
 #define DPRINTF(...)
@@ -103 +103 @@
  *
  */
-int elf_load_file(const char *file_name, size_t so_bias, elf_info_t *info)
+int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags,
+    elf_info_t *info)
 {
         elf_ld_t elf;
@@ -109 +110 @@
         int fd;
         int rc;
-
+        
         fd = open(file_name, O_RDONLY);
         if (fd < 0) {
@@ -118 +119 @@
         elf.fd = fd;
         elf.info = info;
+        elf.flags = flags;
 
         rc = elf_load(&elf, so_bias);
@@ -124 +126 @@
 
         return rc;
-}
-
-/** Run an ELF executable.
- *
- * Transfers control to the entry point of an ELF executable loaded
- * earlier with elf_load_file(). This function does not return.
- *
- * @param info Info structure filled earlier by elf_load_file()
- *
- */
-void elf_run(elf_info_t *info, pcb_t *pcb)
-{
-        program_run(info->entry, pcb);
-
-        /* not reached */
 }
 
@@ -153 +140 @@
         pcb->entry = info->entry;
         pcb->dynamic = info->dynamic;
+        pcb->rtld_runtime = NULL;
 }
 
@@ -300 +288 @@
         case PT_NULL:
         case PT_PHDR:
+        case PT_NOTE:
                 break;
         case PT_LOAD:
@@ -305 +294 @@
                 break;
         case PT_INTERP:
-                /* Assume silently interp == "/rtld.so" */
-                elf->info->interp = "/rtld.so";
+                /* Assume silently interp == "/app/dload" */
+                elf->info->interp = "/app/dload";
                 break;
         case PT_DYNAMIC:
+                /* Record pointer to dynamic section into info structure */
+                elf->info->dynamic =
+                    (void *)((uint8_t *)entry->p_vaddr + elf->bias);
+                DPRINTF("dynamic section found at 0x%x\n",
+                        (uintptr_t)elf->info->dynamic);
+                break;
+        case 0x70000000:
+                /* FIXME: MIPS reginfo */
+                break;
         case PT_SHLIB:
-        case PT_NOTE:
-        case PT_LOPROC:
-        case PT_HIPROC:
+//      case PT_LOPROC:
+//      case PT_HIPROC:
         default:
                 DPRINTF("Segment p_type %d unknown.\n", entry->p_type);
@@ -344 +341 @@
         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 +369 @@
         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)));
 
         /*
@@ -382 +380 @@
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         if (a == (void *)(-1)) {
-                DPRINTF("Memory mapping failed.\n");
+                DPRINTF("memory mapping failed (0x%x, %d)\n",
+                        base+bias, mem_sz);
                 return EE_MEMORY;
         }
 
-        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);
 
         /*
@@ -424 +423 @@
         }
 
+        /*
+         * The caller wants to modify the segments first. He will then
+         * need to set the right access mode and ensure SMC coherence.
+         */
+        if ((elf->flags & ELDF_RW) != 0) return EE_OK;
+
+//      printf("set area flags to %d\n", flags);
         rc = as_area_change_flags(seg_ptr, flags);
         if (rc != 0) {
@@ -464 +470 @@
                     (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: