Changes in uspace/srv/loader/elf_load.c [1ea99cc:d88218b] in mainline

File:

• uspace/srv/loader/elf_load.c (modified) (14 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,
-    elf_info_t *info)
+ *
+ */
+int elf_load_file(const char *file_name, size_t so_bias, elf_info_t *info)
 {
         elf_ld_t elf;
@@ -109 +109 @@
         int fd;
         int rc;
-
+        
         fd = open(file_name, O_RDONLY);
         if (fd < 0) {
@@ -118 +118 @@
         elf.fd = fd;
         elf.info = info;
-        elf.flags = flags;
 
         rc = elf_load(&elf, so_bias);
@@ -125 +124 @@
 
         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 */
 }
 
@@ -139 +153 @@
         pcb->entry = info->entry;
         pcb->dynamic = info->dynamic;
-        pcb->rtld_runtime = NULL;
 }
 
@@ -269 +282 @@
  * @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 +300 @@
         case PT_NULL:
         case PT_PHDR:
+        case PT_NOTE:
                 break;
         case PT_LOAD:
@@ -292 +306 @@
                 break;
         case PT_INTERP:
-                /* Assume silently interp == "/app/dload" */
-                elf->info->interp = "/app/dload";
+                /* Assume silently interp == "/rtld.so" */
+                elf->info->interp = "/rtld.so";
                 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);
@@ -340 +344 @@
         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 +372 @@
         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)));
 
         /*
@@ -378 +383 @@
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         if (a == (void *)(-1)) {
-                DPRINTF("memory mapping failed (0x%x, %d)\n",
-                        base+bias, mem_sz);
+                DPRINTF("Memory mapping failed.\n");
                 return EE_MEMORY;
         }
 
-        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);
 
         /*
@@ -421 +425 @@
         }
 
-        /*
-         * 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 +461 @@
                 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: