Changeset 270 for trunk/kernel/libk

Timestamp:

Jul 21, 2017, 3:56:36 PM (7 years ago)

Author:

max@…

Message:

Comment out EI_OSABI, and use ELFCLASS.

Location:

trunk/kernel/libk

Files:

• elf.c (modified) (3 diffs)
• elf.h (modified) (3 diffs)

trunk/kernel/libk/elf.c

@@ -40 +40 @@
 static bool_t elf_isValidHeader(Elf_Ehdr *header)
 {
-        if((header->e_ident[EI_CLASS] == ELFCLASS32)
+        if((header->e_ident[EI_CLASS] == ELFCLASS)
            && (header->e_ident[EI_DATA] == ELFDATA2LSB)
            && (header->e_ident[EI_VERSION] == EV_CURRENT)
+/*
            && (header->e_ident[EI_OSABI] == ELFOSABI_NONE)
+*/
            && ((header->e_machine == EM_MIPS) ||
                (header->e_machine == EM_MIPS_RS3_LE) ||
@@ -50 +52 @@
                 return true;
 
-        if( header->e_ident[EI_CLASS] != ELFCLASS32 )
-                printk("\n[ERROR] in %s : Elf is not 32-Binary\n", __FUNCTION__ );
+        if( header->e_ident[EI_CLASS] != ELFCLASS )
+                printk("\n[ERROR] in %s : Elf is not 32/64-Binary\n", __FUNCTION__ );
 
         if( header->e_ident[EI_DATA] != ELFDATA2LSB )
@@ -58 +60 @@
         if( header->e_ident[EI_VERSION] != EV_CURRENT )
                 printk("\n[ERROR] in %s : Elf is not in Current Version\n", __FUNCTION__);
-
+/*
         if( header->e_ident[EI_OSABI] != ELFOSABI_NONE )
                 printk("\n[ERROR] in %s : Unexpected Elf ABI, need UNIX System V ABI\n", __FUNCTION__ );
-
-        if( (header->e_machine == EM_MIPS) ||
-            (header->e_machine == EM_MIPS_RS3_LE) ||
-            (header->e_machine == EM_X86_64) )
+*/
+        if( (header->e_machine != EM_MIPS) &&
+            (header->e_machine != EM_MIPS_RS3_LE) &&
+            (header->e_machine != EM_X86_64) )
                 printk("\n[ERROR] in %s : unexpected core / accept only MIPS or x86_64\n", __FUNCTION__ );
 
-        if( header->e_type == ET_EXEC )
+        if( header->e_type != ET_EXEC )
                 printk("\n[ERROR] in %s : Elf is not executable binary\n", __FUNCTION__ );
 

trunk/kernel/libk/elf.h

@@ -104 +104 @@
 #define ELFCLASSNONE    0               /* Invalid class */
 #define ELFCLASS32      1               /* 32-bit objects */
+#define ELFCLASS64      2       /* 64-bit objects */
+
 #define ELFCLASSNUM     3
 
@@ -209 +211 @@
 #define Elf_Ehdr  Elf32_Ehdr
 #define Elf_Phdr  Elf32_Phdr
+#define ELFCLASS  ELFCLASS32
 #elif defined (HAL_64BIT)
 #define Elf_Half  Elf64_Half
@@ -217 +220 @@
 #define Elf_Ehdr  Elf64_Ehdr
 #define Elf_Phdr  Elf64_Phdr
+#define ELFCLASS  ELFCLASS64
 #else
 #error "Must define HAL_64BIT/HAL_32BIT"