Changeset 17341d4 in mainline for uspace/lib/c/include/elf/elf_load.h

Timestamp:

2016-04-20T17:25:48Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dc0d8b52

Parents:

13dfa3f9

Message:

Move rtld internals out of loader. Stop misusing rtld instance from current environment for loading dynamically linked executables.

File:

• uspace/lib/c/include/elf/elf_load.h (modified) (3 diffs)

uspace/lib/c/include/elf/elf_load.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Sergey Bondari
- * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2016 Jiri Svoboda
  * All rights reserved.
  *
@@ -32 +31 @@
  */
 /** @file
- * @brief ELF loader structures and public functions.
+ * @brief
  */
 
@@ -38 +37 @@
 #define ELF_LOAD_H_
 
-#include <elf/elf.h>
-#include <sys/types.h>
-#include <loader/pcb.h>
+#include <elf/elf_mod.h>
+#include <rtld/rtld.h>
 
-/**
- * ELF error return codes
- */
-#define EE_OK                   0       /* No error */
-#define EE_INVALID              1       /* Invalid ELF image */
-#define EE_MEMORY               2       /* Cannot allocate address space */
-#define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
-#define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */
-#define EE_LOADER               5       /* The image is actually a program loader. */
-#define EE_IRRECOVERABLE        6
-
-typedef enum {
-        /** Leave all segments in RW access mode. */
-        ELDF_RW = 1
-} eld_flags_t;
-
-/**
- * Some data extracted from the headers are stored here
- */
+/** Information on loaded ELF program */
 typedef struct {
-        /** Entry point */
-        entry_point_t entry;
-
-        /** ELF interpreter name or NULL if statically-linked */
-        const char *interp;
-
-        /** Pointer to the dynamic section */
-        void *dynamic;
+        elf_finfo_t finfo;
+        rtld_t *env;
 } elf_info_t;
 
-/**
- * Holds information about an ELF binary being loaded.
- */
-typedef struct {
-        /** Filedescriptor of the file from which we are loading */
-        int fd;
-
-        /** Difference between run-time addresses and link-time addresses */
-        uintptr_t bias;
-
-        /** Flags passed to the ELF loader. */
-        eld_flags_t flags;
-
-        /** A copy of the ELF file header */
-        elf_header_t *header;
-
-        /** Store extracted info here */
-        elf_info_t *info;
-} elf_ld_t;
-
-extern const char *elf_error(unsigned int);
-extern int elf_load_file(const char *, size_t, eld_flags_t, elf_info_t *);
-extern void elf_create_pcb(elf_info_t *, pcb_t *);
+extern int elf_load(const char *, elf_info_t *);
+extern void elf_set_pcb(elf_info_t *, pcb_t *);
 
 #endif