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

File:

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

uspace/srv/loader/elf_load.c

@@ -102 +102 @@
  * @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(char *file_name, size_t so_bias, elf_info_t *info)
 {
         elf_ld_t elf;
@@ -118 +117 @@
         elf.fd = fd;
         elf.info = info;
-        elf.flags = flags;
 
         rc = elf_load(&elf, so_bias);
@@ -125 +123 @@
 
         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 +151 @@
         pcb->entry = info->entry;
         pcb->dynamic = info->dynamic;
-        pcb->rtld_runtime = NULL;
 }
 
@@ -292 +303 @@
                 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);
@@ -378 +380 @@
             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;
         }
@@ -421 +422 @@
         }
 
-        /*
-         * 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 +458 @@
                 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 0x%x.\n",
+                        (uintptr_t)elf->info->dynamic);
                 break;
         default: