mirror of
https://github.com/apache/nuttx.git
synced 2026-06-08 18:37:46 +08:00
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.
This commit is contained in:
@@ -74,7 +74,7 @@ static inline int modlib_readrel(FAR struct mod_loadinfo_s *loadinfo,
|
||||
|
||||
if (index < 0 || index > (relsec->sh_size / sizeof(Elf32_Rel)))
|
||||
{
|
||||
serr("ERROR: Bad relocation symbol index: %d\n", index);
|
||||
berr("ERROR: Bad relocation symbol index: %d\n", index);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ static int modlib_relocate(FAR struct module_s *modp,
|
||||
ret = modlib_readrel(loadinfo, relsec, i, &rel);
|
||||
if (ret < 0)
|
||||
{
|
||||
serr("ERROR: Section %d reloc %d: Failed to read relocation entry: %d\n",
|
||||
berr("ERROR: Section %d reloc %d: Failed to read relocation entry: %d\n",
|
||||
relidx, i, ret);
|
||||
return ret;
|
||||
}
|
||||
@@ -143,7 +143,7 @@ static int modlib_relocate(FAR struct module_s *modp,
|
||||
ret = modlib_readsym(loadinfo, symidx, &sym);
|
||||
if (ret < 0)
|
||||
{
|
||||
serr("ERROR: Section %d reloc %d: Failed to read symbol[%d]: %d\n",
|
||||
berr("ERROR: Section %d reloc %d: Failed to read symbol[%d]: %d\n",
|
||||
relidx, i, symidx, ret);
|
||||
return ret;
|
||||
}
|
||||
@@ -165,13 +165,13 @@ static int modlib_relocate(FAR struct module_s *modp,
|
||||
|
||||
if (ret == -ESRCH)
|
||||
{
|
||||
serr("ERROR: Section %d reloc %d: Undefined symbol[%d] has no name: %d\n",
|
||||
berr("ERROR: Section %d reloc %d: Undefined symbol[%d] has no name: %d\n",
|
||||
relidx, i, symidx, ret);
|
||||
psym = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
serr("ERROR: Section %d reloc %d: Failed to get value of symbol[%d]: %d\n",
|
||||
berr("ERROR: Section %d reloc %d: Failed to get value of symbol[%d]: %d\n",
|
||||
relidx, i, symidx, ret);
|
||||
return ret;
|
||||
}
|
||||
@@ -181,7 +181,7 @@ static int modlib_relocate(FAR struct module_s *modp,
|
||||
|
||||
if (rel.r_offset < 0 || rel.r_offset > dstsec->sh_size - sizeof(uint32_t))
|
||||
{
|
||||
serr("ERROR: Section %d reloc %d: Relocation address out of range, offset %d size %d\n",
|
||||
berr("ERROR: Section %d reloc %d: Relocation address out of range, offset %d size %d\n",
|
||||
relidx, i, rel.r_offset, dstsec->sh_size);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -193,7 +193,7 @@ static int modlib_relocate(FAR struct module_s *modp,
|
||||
ret = up_relocate(&rel, psym, addr);
|
||||
if (ret < 0)
|
||||
{
|
||||
serr("ERROR: Section %d reloc %d: Relocation failed: %d\n", relidx, i, ret);
|
||||
berr("ERROR: Section %d reloc %d: Relocation failed: %d\n", relidx, i, ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -204,7 +204,7 @@ static int modlib_relocate(FAR struct module_s *modp,
|
||||
static int modlib_relocateadd(FAR struct module_s *modp,
|
||||
FAR struct mod_loadinfo_s *loadinfo, int relidx)
|
||||
{
|
||||
serr("ERROR: Not implemented\n");
|
||||
berr("ERROR: Not implemented\n");
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
@@ -249,7 +249,7 @@ int modlib_bind(FAR struct module_s *modp, FAR struct mod_loadinfo_s *loadinfo)
|
||||
ret = modlib_allocbuffer(loadinfo);
|
||||
if (ret < 0)
|
||||
{
|
||||
serr("ERROR: modlib_allocbuffer failed: %d\n", ret);
|
||||
berr("ERROR: modlib_allocbuffer failed: %d\n", ret);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user