Changeset 313 for trunk/kernel/libk

Timestamp:

Aug 2, 2017, 3:24:57 PM (7 years ago)

Author:

alain

Message:

RSeveral modifs in the page-fault handling.

File:

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

trunk/kernel/libk/elf.c

@@ -130 +130 @@
 // @ process   : local pointer on process descriptor.
 ///////////////////////////////////////////////////////////////////////////////////////
-static error_t elf_segments_load( xptr_t       file_xp,
-                                  void       * segs_base,
-                                  uint32_t     nb_segs,
-                                  process_t  * process )
+static error_t elf_segments_register( xptr_t       file_xp,
+                                      void       * segs_base,
+                                      uint32_t     nb_segs,
+                                      process_t  * process )
 {
         error_t      error;
         uint32_t     index;
-        uint32_t     file_size;
-        uint32_t     mem_size;
-        intptr_t     start;
+        intptr_t     file_size;
+        intptr_t     mem_size;
+        intptr_t     file_offset;
+        intptr_t     vbase;
         uint32_t     type;
         uint32_t     flags;
-        uint32_t     offset;
         vseg_t     * vseg;
 
@@ -154 +154 @@
 
                 // get segment attributes
-                start     = seg_ptr->p_vaddr;
-                offset    = seg_ptr->p_offset;
-                file_size = seg_ptr->p_filesz;
-                mem_size  = seg_ptr->p_memsz;
-                flags     = seg_ptr->p_flags;
-
-                // check alignment
-                if( start & CONFIG_PPM_PAGE_MASK )
-                {
-                        printk("\n[WARNING] in %s : segment base not aligned = %x\n",
-                               __FUNCTION__, start );
-                }
-
-                // check size
-                if( file_size != mem_size )
-                {
-                        printk("\n[WARNING] in %s : base = %x / mem_size = %x / file_size = %x\n",
-                               __FUNCTION__, start , mem_size , file_size);
-                }
-
-                // set seek on segment base in file
-                error = vfs_lseek( file_xp,
-                                   offset,
-                                   SEEK_SET,
-                                   NULL );
-
-                if( error )
-                {
-                        printk("\n[ERROR] in %s : failed to seek\n", __FUNCTION__ );
-                        return -1;
-                }
+                vbase       = seg_ptr->p_vaddr;     // vseg base vaddr
+                mem_size    = seg_ptr->p_memsz;     // actual vseg size
+                file_offset = seg_ptr->p_offset;    // vseg offset in .elf file
+                file_size   = seg_ptr->p_filesz;    // vseg size in .elf file
+                flags       = seg_ptr->p_flags;
 
                 if( flags & PF_X ) // found CODE segment
@@ -205 +179 @@
                 // register vseg in VMM
                 vseg = (vseg_t *)vmm_create_vseg( process,
-                                                  start,
+                                                  vbase,
                                                   mem_size,
                                                   type );
@@ -211 +185 @@
                 {
                         printk("\n[ERROR] in %s : cannot map segment / base = %x / size = %x\n",
-                               __FUNCTION__ , start , mem_size );
+                               __FUNCTION__ , vbase , mem_size );
                         return -1;
                 }
 
+        // 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 );
+
+        // initialize "file_mapper", "file_offset", "file_size" fields in vseg 
+        vseg->file_mapper = hal_remote_lwd( XPTR( file_cxy , &file_ptr->mapper );
+        vseg->file_offset = file_offset;
+        vseg->file_size   = file_size;
+
+        // update reference counter in file descriptor
                 vfs_file_count_up( file_xp );
         }
@@ -220 +204 @@
         return 0;
 
-} // end elf_segments_load()
+} // end elf_segments_register()
 
 ///////////////////////////////////////////////
@@ -323 +307 @@
 
         // register loadable segments in process VMM
-        error = elf_segments_load( file_xp,
-                                   segs_base,
-                                   header.e_phnum,
-                                   process );
+        error = elf_segments_register( file_xp,
+                                       segs_base,
+                                       header.e_phnum,
+                                       process );
         if( error )
         {