Changeset a33f0a6 in mainline for uspace/lib/c/generic/elf/elf_load.c

Timestamp:

2011-08-03T17:34:57Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

File:

• uspace/lib/c/generic/elf/elf_load.c (moved) (moved from uspace/srv/loader/elf_load.c ) (16 diffs)

uspace/lib/c/generic/elf/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.
  *
@@ -29 +29 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -49 +49 @@
 #include <assert.h>
 #include <as.h>
+#include <elf/elf.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <smc.h>
 #include <loader/pcb.h>
-
-#include "elf.h"
-#include "elf_load.h"
-#include "arch.h"
+#include <entry_point.h>
+
+#include <elf/elf_load.h>
 
 #define DPRINTF(...)
@@ -74 +74 @@
 static int load_segment(elf_ld_t *elf, elf_segment_header_t *entry);
 
-/** Read until the buffer is read in its entirety. */
-static int my_read(int fd, void *buf, size_t len)
-{
-        int cnt = 0;
-        do {
-                buf += cnt;
-                len -= cnt;
-                cnt = read(fd, buf, len);
-        } while ((cnt > 0) && ((len - cnt) > 0));
-
-        return cnt;
-}
-
 /** Load ELF binary from a file.
  *
@@ -103 +90 @@
  *
  */
-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;
@@ -118 +106 @@
         elf.fd = fd;
         elf.info = info;
+        elf.flags = flags;
 
         rc = elf_load(&elf, so_bias);
@@ -124 +113 @@
 
         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 +127 @@
         pcb->entry = info->entry;
         pcb->dynamic = info->dynamic;
+        pcb->rtld_runtime = NULL;
 }
 
@@ -172 +147 @@
         int i, rc;
 
-        rc = my_read(elf->fd, header, sizeof(elf_header_t));
-        if (rc < 0) {
+        rc = read_all(elf->fd, header, sizeof(elf_header_t));
+        if (rc != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
                 return EE_INVALID;
@@ -234 +209 @@
                         + i * sizeof(elf_segment_header_t), SEEK_SET);
 
-                rc = my_read(elf->fd, &segment_hdr,
+                rc = read_all(elf->fd, &segment_hdr,
                     sizeof(elf_segment_header_t));
-                if (rc < 0) {
+                if (rc != sizeof(elf_segment_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -256 +231 @@
                     + i * sizeof(elf_section_header_t), SEEK_SET);
 
-                rc = my_read(elf->fd, &section_hdr,
+                rc = read_all(elf->fd, &section_hdr,
                     sizeof(elf_section_header_t));
-                if (rc < 0) {
+                if (rc != sizeof(elf_section_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -306 +281 @@
                 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_LOPROC:
-        case PT_HIPROC:
+//      case PT_LOPROC:
+//      case PT_HIPROC:
         default:
                 DPRINTF("Segment p_type %d unknown.\n", entry->p_type);
@@ -337 +321 @@
         uintptr_t seg_addr;
         size_t mem_sz;
-        int rc;
+        ssize_t rc;
 
         bias = elf->bias;
@@ -383 +367 @@
             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;
         }
@@ -414 +399 @@
                 if (now > left) now = left;
 
-                rc = my_read(elf->fd, dp, now);
-
-                if (rc < 0) { 
+                rc = read_all(elf->fd, dp, now);
+
+                if (rc != (ssize_t) now) { 
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -425 +410 @@
         }
 
+        /*
+         * 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) {