Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-25 01:39:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sched/modules: Be consistent use of binary loader debug instrumentation. Was mixed system and binary loader debug. libs/libc/modlib: Switch from systemb to binary load debug to be consistent with sched/modules.

Browse Source
This commit is contained in:
Gregory Nutt
2018-06-01 10:10:17 -06:00
parent 12de93dd36
commit a6a88198c0
13 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/modlib/modlib_load.c
+7 -7
View File
@@ -153,7 +153,7 @@ static inline int modlib_loadfile(FAR struct mod_loadinfo_s *loadinfo)
/* Read each section into memory that is marked SHF_ALLOC + SHT_NOBITS */
sinfo("Loaded sections:\n");
binfo("Loaded sections:\n");
text = (FAR uint8_t *)loadinfo->textalloc;
data = (FAR uint8_t *)loadinfo->datastart;
@@ -193,7 +193,7 @@ static inline int modlib_loadfile(FAR struct mod_loadinfo_s *loadinfo)
ret = modlib_read(loadinfo, *pptr, shdr->sh_size, shdr->sh_offset);
if (ret < 0)
{
serr("ERROR: Failed to read section %d: %d\n", i, ret);
berr("ERROR: Failed to read section %d: %d\n", i, ret);
return ret;
}
}
@@ -209,7 +209,7 @@ static inline int modlib_loadfile(FAR struct mod_loadinfo_s *loadinfo)
/* Update sh_addr to point to copy in memory */
sinfo("%d. %08lx->%08lx\n", i,
binfo("%d. %08lx->%08lx\n", i,
(unsigned long)shdr->sh_addr, (unsigned long)*pptr);
shdr->sh_addr = (uintptr_t)*pptr;
@@ -243,7 +243,7 @@ int modlib_load(FAR struct mod_loadinfo_s *loadinfo)
{
int ret;
sinfo("loadinfo: %p\n", loadinfo);
binfo("loadinfo: %p\n", loadinfo);
DEBUGASSERT(loadinfo && loadinfo->filfd >= 0);
/* Load section headers into memory */
@@ -251,7 +251,7 @@ int modlib_load(FAR struct mod_loadinfo_s *loadinfo)
ret = modlib_loadshdrs(loadinfo);
if (ret < 0)
{
serr("ERROR: modlib_loadshdrs failed: %d\n", ret);
berr("ERROR: modlib_loadshdrs failed: %d\n", ret);
goto errout_with_buffers;
}
@@ -266,7 +266,7 @@ int modlib_load(FAR struct mod_loadinfo_s *loadinfo)
loadinfo->textalloc = (uintptr_t)lib_zalloc(loadinfo->textsize + loadinfo->datasize);
if (!loadinfo->textalloc)
{
serr("ERROR: Failed to allocate memory for the module\n");
berr("ERROR: Failed to allocate memory for the module\n");
ret = -ENOMEM;
goto errout_with_buffers;
}
@@ -278,7 +278,7 @@ int modlib_load(FAR struct mod_loadinfo_s *loadinfo)
ret = modlib_loadfile(loadinfo);
if (ret < 0)
{
serr("ERROR: modlib_loadfile failed: %d\n", ret);
berr("ERROR: modlib_loadfile failed: %d\n", ret);
goto errout_with_buffers;
}