Changes in kernel/generic/src/lib/elf.c [bdca26a:d91488d] in mainline

File:

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

kernel/generic/src/lib/elf.c

@@ -50 +50 @@
 #include <lib/elf_load.h>
 
-static errno_t load_segment(elf_segment_header_t *, elf_header_t *, as_t *);
+static const char *error_codes[] = {
+        "no error",
+        "invalid image",
+        "address space error",
+        "incompatible image",
+        "unsupported image type",
+        "irrecoverable error"
+};
+
+static int load_segment(elf_segment_header_t *, elf_header_t *, as_t *);
 
 /** ELF loader
@@ -58 +67 @@
  * @param flags  A combination of ELD_F_*
  *
- * @return EOK on success
+ * @return EE_OK on success
  *
  */
-errno_t elf_load(elf_header_t *header, as_t *as)
+unsigned int elf_load(elf_header_t *header, as_t *as)
 {
         /* Identify ELF */
@@ -68 +77 @@
             (header->e_ident[EI_MAG2] != ELFMAG2) ||
             (header->e_ident[EI_MAG3] != ELFMAG3))
-                return EINVAL;
+                return EE_INVALID;
 
         /* Identify ELF compatibility */
@@ -76 +85 @@
             (header->e_version != EV_CURRENT) ||
             (header->e_ident[EI_CLASS] != ELF_CLASS))
-                return EINVAL;
+                return EE_INCOMPATIBLE;
 
         if (header->e_phentsize != sizeof(elf_segment_header_t))
-                return EINVAL;
+                return EE_INCOMPATIBLE;
 
         /* Check if the object type is supported. */
         if (header->e_type != ET_EXEC)
-                return ENOTSUP;
+                return EE_UNSUPPORTED;
 
         /* Check if the ELF image starts on a page boundary */
         if (ALIGN_UP((uintptr_t) header, PAGE_SIZE) != (uintptr_t) header)
-                return ENOTSUP;
+                return EE_UNSUPPORTED;
 
         /* Walk through all segment headers and process them. */
@@ -99 +108 @@
                         continue;
 
-                errno_t rc = load_segment(seghdr, header, as);
-                if (rc != EOK)
+                int rc = load_segment(seghdr, header, as);
+                if (rc != EE_OK)
                         return rc;
         }
 
-        return EOK;
+        return EE_OK;
+}
+
+/** Print error message according to error code.
+ *
+ * @param rc Return code returned by elf_load().
+ *
+ * @return NULL terminated description of error.
+ *
+ */
+const char *elf_error(unsigned int rc)
+{
+        assert(rc < sizeof(error_codes) / sizeof(char *));
+
+        return error_codes[rc];
 }
 
@@ -113 +136 @@
  * @param as    Address space into wich the ELF is being loaded.
  *
- * @return EOK on success, error code otherwise.
+ * @return EE_OK on success, error code otherwise.
  *
  */
-errno_t load_segment(elf_segment_header_t *entry, elf_header_t *elf, as_t *as)
+int load_segment(elf_segment_header_t *entry, elf_header_t *elf, as_t *as)
 {
         mem_backend_data_t backend_data;
@@ -123 +146 @@
                 if ((entry->p_offset % entry->p_align) !=
                     (entry->p_vaddr % entry->p_align))
-                        return EINVAL;
+                        return EE_INVALID;
         }
 
@@ -154 +177 @@
             AS_AREA_ATTR_NONE, &elf_backend, &backend_data, &base, 0);
         if (!area)
-                return ENOMEM;
+                return EE_MEMORY;
 
         /*
@@ -161 +184 @@
          */
 
-        return EOK;
+        return EE_OK;
 }