Changeset 406 for trunk/kernel/libk

Timestamp:

Aug 29, 2017, 12:03:37 PM (7 years ago)

Author:

alain

Message:

This version executed successfully the user "init" process on a mono-processor TSAR architecture.

Location:

trunk/kernel/libk

Files:

• elf.c (modified) (11 diffs)
• grdxt.c (modified) (2 diffs)
• grdxt.h (modified) (3 diffs)

trunk/kernel/libk/elf.c

@@ -24 +24 @@
 #include <kernel_config.h>
 #include <hal_types.h>
+#include <hal_special.h>
 #include <hal_uspace.h>
 #include <printk.h>
 #include <process.h>
+#include <thread.h>
+#include <mapper.h>
 #include <vseg.h>
 #include <kmem.h>
@@ -165 +168 @@
                         type                       = VSEG_TYPE_CODE;
                         process->vmm.code_vpn_base = vbase >> CONFIG_PPM_PAGE_SHIFT;
-
-                        elf_dmsg("\n[INFO] %s : found CODE vseg / base = %x / size = %x\n",
-                                 __FUNCTION__ , vbase , mem_size );
                 }
                 else               // found DATA segment
@@ -173 +173 @@
                         type                       = VSEG_TYPE_DATA;
                         process->vmm.data_vpn_base = vbase >> CONFIG_PPM_PAGE_SHIFT;
-
-                        elf_dmsg("\n[INFO] %s : found DATA vseg / base = %x / size = %x\n",
-                                 __FUNCTION__, vbase , mem_size );
                 }
 
@@ -194 +191 @@
         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_t)hal_remote_lwd( XPTR( file_cxy , &file_ptr->mapper ) );
+        vseg->mapper_xp   = XPTR( file_cxy , mapper_ptr );
         vseg->file_offset = file_offset;
         vseg->file_size   = file_size;
@@ -201 +202 @@
         // 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"
+                 "       file_size = %x / file_offset = %x / mapper_xp = %l\n",
+            __FUNCTION__ , vseg_type_str(vseg->type) , vseg->min , vseg->max - vseg->min ,
+        vseg->file_size , vseg->file_offset , vseg->mapper_xp );
         }
 
@@ -219 +225 @@
         error_t      error;
 
-    elf_dmsg("\n[INFO] %s : core[%x,%d] enter for <%s>\n",
+    elf_dmsg("\n[DMSG] %s : core[%x,%d] enter for <%s>\n",
     __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , pathname );
 
@@ -239 +245 @@
         }
 
-    elf_dmsg("\n[INFO] %s : open file <%s>\n", __FUNCTION__ , pathname );
+    elf_dmsg("\n[DMSG] %s : open file <%s>\n", __FUNCTION__ , pathname );
 
         // load header in local buffer
@@ -252 +258 @@
         }
 
-        elf_dmsg("\n[INFO] %s : loaded elf header for %s\n", __FUNCTION__ , pathname );
+        elf_dmsg("\n[DMSG] %s : loaded elf header for %s\n", __FUNCTION__ , pathname );
 
         if( header.e_phnum == 0 )
@@ -289 +295 @@
         }
 
-        elf_dmsg("\n[INFO] %s : segments array allocated for %s\n", __FUNCTION__ , pathname );
+        elf_dmsg("\n[DMSG] %s : segments array allocated for %s\n", __FUNCTION__ , pathname );
 
         // load seg descriptors array to local buffer
@@ -306 +312 @@
         }
 
-        elf_dmsg("\n[INFO] %s loaded segments descriptors for %s \n", __FUNCTION__ , pathname );
+        elf_dmsg("\n[DMSG] %s loaded segments descriptors for %s \n", __FUNCTION__ , pathname );
 
         // register loadable segments in process VMM
@@ -331 +337 @@
         kmem_free(&req);
 
-    elf_dmsg("\n[INFO] %s : core[%x,%d] exit for <%s> / entry_point = %x\n",
+    elf_dmsg("\n[DMSG] %s : core[%x,%d] exit for <%s> / entry_point = %x\n",
     __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , pathname , header.e_entry );
 

trunk/kernel/libk/grdxt.c

@@ -26 +26 @@
 #include <errno.h>
 #include <printk.h>
+#include <vseg.h>
 #include <kmem.h>
 #include <grdxt.h>
@@ -125 +126 @@
     intptr_t        value;
 
-        printk("*** %s : n1 = %d / n2 = %d / n3 = %d\n", 
+        printk("\n***** Generic Radix tree %s : n1 = %d / n2 = %d / n3 = %d\n\n", 
            name, 1<<w1 , 1<<w2 , 1<<w3 );
 

trunk/kernel/libk/grdxt.h

@@ -36 +36 @@
  * Memory for the second and third levels arrays is dynamically allocated by the
  * grdxt_insert() function and is only released by grdxt_destroy().
- * - It used to by the VMM to retrieve a vseg descriptor: key is the virtual address.
- * - It is used by the mapper to implement the file cache: key is the page index in file.
+ * It is used by the MAPPER to implement the file cache: key is the page index in file.
  ******************************************************************************************/
 
@@ -48 +47 @@
 }
 grdxt_t;
-
 
 /*******************************************************************************************
@@ -122 +120 @@
 
 /*******************************************************************************************
- * This function displays the content of the radix_tree.
+ * This function displays the current content of a radix_tree.
  *******************************************************************************************
  * @ rt      : pointer on the radix-tree descriptor.
- * @ name    : string identifying the radix-tree.
+ * @ string  : radix tree identifier. 
  ******************************************************************************************/
 void grdxt_print( grdxt_t * rt,
-                  char    * name );
+                  char    * string );