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

Timestamp:

Nov 19, 2020, 11:47:00 PM (4 years ago)

Author:

alain

Message:

Cosmetic.

File:

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

trunk/kernel/libk/elf.c

@@ -2 +2 @@
  * elf.c - elf parser: find and map process CODE and DATA segments
  *
- * Authors   Alain Greiner    (2016,2017,2018,2019)
+ * Authors   Alain Greiner    (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -43 +43 @@
 static bool_t elf_isValidHeader(Elf_Ehdr *header)
 {
-        if((header->e_ident[EI_CLASS] == ELFCLASS)
-           && (header->e_ident[EI_DATA] == ELFDATA2LSB)
-           && (header->e_ident[EI_VERSION] == EV_CURRENT)
-           && ((header->e_machine == EM_MIPS) ||
-               (header->e_machine == EM_MIPS_RS3_LE) ||
-               (header->e_machine == EM_X86_64))
-           && (header->e_type == ET_EXEC))
+        if( (header->e_ident[EI_CLASS]   == ELFCLASS)    &&
+            (header->e_ident[EI_DATA]    == ELFDATA2LSB) &&
+            (header->e_ident[EI_VERSION] == EV_CURRENT)  && 
+        ( (header->e_machine == EM_MIPS)        ||
+              (header->e_machine == EM_MIPS_RS3_LE) ||
+              (header->e_machine == EM_X86_64) )         &&
+            (header->e_type == ET_EXEC) )
                 return true;
 
@@ -73 +73 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////
-// This function loads the .elf header in the buffer allocated by the caller.
+// This static function loads the .elf header in the buffer allocated by the caller.
 ///////////////////////////////////////////////////////////////////////////////////////
 // @ file   : extended pointer on the remote file descriptor.
@@ -171 +171 @@
         // get .elf file descriptor cluster and local pointer 
         cxy_t        file_cxy = GET_CXY( file_xp );
-        vfs_file_t * file_ptr = (vfs_file_t *)GET_PTR( file_xp );
+        vfs_file_t * file_ptr = GET_PTR( file_xp );
 
         // get local pointer on .elf file mapper
@@ -192 +192 @@
                 }
 
-        // update reference counter in file descriptor
-                vfs_file_count_up( file_xp );
-
 #if DEBUG_ELF_LOAD
 uint32_t   cycle = (uint32_t)hal_get_cycles();
@@ -200 +197 @@
 if( DEBUG_ELF_LOAD < cycle )
 printk("\n[%s] thread[%x,%x] found %s vseg / base %x / size %x\n"
-"  file_size %x / file_offset %x / mapper_xp %l / cycle %d\n",
+"  file_size %x / file_offset %x / mapper[%x,%x] / cycle %d\n",
 __FUNCTION__ , this->process->pid, this->trdid, 
 vseg_type_str(vseg->type) , vseg->min , vseg->max - vseg->min ,
-vseg->file_size , vseg->file_offset , vseg->mapper_xp, cycle );
+vseg->file_size , vseg->file_offset , 
+GET_CXY(vseg->mapper_xp), GET_PTR(vseg->mapper_xp), cycle );
 #endif
 
@@ -225 +223 @@
 
     // get file cluster and local pointer
-    cxy_t         file_cxy = GET_CXY( file_xp );
-    vfs_file_t  * file_ptr = GET_PTR( file_xp );
-
+    cxy_t        file_cxy = GET_CXY( file_xp );
+    vfs_file_t * file_ptr = GET_PTR( file_xp );
+
+    // get inode pointer
+    vfs_inode_t * inode_ptr = hal_remote_lpt( XPTR( file_cxy , &file_ptr->inode ) );
+ 
     // get file name for error reporting and debug
-    vfs_inode_t * inode    = hal_remote_lpt( XPTR( file_cxy , &file_ptr->inode ) );
-    vfs_inode_get_name( XPTR( file_cxy , inode ) , name );
+    vfs_inode_get_name( XPTR( file_cxy , inode_ptr ) , name );
     
 #if DEBUG_ELF_LOAD
@@ -252 +252 @@
 #if (DEBUG_ELF_LOAD & 1)
 if( DEBUG_ELF_LOAD < cycle )
-printk("\n[%s] loaded elf header for <%s>\n", __FUNCTION__ , name );
+printk("\n[%s] loaded elf header for <%s>\n"
+       "      - size    = %x\n"
+       "      - version = %x\n"
+       "      - entry   = %x\n"
+       "      - machine = %x\n"
+       "      - offset  = %x\n"
+       "      - segnum  = %x\n",
+       __FUNCTION__, name,
+       header.e_ehsize,
+       header.e_version,
+       header.e_entry,
+       header.e_machine,
+       header.e_phoff,
+       header.e_phnum );
 #endif