fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 04:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

More ELF loader changes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5261 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-10-25 22:10:56 +00:00
parent 92bbd36612
commit a6e577e3c4
23 changed files with 117 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/binfmt/elf.c
+5 -5
View File
@@ -139,11 +139,11 @@ static void elf_dumploadinfo(FAR struct elf_loadinfo_s *loadinfo)
bdbg(" e_shnum: %d\n", loadinfo->ehdr.e_shnum);
bdbg(" e_shstrndx: %d\n", loadinfo->ehdr.e_shstrndx);
if (loadinfo->shdr && loadinfo->ehdr.e_shum > 0)
if (loadinfo->shdr && loadinfo->ehdr.e_shnum > 0)
{
for (i = 0; i < loadinfo->ehdr.e_shum; i++)
for (i = 0; i < loadinfo->ehdr.e_shnum; i++)
{
FAR ELF32_Shdr *shdr = &loadinfo->shdr[i];
FAR Elf32_Shdr *shdr = &loadinfo->shdr[i];
bdbg("Sections %d:\n", i);
bdbg(" sh_name: %08x\n", shdr->sh_name);
bdbg(" sh_type: %08x\n", shdr->sh_type);
@@ -184,7 +184,7 @@ static int elf_loadbinary(struct binary_s *binp)
elf_dumploadinfo(&loadinfo);
if (ret != 0)
{
bdbg("Failed to initialize for load of NXFLT program: %d\n", ret);
bdbg("Failed to initialize for load of ELF program: %d\n", ret);
goto errout;
}
@@ -194,7 +194,7 @@ static int elf_loadbinary(struct binary_s *binp)
elf_dumploadinfo(&loadinfo);
if (ret != 0)
{
bdbg("Failed to load NXFLT program binary: %d\n", ret);
bdbg("Failed to load ELF program binary: %d\n", ret);
goto errout_with_init;
}
nuttx/binfmt/libelf/Make.defs
+1 -1
View File
@@ -41,7 +41,7 @@ BINFMT_CSRCS += elf.c
# ELF library
BINFMT_CSRCS = libelf_init.c libelf_uninit.c libelf_load.c \
BINFMT_CSRCS += libelf_init.c libelf_uninit.c libelf_load.c \
libelf_unload.c libelf_verify.c libelf_read.c \
libelf_bind.c libelf_symbols.c
nuttx/binfmt/libelf/libelf_load.c
+1 -1
View File
@@ -283,8 +283,8 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo)
/* Update sh_addr to point to copy in memory */
bvdbg("%d. %08x->%08x\n", i, (long)shdr->sh_addr, (long)dest);
shdr->sh_addr = (uintptr_t)dest;
bvdbg("%d. 0x%lx %s\n", (long)shdr->sh_addr, loadinfo->secstrings + shdr->sh_name);
/* Setup the memory pointer for the next time through the loop */
nuttx/binfmt/libnxflat/Make.defs
+1 -1
View File
@@ -41,7 +41,7 @@ BINFMT_CSRCS += nxflat.c
# NXFLAT library
BINFMT_CSRCS = libnxflat_init.c libnxflat_uninit.c libnxflat_load.c \
BINFMT_CSRCS += libnxflat_init.c libnxflat_uninit.c libnxflat_load.c \
libnxflat_unload.c libnxflat_verify.c libnxflat_read.c \
libnxflat_bind.c
nuttx/binfmt/nxflat.c
+2 -2
View File
@@ -158,7 +158,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
nxflat_dumploadinfo(&loadinfo);
if (ret != 0)
{
bdbg("Failed to initialize for load of NXFLT program: %d\n", ret);
bdbg("Failed to initialize for load of NXFLAT program: %d\n", ret);
goto errout;
}
@@ -168,7 +168,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
nxflat_dumploadinfo(&loadinfo);
if (ret != 0)
{
bdbg("Failed to load NXFLT program binary: %d\n", ret);
bdbg("Failed to load NXFLAT program binary: %d\n", ret);
goto errout_with_init;
}