Changeset c98e6ee in mainline for kernel/generic/src/lib/elf.c

Timestamp:

2008-07-08T16:05:45Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

f93f168

Parents:

b7f9087

Message:

Merge program-loader related stuff from dynload branch to trunk. (huge)

File:

• kernel/generic/src/lib/elf.c (modified) (5 diffs)

kernel/generic/src/lib/elf.c

@@ -58 +58 @@
 
 static int segment_header(elf_segment_header_t *entry, elf_header_t *elf,
-    as_t *as);
+    as_t *as, int flags);
 static int section_header(elf_section_header_t *entry, elf_header_t *elf,
     as_t *as);
@@ -68 +68 @@
  * @param header Pointer to ELF header in memory
  * @param as Created and properly mapped address space
+ * @param flags A combination of ELD_F_*
  * @return EE_OK on success
  */
-unsigned int elf_load(elf_header_t *header, as_t * as)
+unsigned int elf_load(elf_header_t *header, as_t * as, int flags)
 {
         int i, rc;
@@ -111 +112 @@
                 seghdr = &((elf_segment_header_t *)(((uint8_t *) header) +
                     header->e_phoff))[i];
-                rc = segment_header(seghdr, header, as);
+                rc = segment_header(seghdr, header, as, flags);
                 if (rc != EE_OK)
                         return rc;
@@ -152 +153 @@
  */
 static int segment_header(elf_segment_header_t *entry, elf_header_t *elf,
-    as_t *as)
-{
+    as_t *as, int flags)
+{
+        char *interp;
+
         switch (entry->p_type) {
         case PT_NULL:
@@ -163 +166 @@
         case PT_DYNAMIC:
         case PT_INTERP:
+                interp = (char *)elf + entry->p_offset;
+                /* FIXME */
+                /*if (memcmp((uintptr_t)interp, (uintptr_t)ELF_INTERP_ZSTR,
+                    ELF_INTERP_ZLEN) != 0) {
+                        return EE_UNSUPPORTED;
+                }*/
+                if ((flags & ELD_F_LOADER) == 0) {
+                        return EE_LOADER;
+                }
+                break;
         case PT_SHLIB:
         case PT_NOTE: