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

Timestamp:

Feb 14, 2018, 3:40:19 PM (6 years ago)

Author:

alain

Message:

blip

File:

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

trunk/kernel/libk/elf.c

@@ -201 +201 @@
                 vfs_file_count_up( file_xp );
 
-                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 ,
-        vseg->file_size , vseg->file_offset , vseg->mapper_xp );
+#if CONFIG_DEBUG_ELF_LOAD
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_ELF_LOAD < cycle )
+printk("\n[DBG] %s : found %s vseg / base %x / size %x\n"
+"  file_size %x / file_offset %x / mapper_xp %l / cycle %d\n",
+__FUNCTION__ , vseg_type_str(vseg->type) , vseg->min , vseg->max - vseg->min ,
+vseg->file_size , vseg->file_offset , vseg->mapper_xp );
+#endif
+
         }
 
@@ -223 +228 @@
         error_t      error;
 
-    elf_dmsg("\n[DBG] %s : core[%x,%d] enter for <%s>\n",
-    __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , pathname );
+#if CONFIG_DEBUG_ELF_LOAD
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_ELF_LOAD < cycle )
+printk("\n[DBG] %s : thread %d enter for <%s> / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD, pathname, cycle );
+#endif
 
     // avoid GCC warning
@@ -243 +252 @@
         }
 
-    elf_dmsg("\n[DBG] %s : open file <%s>\n", __FUNCTION__ , pathname );
+#if (CONFIG_DEBUG_ELF_LOAD & 1)
+if( CONFIG_DEBUG_ELF_LOAD < cycle )
+printk("\n[DBG] %s : open file <%s>\n", __FUNCTION__, pathname );
+#endif
 
         // load header in local buffer
@@ -256 +268 @@
         }
 
-        elf_dmsg("\n[DBG] %s : loaded elf header for %s\n", __FUNCTION__ , pathname );
+#if (CONFIG_DEBUG_ELF_LOAD & 1)
+if( CONFIG_DEBUG_ELF_LOAD < cycle )
+printk("\n[DBG] %s : loaded elf header for %s\n", __FUNCTION__ , pathname );
+#endif
 
         if( header.e_phnum == 0 )
@@ -293 +308 @@
         }
 
-        elf_dmsg("\n[DBG] %s : segments array allocated for %s\n", __FUNCTION__ , pathname );
+#if (CONFIG_DEBUG_ELF_LOAD & 1)
+if( CONFIG_DEBUG_ELF_LOAD < cycle )
+printk("\n[DBG] %s : segments array allocated for %s\n", __FUNCTION__ , pathname );
+#endif
 
         // load seg descriptors array to local buffer
@@ -310 +328 @@
         }
 
-        elf_dmsg("\n[DBG] %s loaded segments descriptors for %s \n", __FUNCTION__ , pathname );
+#if (CONFIG_DEBUG_ELF_LOAD & 1)
+if( CONFIG_DEBUG_ELF_LOAD < cycle )
+printk("\n[DBG] %s loaded segments descriptors for %s \n", __FUNCTION__ , pathname );
+#endif
 
         // register loadable segments in process VMM
@@ -335 +356 @@
         kmem_free(&req);
 
-    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 );
+#if CONFIG_DEBUG_ELF_LOAD
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_ELF_LOAD < cycle )
+printk("\n[DBG] %s : thread %d exit for <%s> / entry_point %x / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD, pathname, header.e_entry, cycle );
+#endif
 
         return 0;