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

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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 mainline changes.

File:

• uspace/lib/c/include/elf/elf_load.h (moved) (moved from uspace/srv/loader/include/elf_load.h ) (3 diffs)

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

@@ -1 +1 @@
 /*
+ * Copyright (c) 2006 Sergey Bondari
  * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
@@ -37 +38 @@
 #define ELF_LOAD_H_
 
-#include <arch/elf.h>
+#include <elf/elf.h>
 #include <sys/types.h>
 #include <loader/pcb.h>
 
-#include "elf.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 {
@@ -82 +92 @@
 } elf_ld_t;
 
-int elf_load_file(const 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);
+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 *);
 
 #endif