Changeset 1ea99cc in mainline for uspace/srv/loader

Timestamp:

2009-08-20T20:47:35Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b50b5af2

Parents:

24edc18

Message:

Merge changes from original Subversion dynload branch.

Location:

uspace/srv/loader

Files:

• elf_load.c (modified) (8 diffs)
• include/elf_load.h (modified) (3 diffs)
• main.c (modified) (5 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, elf_info_t *info)
+int elf_load_file(char *file_name, size_t so_bias, eld_flags_t flags,
+    elf_info_t *info)
 {
         elf_ld_t elf;
@@ -117 +118 @@
         elf.fd = fd;
         elf.info = info;
+        elf.flags = flags;
 
         rc = elf_load(&elf, so_bias);
@@ -123 +125 @@
 
         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 */
 }
 
@@ -151 +139 @@
         pcb->entry = info->entry;
         pcb->dynamic = info->dynamic;
+        pcb->rtld_runtime = NULL;
 }
 
@@ -303 +292 @@
                 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);
@@ -380 +378 @@
             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;
         }
@@ -422 +421 @@
         }
 
+        /*
+         * 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) {
@@ -458 +464 @@
                 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:

uspace/srv/loader/include/elf_load.h

@@ -43 +43 @@
 #include "elf.h"
 
+typedef enum {
+        /** Leave all segments in RW access mode. */
+        ELDF_RW = 1
+} eld_flags_t;
+
 /**
  * Some data extracted from the headers are stored here
@@ -67 +72 @@
         uintptr_t bias;
 
+        /** Flags passed to the ELF loader. */
+        eld_flags_t flags;
+
         /** A copy of the ELF file header */
         elf_header_t *header;
@@ -74 +82 @@
 } elf_ld_t;
 
-int elf_load_file(char *file_name, size_t so_bias, elf_info_t *info);
-void elf_run(elf_info_t *info, pcb_t *pcb);
+int elf_load_file(char *file_name, size_t so_bias, eld_flags_t flags,
+    elf_info_t *info);
 void elf_create_pcb(elf_info_t *info, pcb_t *pcb);
 

uspace/srv/loader/main.c

@@ -66 +66 @@
 #define DPRINTF(...)
 
+void program_run(void *entry, pcb_t *pcb);
+
 /** Pathname of the file that will be loaded */
 static char *pathname = NULL;
@@ -304 +306 @@
         int rc;
         
-        rc = elf_load_file(pathname, 0, &prog_info);
+        rc = elf_load_file(pathname, 0, 0, &prog_info);
         if (rc != EE_OK) {
                 DPRINTF("Failed to load executable '%s'.\n", pathname);
@@ -326 +328 @@
         }
         
-        rc = elf_load_file(prog_info.interp, 0, &interp_info);
+        printf("Load ELF interpreter '%s'\n", prog_info.interp);
+        rc = elf_load_file(prog_info.interp, 0, 0, &interp_info);
         if (rc != EE_OK) {
                 DPRINTF("Failed to load interpreter '%s.'\n",
@@ -334 +337 @@
         }
         
+        printf("Run interpreter.\n");
+        printf("entry point: 0x%lx\n", interp_info.entry);
+        printf("pcb address: 0x%lx\n", &pcb);
+        printf("prog dynamic: 0x%lx\n", prog_info.dynamic);
+
         is_dyn_linked = true;
         ipc_answer_0(rid, EOK);
@@ -362 +370 @@
                 
                 ipc_answer_0(rid, EOK);
-                elf_run(&interp_info, &pcb);
+                program_run(interp_info.entry, &pcb);
         } else {
                 /* Statically linked program */
                 ipc_answer_0(rid, EOK);
-                elf_run(&prog_info, &pcb);
+                program_run(prog_info.entry, &pcb);
         }