andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some more optimizations. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15360 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2022-01-15 17:19:17 +00:00
parent 305bc3a8ed
commit 35c733568a
1 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
os/sb/host/sbelf.c
View File

@ -99,8 +99,7 @@ typedef struct {
typedef struct elf_load_context {
vfs_file_node_c *fnp;
const memory_area_t *map;
uint32_t entry;
// uint32_t entry;
elf_secnum_t sections_num;
vfs_offset_t sections_off;
bool rel_movw_found;
@ -405,17 +404,22 @@ static msg_t reloc_section(elf_load_context_t *ctxp,
msg_t sbElfLoad(vfs_file_node_c *fnp, const memory_area_t *map) {
msg_t ret;
elf_load_context_t ctx;
elf_secnum_t i;
elf_section_info_t *esip;
/* Large structures not used at same time, the compiler could optimize it
but it is still a problem when running the code without optimizations for
debug.*/
union {
elf32_header_t h;
elf32_section_header_t sh;
} u;
/* Load context initialization.*/
{
static const uint8_t elf32_header[16] = {
0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
elf32_header_t h;
msg_t ret;
/* Context fully cleared.*/
memset((void *)&ctx, 0, sizeof (elf_load_context_t));
@ -428,30 +432,32 @@ msg_t sbElfLoad(vfs_file_node_c *fnp, const memory_area_t *map) {
/* Reading the main ELF header.*/
ret = vfsSetFilePosition(ctx.fnp, (vfs_offset_t)0, VFS_SEEK_SET);
CH_RETURN_ON_ERROR(ret);
ret = vfsReadFile(ctx.fnp, (void *)&h, sizeof (elf32_header_t));
ret = vfsReadFile(ctx.fnp, (void *)&u.h, sizeof (elf32_header_t));
CH_RETURN_ON_ERROR(ret);
/* Checking for the expected header.*/
if (memcmp(h.e_ident, elf32_header, 16) != 0) {
if (memcmp(u.h.e_ident, elf32_header, 16) != 0) {
return CH_RET_ENOEXEC;
}
/* Accepting executable files only.*/
if (h.e_type != ET_EXEC) {
if (u.h.e_type != ET_EXEC) {
return CH_RET_ENOEXEC;
}
/* TODO more consistency checks.*/
/* Storing info required later.*/
ctx.entry = h.e_entry;
ctx.sections_num = (unsigned)h.e_shnum;
ctx.sections_off = (vfs_offset_t)h.e_shoff;
// ctx.entry = u.h.e_entry;
ctx.sections_num = (unsigned)u.h.e_shnum;
ctx.sections_off = (vfs_offset_t)u.h.e_shoff;
}
/* Loading phase, scanning section headers.*/
{
elf_secnum_t i;
for (i = 0U; i < ctx.sections_num; i++) {
elf32_section_header_t sh;
/* Reading the header.*/
ret = vfsSetFilePosition(ctx.fnp,
@ -459,22 +465,22 @@ msg_t sbElfLoad(vfs_file_node_c *fnp, const memory_area_t *map) {
(vfs_offset_t)sizeof (elf32_section_header_t)),
VFS_SEEK_SET);
CH_RETURN_ON_ERROR(ret);
ret = vfsReadFile(ctx.fnp, (void *)&sh, sizeof (elf32_section_header_t));
ret = vfsReadFile(ctx.fnp, (void *)&u.sh, sizeof (elf32_section_header_t));
CH_RETURN_ON_ERROR(ret);
/* Empty sections are not processed.*/
if (sh.sh_size == 0U) {
if (u.sh.sh_size == 0U) {
continue;
}
/* Deciding what to do with the section depending on type.*/
switch (sh.sh_type) {
switch (u.sh.sh_type) {
case SHT_PROGBITS:
/* Allocatable section type, needs to be loaded.*/
if ((sh.sh_flags & SHF_ALLOC) != 0U) {
if ((u.sh.sh_flags & SHF_ALLOC) != 0U) {
/* Allocating and loading, could fail.*/
ret = allocate_load_section(&ctx, i, &sh);
ret = allocate_load_section(&ctx, i, &u.sh);
CH_RETURN_ON_ERROR(ret);
}
break;
@ -482,16 +488,16 @@ msg_t sbElfLoad(vfs_file_node_c *fnp, const memory_area_t *map) {
case SHT_NOBITS:
/* Uninitialized data section, we can have more than one, just checking
address ranges.*/
if ((sh.sh_flags & SHF_ALLOC) != 0U) {
ret = allocate_section(&ctx, i, &sh);
if ((u.sh.sh_flags & SHF_ALLOC) != 0U) {
ret = allocate_section(&ctx, i, &u.sh);
CH_RETURN_ON_ERROR(ret);
}
break;
case SHT_REL:
if ((sh.sh_flags & SHF_INFO_LINK) != 0U) {
if ((u.sh.sh_flags & SHF_INFO_LINK) != 0U) {
esip = find_allocated_section(&ctx, (elf_secnum_t)sh.sh_info);
esip = find_allocated_section(&ctx, (elf_secnum_t)u.sh.sh_info);
if (esip == NULL) {
/* Ignoring other relocation sections.*/
break;
@ -502,8 +508,8 @@ msg_t sbElfLoad(vfs_file_node_c *fnp, const memory_area_t *map) {
return CH_RET_ENOEXEC;
}
esip->rel_size = sh.sh_size;
esip->rel_off = (vfs_offset_t)sh.sh_offset;
esip->rel_size = u.sh.sh_size;
esip->rel_off = (vfs_offset_t)u.sh.sh_offset;
}
break;
@ -512,6 +518,7 @@ msg_t sbElfLoad(vfs_file_node_c *fnp, const memory_area_t *map) {
break;
}
}
}
/* Relocating all sections with an associated relocation table.*/
for (esip = &ctx.allocated[0]; esip < ctx.next; esip++) {