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

Timestamp:

Jan 13, 2021, 12:36:17 AM (4 years ago)

Author:

alain

Message:

All modifications required to support the <tcp_chat> application
including error recovery in case of packet loss.A

File:

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

trunk/kernel/libk/elf.c

@@ -161 +161 @@
                 {
                         type                       = VSEG_TYPE_CODE;
-                        process->vmm.code_vpn_base = vbase >> CONFIG_PPM_PAGE_SHIFT;
+                        process->vmm.code_vpn_base = vbase >> CONFIG_PPM_PAGE_ORDER;
                 }
                 else               // found DATA segment
                 {
                         type                       = VSEG_TYPE_DATA;
-                        process->vmm.data_vpn_base = vbase >> CONFIG_PPM_PAGE_SHIFT;
+                        process->vmm.data_vpn_base = vbase >> CONFIG_PPM_PAGE_ORDER;
                 }
 
@@ -215 +215 @@
 {
     uint32_t     new_offset;       // unused, required by vfs_lseek() 
-        kmem_req_t   req;              // kmem request for program header
         Elf_Ehdr     header;           // local buffer for .elf header
         void       * segs_base;        // pointer on buffer for segment descriptors array
@@ -278 +277 @@
 
         // allocate memory for segment descriptors array
-        req.type  = KMEM_KCM;
-        req.order = bits_log2(segs_size);
-        req.flags = AF_KERNEL;
-        segs_base = kmem_alloc( &req );
+        segs_base = kmem_alloc( bits_log2(segs_size) , AF_NONE );
 
         if( segs_base == NULL )
@@ -295 +291 @@
         {
                 printk("\n[ERROR] in %s : cannot seek for descriptors array\n", __FUNCTION__ );
-                req.ptr = segs_base;
-                kmem_free( &req );
+                kmem_free( segs_base , bits_log2(segs_size) );
                 return -1;
         }
@@ -314 +309 @@
         {
                 printk("\n[ERROR] in %s : cannot read segments descriptors\n", __FUNCTION__ );
-                req.ptr = segs_base;
-                kmem_free( &req );
+                kmem_free( segs_base , bits_log2(segs_size) );
                 return -1;
         }
@@ -331 +325 @@
         if( error )
         {
-                req.ptr = segs_base;
-                kmem_free( &req );
+                printk("\n[ERROR] in %s : cannot register segments descriptors\n", __FUNCTION__ );
+                kmem_free( segs_base , bits_log2(segs_size) );
                 return -1;
         }
@@ -343 +337 @@
 
         // release allocated memory for program header
-        req.ptr = segs_base;
-        kmem_free(&req);
+    kmem_free( segs_base , bits_log2(segs_size) );
 
 #if DEBUG_ELF_LOAD