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

Timestamp:

Nov 7, 2017, 3:08:12 PM (7 years ago)

Author:

alain

Message:

First implementation of fork/exec.

File:

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

trunk/kernel/libk/elf.c

@@ -175 +175 @@
                 }
 
+        // 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 );
+
+        // get local pointer on .elf file mapper
+        mapper_t * mapper_ptr = (mapper_t *)hal_remote_lpt( XPTR( file_cxy , 
+                                                                  &file_ptr->mapper ) );
                 // register vseg in VMM
                 vseg = (vseg_t *)vmm_create_vseg( process,
+                                          type,
                                                   vbase,
                                                   mem_size,
-                                                  type );
+                                          file_offset,
+                                          file_size,
+                                          XPTR( file_cxy , mapper_ptr ),
+                                                  local_cxy );  
                 if( vseg == NULL )
                 {
@@ -187 +198 @@
                 }
 
-        // 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 );
-
-        // get local pointer on .elf file mapper
-        mapper_t * mapper_ptr = (mapper_t *)hal_remote_lpt( XPTR( file_cxy , 
-                                                                  &file_ptr->mapper ) );
-
-        // initialize "file_mapper", "file_offset", "file_size" fields in vseg 
-        vseg->mapper_xp   = XPTR( file_cxy , mapper_ptr );
-        vseg->file_offset = file_offset;
-        vseg->file_size   = file_size;
-
         // update reference counter in file descriptor
                 vfs_file_count_up( file_xp );
 
-                elf_dmsg("\n[DMSG] %s : found %s vseg / base = %x / size = %x\n"
+                elf_dmsg("\n[DBG] %s : found %s vseg / base = %x / size = %x\n"
                  "       file_size = %x / file_offset = %x / mapper_xp = %l\n",
             __FUNCTION__ , vseg_type_str(vseg->type) , vseg->min , vseg->max - vseg->min ,
@@ -225 +223 @@
         error_t      error;
 
-    elf_dmsg("\n[DMSG] %s : core[%x,%d] enter for <%s>\n",
+    elf_dmsg("\n[DBG] %s : core[%x,%d] enter for <%s>\n",
     __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , pathname );
 
@@ -233 +231 @@
 
         // open file
-        error = vfs_open( process->vfs_cwd_xp,
+        error = vfs_open( process,
                           pathname,
                           O_RDONLY,
@@ -245 +243 @@
         }
 
-    elf_dmsg("\n[DMSG] %s : open file <%s>\n", __FUNCTION__ , pathname );
+    elf_dmsg("\n[DBG] %s : open file <%s>\n", __FUNCTION__ , pathname );
 
         // load header in local buffer
@@ -258 +256 @@
         }
 
-        elf_dmsg("\n[DMSG] %s : loaded elf header for %s\n", __FUNCTION__ , pathname );
+        elf_dmsg("\n[DBG] %s : loaded elf header for %s\n", __FUNCTION__ , pathname );
 
         if( header.e_phnum == 0 )
@@ -295 +293 @@
         }
 
-        elf_dmsg("\n[DMSG] %s : segments array allocated for %s\n", __FUNCTION__ , pathname );
+        elf_dmsg("\n[DBG] %s : segments array allocated for %s\n", __FUNCTION__ , pathname );
 
         // load seg descriptors array to local buffer
@@ -312 +310 @@
         }
 
-        elf_dmsg("\n[DMSG] %s loaded segments descriptors for %s \n", __FUNCTION__ , pathname );
+        elf_dmsg("\n[DBG] %s loaded segments descriptors for %s \n", __FUNCTION__ , pathname );
 
         // register loadable segments in process VMM
@@ -337 +335 @@
         kmem_free(&req);
 
-    elf_dmsg("\n[DMSG] %s : core[%x,%d] exit for <%s> / entry_point = %x\n",
+    elf_dmsg("\n[DBG] %s : core[%x,%d] exit for <%s> / entry_point = %x\n",
     __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , pathname , header.e_entry );