Changeset 227 for trunk/kernel/libk/elf.c

Timestamp:

Jul 18, 2017, 12:32:31 PM (7 years ago)

Author:

max@…

Message:

use Elf64 for 64bit architectures (x86_64)

File:

• trunk/kernel/libk/elf.c (modified) (6 diffs)

trunk/kernel/libk/elf.c

@@ -38 +38 @@
 // - return false with an error message if illegal header.
 ///////////////////////////////////////////////////////////////////
-static bool_t elf_isValidHeader(Elf32_Ehdr *header)
+static bool_t elf_isValidHeader(Elf_Ehdr *header)
 {
         if((header->e_ident[EI_CLASS] == ELFCLASS32)
@@ -98 +98 @@
         }
 
-        Elf32_Ehdr * header = (Elf32_Ehdr *)buffer;
+        Elf_Ehdr * header = (Elf_Ehdr *)buffer;
 
         if( (header->e_ident[EI_MAG0] != ELFMAG0) ||
@@ -141 +141 @@
         vseg_t     * vseg;
 
-        Elf32_Phdr * seg_ptr = (Elf32_Phdr *)segs_base;
+        Elf_Phdr * seg_ptr = (Elf_Phdr *)segs_base;
 
         // loop on segments
@@ -223 +223 @@
 {
         kmem_req_t   req;              // kmem request for program header
-        Elf32_Ehdr   header;           // local buffer for .elf header
+        Elf_Ehdr     header;           // local buffer for .elf header
         void       * segs_base;        // pointer on buffer for segment descriptors array
         uint32_t     segs_size;        // size of buffer for segment descriptors array
@@ -255 +255 @@
         error = elf_header_load( file_xp ,
                                  &header,
-                                 sizeof(Elf32_Ehdr) );
+                                 sizeof(Elf_Ehdr) );
         if( error )
         {
@@ -273 +273 @@
 
         // compute buffer size for segment descriptors array
-        segs_size = sizeof(Elf32_Phdr) * header.e_phnum;
+        segs_size = sizeof(Elf_Phdr) * header.e_phnum;
 
         // allocate memory for segment descriptors array