michaelh/zephyr
1
0
Fork 0
Code Releases Activity

llext: remove a symbol count copy

Browse source 
The symbol count in struct llext_loader is redundant, we already have
one in struct llext_symtable, accessible via struct llext. Remove the
redundant copy.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2023-11-09 13:04:21 +01:00 • committed by Carles Cufí
commit fb92636056
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/zephyr/llext/loader.h
View file

@ -92,7 +92,6 @@ struct llext_loader {
elf_shdr_t sects[LLEXT_SECT_COUNT]; elf_shdr_t sects[LLEXT_SECT_COUNT];
uint32_t *sect_map; uint32_t *sect_map;
uint32_t sect_cnt; uint32_t sect_cnt;
uint32_t sym_cnt;
/** @endcond */ /** @endcond */
}; };

11
subsys/llext/llext.c
View file

@ -360,7 +360,7 @@ static int llext_count_export_syms(struct llext_loader *ldr, struct llext *ext)
if (stt == STT_FUNC && stb == STB_GLOBAL) { if (stt == STT_FUNC && stb == STB_GLOBAL) {
LOG_DBG("function symbol %d, name %s, type tag %d, bind %d, sect %d", LOG_DBG("function symbol %d, name %s, type tag %d, bind %d, sect %d",
i, name, stt, stb, sect); i, name, stt, stb, sect);
ldr->sym_cnt++; ext->sym_tab.sym_cnt++;
} else { } else {
LOG_DBG("unhandled symbol %d, name %s, type tag %d, bind %d, sect %d", LOG_DBG("unhandled symbol %d, name %s, type tag %d, bind %d, sect %d",
i, name, stt, stb, sect); i, name, stt, stb, sect);
@ -372,16 +372,14 @@ static int llext_count_export_syms(struct llext_loader *ldr, struct llext *ext)
static int llext_allocate_symtab(struct llext_loader *ldr, struct llext *ext) static int llext_allocate_symtab(struct llext_loader *ldr, struct llext *ext)
{ {
int ret = 0;
size_t syms_size = ldr->sym_cnt * sizeof(struct llext_symbol);
struct llext_symtable *sym_tab = &ext->sym_tab; struct llext_symtable *sym_tab = &ext->sym_tab;
size_t syms_size = sym_tab->sym_cnt * sizeof(struct llext_symbol);
sym_tab->syms = k_heap_alloc(&llext_heap, syms_size, K_NO_WAIT); sym_tab->syms = k_heap_alloc(&llext_heap, syms_size, K_NO_WAIT);
sym_tab->sym_cnt = ldr->sym_cnt; memset(sym_tab->syms, 0, syms_size);
memset(sym_tab->syms, 0, ldr->sym_cnt * sizeof(struct llext_symbol));
ext->mem_size += syms_size; ext->mem_size += syms_size;
return ret; return 0;
} }
static int llext_copy_symbols(struct llext_loader *ldr, struct llext *ext) static int llext_copy_symbols(struct llext_loader *ldr, struct llext *ext)
@ -570,7 +568,6 @@ static int do_llext_load(struct llext_loader *ldr, struct llext *ext)
memset(ldr->sects, 0, sizeof(ldr->sects)); memset(ldr->sects, 0, sizeof(ldr->sects));
ldr->sect_cnt = 0; ldr->sect_cnt = 0;
ldr->sym_cnt = 0;
size_t sect_map_sz = ldr->hdr.e_shnum * sizeof(uint32_t); size_t sect_map_sz = ldr->hdr.e_shnum * sizeof(uint32_t);