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

Timestamp:

Aug 3, 2017, 10:15:18 AM (7 years ago)

Author:

alain

Message:

Redefine the fuctions ppm_base2page() / ppm_page2base() / ppm_page2ppn() / ppm_ppn2page() / ppm_base2ppn() / ppm_ppn2base(),
to use explicitely extended pointers.

File:

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

trunk/kernel/libk/elf.c

@@ -89 +89 @@
 
         // load .elf header
-        count = vfs_move( true,     // to_buffer
-                      false,    // is_user
-                          file_xp,
-                          buffer,
-                          size );
+        count = vfs_user_move( true,     // to_buffer
+                               file_xp,
+                               buffer,
+                               size );
 
         if( count != size )
@@ -135 +134 @@
                                       process_t  * process )
 {
-        error_t      error;
         uint32_t     index;
         intptr_t     file_size;
@@ -163 +161 @@
                 {
                         type                       = VSEG_TYPE_CODE;
-                        process->vmm.code_vpn_base = start >> CONFIG_PPM_PAGE_SHIFT;
+                        process->vmm.code_vpn_base = vbase >> CONFIG_PPM_PAGE_SHIFT;
 
                         elf_dmsg("\n[INFO] %s : found CODE vseg / base = %x / size = %x\n",
-                                 __FUNCTION__ , start , mem_size );
+                                 __FUNCTION__ , vbase , mem_size );
                 }
                 else               // found DATA segment
                 {
                         type                       = VSEG_TYPE_DATA;
-                        process->vmm.data_vpn_base = start >> CONFIG_PPM_PAGE_SHIFT;
+                        process->vmm.data_vpn_base = vbase >> CONFIG_PPM_PAGE_SHIFT;
 
                         elf_dmsg("\n[INFO] %s : found DATA vseg / base = %x / size = %x\n",
-                                 __FUNCTION__, start , mem_size );
+                                 __FUNCTION__, vbase , mem_size );
                 }
 
@@ -194 +192 @@
 
         // initialize "file_mapper", "file_offset", "file_size" fields in vseg 
-        vseg->file_mapper = hal_remote_lwd( XPTR( file_cxy , &file_ptr->mapper );
+        vseg->mapper_xp   = (xptr_t)hal_remote_lwd( XPTR( file_cxy , &file_ptr->mapper ) );
         vseg->file_offset = file_offset;
         vseg->file_size   = file_size;
@@ -289 +287 @@
 
         // load seg descriptors array to local buffer
-        count = vfs_move( true,       // to_buffer
-                      false,      // is_user
-                          file_xp,
-                          segs_base,
-                          segs_size );
+        count = vfs_user_move( true,       // to_buffer
+                               file_xp,
+                               segs_base,
+                               segs_size );
 
         if( count != segs_size )