Skip to content
Snippets Groups Projects
Commit cbea5657 authored by q3k's avatar q3k Committed by Serge Bazanski
Browse files

style fixes

parent fbdebe9b
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
epicardium/l0der/l0der.c
+ 164
− 79
View file @ cbea5657
...@@ -72,10 +72,8 @@ static int _read_elf_header(FIL *fp, Elf32_Ehdr *hdr) ...@@ -72,10 +72,8 @@ static int _read_elf_header(FIL *fp, Elf32_Ehdr *hdr)
return -1; return -1;
} }
if (hdr->e_ident[0] != ELFMAG0 || if (hdr->e_ident[0] != ELFMAG0 || hdr->e_ident[1] != ELFMAG1 ||
hdr->e_ident[1] != ELFMAG1 || hdr->e_ident[2] != ELFMAG2 || hdr->e_ident[3] != ELFMAG3) {
hdr->e_ident[2] != ELFMAG2 ||
hdr->e_ident[3] != ELFMAG3) {
LOG_ERR("l0der", "_read_elf_header: not an ELF file"); LOG_ERR("l0der", "_read_elf_header: not an ELF file");
return -1; return -1;
} }
...@@ -114,20 +112,29 @@ static int _read_elf_header(FIL *fp, Elf32_Ehdr *hdr) ...@@ -114,20 +112,29 @@ static int _read_elf_header(FIL *fp, Elf32_Ehdr *hdr)
* *
* - ``-EIO``: Could not read from FAT - address out of bounds of not enough bytes available. * - ``-EIO``: Could not read from FAT - address out of bounds of not enough bytes available.
*/ */
static int _seek_and_read(FIL *fp, uint32_t address, void *data, size_t count) { static int _seek_and_read(FIL *fp, uint32_t address, void *data, size_t count)
{
FRESULT fres; FRESULT fres;
if ((fres = f_lseek(fp, address)) != FR_OK) { if ((fres = f_lseek(fp, address)) != FR_OK) {
LOG_ERR("l0der", "_seek_and_read: could not seek to 0x%lx: %d", address, fres); LOG_ERR("l0der",
"_seek_and_read: could not seek to 0x%lx: %d",
address,
fres);
return -EIO; return -EIO;
} }
unsigned int read; unsigned int read;
if ((fres = f_read(fp, data, count, &read)) != FR_OK || read < count) { if ((fres = f_read(fp, data, count, &read)) != FR_OK || read < count) {
if (fres == FR_OK) { if (fres == FR_OK) {
LOG_ERR("l0der", "_seek_and_read: could not read: wanted %d bytes, got %d", count, read); LOG_ERR("l0der",
"_seek_and_read: could not read: wanted %d bytes, got %d",
count,
read);
} else { } else {
LOG_ERR("l0der", "_seek_and_read: could not read: %d", fres); LOG_ERR("l0der",
"_seek_and_read: could not read: %d",
fres);
} }
return -EIO; return -EIO;
} }
...@@ -157,7 +164,8 @@ static int _read_section_header(FIL *fp, uint32_t shdr_addr, Elf32_Shdr *shdr) ...@@ -157,7 +164,8 @@ static int _read_section_header(FIL *fp, uint32_t shdr_addr, Elf32_Shdr *shdr)
* This function ensures basic memory sanity of a program header / segment. * This function ensures basic memory sanity of a program header / segment.
* It ensures that it points to a file region that is contained within the file fully. * It ensures that it points to a file region that is contained within the file fully.
*/ */
static int _check_program_header(FIL *fp, Elf32_Phdr *phdr) { static int _check_program_header(FIL *fp, Elf32_Phdr *phdr)
{
size_t size = f_size(fp); size_t size = f_size(fp);
// Check file size/offset. // Check file size/offset.
...@@ -168,14 +176,16 @@ static int _check_program_header(FIL *fp, Elf32_Phdr *phdr) { ...@@ -168,14 +176,16 @@ static int _check_program_header(FIL *fp, Elf32_Phdr *phdr) {
return -ENOEXEC; return -ENOEXEC;
} }
if (file_limit > size) { if (file_limit > size) {
LOG_ERR("l0der", "_check_program_header: extends past end of file"); LOG_ERR("l0der",
"_check_program_header: extends past end of file");
return -ENOEXEC; return -ENOEXEC;
} }
if (phdr->p_type == PT_LOAD) { if (phdr->p_type == PT_LOAD) {
// Check mem/file size. // Check mem/file size.
if (phdr->p_filesz > phdr->p_memsz) { if (phdr->p_filesz > phdr->p_memsz) {
LOG_ERR("l0der", "_check_program_header: file size larger than memory size"); LOG_ERR("l0der",
"_check_program_header: file size larger than memory size");
return -ENOEXEC; return -ENOEXEC;
} }
...@@ -183,7 +193,8 @@ static int _check_program_header(FIL *fp, Elf32_Phdr *phdr) { ...@@ -183,7 +193,8 @@ static int _check_program_header(FIL *fp, Elf32_Phdr *phdr) {
uint32_t mem_limit = phdr->p_vaddr + phdr->p_memsz; uint32_t mem_limit = phdr->p_vaddr + phdr->p_memsz;
if (mem_limit < mem_start) { if (mem_limit < mem_start) {
LOG_ERR("l0der", "_check_program_header: mem size overflow"); LOG_ERR("l0der",
"_check_program_header: mem size overflow");
return -ENOEXEC; return -ENOEXEC;
} }
} }
...@@ -197,7 +208,8 @@ static int _check_program_header(FIL *fp, Elf32_Phdr *phdr) { ...@@ -197,7 +208,8 @@ static int _check_program_header(FIL *fp, Elf32_Phdr *phdr) {
* This function ensures basic memory sanity of a section header. * This function ensures basic memory sanity of a section header.
* It ensures that it points to a file region that is contained within the file fully. * It ensures that it points to a file region that is contained within the file fully.
*/ */
static int _check_section_header(FIL *fp, Elf32_Shdr *shdr) { static int _check_section_header(FIL *fp, Elf32_Shdr *shdr)
{
size_t size = f_size(fp); size_t size = f_size(fp);
// Check file size/offset. // Check file size/offset.
...@@ -208,7 +220,8 @@ static int _check_section_header(FIL *fp, Elf32_Shdr *shdr) { ...@@ -208,7 +220,8 @@ static int _check_section_header(FIL *fp, Elf32_Shdr *shdr) {
return -ENOEXEC; return -ENOEXEC;
} }
if (file_limit > size) { if (file_limit > size) {
LOG_ERR("l0der", "_check_section_header: extends past end of file"); LOG_ERR("l0der",
"_check_section_header: extends past end of file");
return -ENOEXEC; return -ENOEXEC;
} }
...@@ -230,13 +243,14 @@ static int _check_interp(FIL *fp, Elf32_Phdr *phdr) ...@@ -230,13 +243,14 @@ static int _check_interp(FIL *fp, Elf32_Phdr *phdr)
char *interp = alloca(buffer_size); char *interp = alloca(buffer_size);
memset(interp, 0, buffer_size); memset(interp, 0, buffer_size);
if ((res = _seek_and_read(fp, phdr->p_offset, interp, buffer_size)) != FR_OK) { if ((res = _seek_and_read(fp, phdr->p_offset, interp, buffer_size)) !=
FR_OK) {
return res; return res;
} }
if (strncmp(interp, _interpreter, strlen(_interpreter)) != 0) { if (strncmp(interp, _interpreter, strlen(_interpreter)) != 0) {
LOG_ERR("l0der", "_check_interp: invalid interpreter, want card10-l0dable"); LOG_ERR("l0der",
"_check_interp: invalid interpreter, want card10-l0dable");
return -1; return -1;
} }
...@@ -258,8 +272,10 @@ static int _get_load_addr(struct _pie_load_info *li) ...@@ -258,8 +272,10 @@ static int _get_load_addr(struct _pie_load_info *li)
uint32_t core1_mem_size = core1_mem_limit - core1_mem_start; uint32_t core1_mem_size = core1_mem_limit - core1_mem_start;
if (image_size > core1_mem_size) { if (image_size > core1_mem_size) {
LOG_ERR("l0der", "_get_load_addr: image too large (need 0x%08lx bytes, have %08lx", LOG_ERR("l0der",
image_size, core1_mem_size); "_get_load_addr: image too large (need 0x%08lx bytes, have %08lx",
image_size,
core1_mem_size);
return -ENOMEM; return -ENOMEM;
} }
...@@ -270,7 +286,9 @@ static int _get_load_addr(struct _pie_load_info *li) ...@@ -270,7 +286,9 @@ static int _get_load_addr(struct _pie_load_info *li)
// Ensure within alignment requests. // Ensure within alignment requests.
if ((li->load_address % li->strictest_alignment) != 0) { if ((li->load_address % li->strictest_alignment) != 0) {
LOG_ERR("l0der", "_get_load_addr: too strict alignment request for %ld bytes", li->strictest_alignment); LOG_ERR("l0der",
"_get_load_addr: too strict alignment request for %ld bytes",
li->strictest_alignment);
return -ENOEXEC; return -ENOEXEC;
} }
...@@ -280,13 +298,24 @@ static int _get_load_addr(struct _pie_load_info *li) ...@@ -280,13 +298,24 @@ static int _get_load_addr(struct _pie_load_info *li)
// Check that there is enough stack space. // Check that there is enough stack space.
uint32_t stack_space = li->stack_top - li->image_load_limit; uint32_t stack_space = li->stack_top - li->image_load_limit;
if (stack_space < 8192) { if (stack_space < 8192) {
LOG_WARN("l0der", "_get_load_addr: low stack space (%ld bytes)", stack_space); LOG_WARN(
"l0der",
"_get_load_addr: low stack space (%ld bytes)",
stack_space
);
} else if (stack_space < 256) { } else if (stack_space < 256) {
LOG_ERR("l0der", "_get_load_addr: low stack space (%ld bytes), cannot continue", stack_space); LOG_ERR("l0der",
"_get_load_addr: low stack space (%ld bytes), cannot continue",
stack_space);
return -ENOMEM; return -ENOMEM;
} }
LOG_INFO("l0der", "Stack at %08lx, %ld bytes available", li->stack_top, stack_space); LOG_INFO(
"l0der",
"Stack at %08lx, %ld bytes available",
li->stack_top,
stack_space
);
return 0; return 0;
} }
...@@ -301,17 +330,26 @@ static int _load_segment(FIL *fp, struct _pie_load_info *li, Elf32_Phdr *phdr) ...@@ -301,17 +330,26 @@ static int _load_segment(FIL *fp, struct _pie_load_info *li, Elf32_Phdr *phdr)
uint32_t segment_start = li->load_address + phdr->p_vaddr; uint32_t segment_start = li->load_address + phdr->p_vaddr;
uint32_t segment_limit = segment_start + phdr->p_memsz; uint32_t segment_limit = segment_start + phdr->p_memsz;
LOG_INFO("l0der", "Segment %08lx-%08lx: 0x%lx bytes from file", LOG_INFO(
segment_start, segment_limit, phdr->p_filesz); "l0der",
"Segment %08lx-%08lx: 0x%lx bytes from file",
segment_start,
segment_limit,
phdr->p_filesz
);
memset((void *)segment_start, 0, phdr->p_memsz); memset((void *)segment_start, 0, phdr->p_memsz);
return _seek_and_read(fp, phdr->p_offset, (void*)segment_start, phdr->p_filesz); return _seek_and_read(
fp, phdr->p_offset, (void *)segment_start, phdr->p_filesz
);
} }
/* /*
* Parse dynamic symbol sections. * Parse dynamic symbol sections.
*/ */
static int _parse_dynamic_symbols(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr) { static int
_parse_dynamic_symbols(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr)
{
int res; int res;
FRESULT fres; FRESULT fres;
Elf32_Shdr shdr; Elf32_Shdr shdr;
...@@ -333,22 +371,30 @@ static int _parse_dynamic_symbols(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr ...@@ -333,22 +371,30 @@ static int _parse_dynamic_symbols(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr
} }
if ((shdr.sh_size % sizeof(Elf32_Sym)) != 0) { if ((shdr.sh_size % sizeof(Elf32_Sym)) != 0) {
LOG_ERR("l0der", "_parse_dynamic_symbols: SHT_DYN section with invalid size: %ld", shdr.sh_size); LOG_ERR("l0der",
"_parse_dynamic_symbols: SHT_DYN section with invalid size: %ld",
shdr.sh_size);
return -EIO; return -EIO;
} }
uint32_t sym_count = shdr.sh_size / sizeof(Elf32_Sym); uint32_t sym_count = shdr.sh_size / sizeof(Elf32_Sym);
// Read symbols one by one. // Read symbols one by one.
if ((fres = f_lseek(fp, shdr.sh_offset)) != FR_OK) { if ((fres = f_lseek(fp, shdr.sh_offset)) != FR_OK) {
LOG_ERR("l0der", "_parse_dynamic_symbols: seek to first relocation (at 0x%lx) failed", shdr.sh_offset); LOG_ERR("l0der",
"_parse_dynamic_symbols: seek to first relocation (at 0x%lx) failed",
shdr.sh_offset);
return -EIO; return -EIO;
} }
for (int j = 0; j < sym_count; j++) { for (int j = 0; j < sym_count; j++) {
unsigned int read; unsigned int read;
if ((fres = f_read(fp, &sym, sizeof(Elf32_Sym), &read)) != FR_OK || read != sizeof(Elf32_Sym)) { if ((fres = f_read(
LOG_ERR("l0der", "__parse_dynamic_symbols: symbol read failed: %d", fres); fp, &sym, sizeof(Elf32_Sym), &read)) !=
FR_OK ||
read != sizeof(Elf32_Sym)) {
LOG_ERR("l0der",
"__parse_dynamic_symbols: symbol read failed: %d",
fres);
return -EIO; return -EIO;
} }
...@@ -358,7 +404,9 @@ static int _parse_dynamic_symbols(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr ...@@ -358,7 +404,9 @@ static int _parse_dynamic_symbols(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr
} }
if (li->weak_symbol_count >= WEAK_SYMBOL_MAX) { if (li->weak_symbol_count >= WEAK_SYMBOL_MAX) {
LOG_ERR("l0der", "__parse_dynamic_symbols: too many weak symbols (limit: %d)", WEAK_SYMBOL_MAX); LOG_ERR("l0der",
"__parse_dynamic_symbols: too many weak symbols (limit: %d)",
WEAK_SYMBOL_MAX);
return -ENOMEM; return -ENOMEM;
} }
...@@ -376,7 +424,8 @@ static int _parse_dynamic_symbols(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr ...@@ -376,7 +424,8 @@ static int _parse_dynamic_symbols(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr
* the only one used when making 'standard' PIE binaries on RAM. However, other * the only one used when making 'standard' PIE binaries on RAM. However, other
* kinds might have to be implemented in the future. * kinds might have to be implemented in the future.
*/ */
static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr) { static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr)
{
int res; int res;
FRESULT fres; FRESULT fres;
Elf32_Shdr shdr; Elf32_Shdr shdr;
...@@ -391,7 +440,8 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr) ...@@ -391,7 +440,8 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr)
// We don't support RELA (relocation with addend) sections (yet?). // We don't support RELA (relocation with addend) sections (yet?).
if (shdr.sh_type == SHT_RELA) { if (shdr.sh_type == SHT_RELA) {
LOG_ERR("l0der", "_run_relocations: found unsupported SHT_RELA section, bailing"); LOG_ERR("l0der",
"_run_relocations: found unsupported SHT_RELA section, bailing");
return -ENOEXEC; return -ENOEXEC;
} }
...@@ -404,21 +454,30 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr) ...@@ -404,21 +454,30 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr)
} }
if ((shdr.sh_size % sizeof(Elf32_Rel)) != 0) { if ((shdr.sh_size % sizeof(Elf32_Rel)) != 0) {
LOG_ERR("l0der", "_run_relocations: SHT_REL section with invalid size: %ld", shdr.sh_size); LOG_ERR("l0der",
"_run_relocations: SHT_REL section with invalid size: %ld",
shdr.sh_size);
return -EIO; return -EIO;
} }
uint32_t reloc_count = shdr.sh_size / sizeof(Elf32_Rel); uint32_t reloc_count = shdr.sh_size / sizeof(Elf32_Rel);
// Read relocations one by one. // Read relocations one by one.
if ((fres = f_lseek(fp, shdr.sh_offset)) != FR_OK) { if ((fres = f_lseek(fp, shdr.sh_offset)) != FR_OK) {
LOG_ERR("l0der", "_run_relocations: seek to first relocation (at 0x%lx) failed", shdr.sh_offset); LOG_ERR("l0der",
"_run_relocations: seek to first relocation (at 0x%lx) failed",
shdr.sh_offset);
return -EIO; return -EIO;
} }
for (int j = 0; j < reloc_count; j++) { for (int j = 0; j < reloc_count; j++) {
unsigned int read; unsigned int read;
if ((fres = f_read(fp, &rel, sizeof(Elf32_Rel), &read)) != FR_OK || read != sizeof(Elf32_Rel)) { if ((fres = f_read(
LOG_ERR("l0der", "_run_relocations: relocation read failed: %d", fres); fp, &rel, sizeof(Elf32_Rel), &read)) !=
FR_OK ||
read != sizeof(Elf32_Rel)) {
LOG_ERR("l0der",
"_run_relocations: relocation read failed: %d",
fres);
return -EIO; return -EIO;
} }
...@@ -429,7 +488,8 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr) ...@@ -429,7 +488,8 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr)
// (ie., do not resolve relocation - they default to a safe NULL) // (ie., do not resolve relocation - they default to a safe NULL)
uint8_t skip = 0; uint8_t skip = 0;
if (sym != 0) { if (sym != 0) {
for (int k = 0; k < li->weak_symbol_count; k++) { for (int k = 0; k < li->weak_symbol_count;
k++) {
if (li->weak_symbols[k] == sym) { if (li->weak_symbols[k] == sym) {
skip = 1; skip = 1;
break; break;
...@@ -444,12 +504,17 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr) ...@@ -444,12 +504,17 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr)
case R_ARM_RELATIVE: case R_ARM_RELATIVE:
// Relocate. // Relocate.
if ((rel.r_offset % 4) != 0) { if ((rel.r_offset % 4) != 0) {
LOG_ERR("l0der", "_run_relocations: R_ARM_RELATIVE address must be 4-byte aligned"); LOG_ERR("l0der",
"_run_relocations: R_ARM_RELATIVE address must be 4-byte aligned");
return -ENOEXEC; return -ENOEXEC;
} }
volatile uint32_t *addr = (uint32_t *)(rel.r_offset + li->load_address); volatile uint32_t *addr =
if ((uint32_t)addr < li->image_load_start || (uint32_t)addr >= li->image_load_limit) { (uint32_t
LOG_ERR("l0der", "_run_relocations: R_ARM_RELATIVE address (%08lx) is outside image boundaries", *)(rel.r_offset + li->load_address);
if ((uint32_t)addr < li->image_load_start ||
(uint32_t)addr >= li->image_load_limit) {
LOG_ERR("l0der",
"_run_relocations: R_ARM_RELATIVE address (%08lx) is outside image boundaries",
(uint32_t)addr); (uint32_t)addr);
return -ENOEXEC; return -ENOEXEC;
} }
...@@ -457,7 +522,9 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr) ...@@ -457,7 +522,9 @@ static int _run_relocations(FIL *fp, struct _pie_load_info *li, Elf32_Ehdr *hdr)
*addr += li->load_address; *addr += li->load_address;
break; break;
default: default:
LOG_ERR("l0der", "_run_relocations: unsupported relocation type %d", type); LOG_ERR("l0der",
"_run_relocations: unsupported relocation type %d",
type);
return -ENOEXEC; return -ENOEXEC;
} }
} }
...@@ -502,7 +569,9 @@ static int _load_pie(FIL *fp, Elf32_Ehdr *hdr, struct l0dable_info *info) ...@@ -502,7 +569,9 @@ static int _load_pie(FIL *fp, Elf32_Ehdr *hdr, struct l0dable_info *info)
if (phdr.p_type == PT_LOAD) { if (phdr.p_type == PT_LOAD) {
// Check alignment request. // Check alignment request.
if ((phdr.p_vaddr % phdr.p_align) != 0) { if ((phdr.p_vaddr % phdr.p_align) != 0) {
LOG_ERR("l0der", "_load_pie: phdr %d alignment too strict", i); LOG_ERR("l0der",
"_load_pie: phdr %d alignment too strict",
i);
return -ENOEXEC; return -ENOEXEC;
} }
if (phdr.p_align > li.strictest_alignment) { if (phdr.p_align > li.strictest_alignment) {
...@@ -528,14 +597,18 @@ static int _load_pie(FIL *fp, Elf32_Ehdr *hdr, struct l0dable_info *info) ...@@ -528,14 +597,18 @@ static int _load_pie(FIL *fp, Elf32_Ehdr *hdr, struct l0dable_info *info)
return -ENOEXEC; return -ENOEXEC;
} }
if (li.image_limit < li.image_start) { if (li.image_limit < li.image_start) {
// We didn't find any LOAD segment. // We didn't find any LOAD segment.
LOG_ERR("l0der", "_load_pie: no loadable segments"); LOG_ERR("l0der", "_load_pie: no loadable segments");
return -ENOEXEC; return -ENOEXEC;
} }
LOG_INFO("l0der", "Image bounds %08lx - %08lx", li.image_start, li.image_limit); LOG_INFO(
"l0der",
"Image bounds %08lx - %08lx",
li.image_start,
li.image_limit
);
if ((res = _get_load_addr(&li)) != 0) { if ((res = _get_load_addr(&li)) != 0) {
return res; return res;
...@@ -587,7 +660,10 @@ int l0der_load_path(const char *path, struct l0dable_info *info) ...@@ -587,7 +660,10 @@ int l0der_load_path(const char *path, struct l0dable_info *info)
FRESULT fres = f_open(&fh, path, FA_OPEN_EXISTING | FA_READ); FRESULT fres = f_open(&fh, path, FA_OPEN_EXISTING | FA_READ);
if (fres != FR_OK) { if (fres != FR_OK) {
LOG_ERR("l0der", "l0der_load_path: could not open ELF file %s: %d", path, fres); LOG_ERR("l0der",
"l0der_load_path: could not open ELF file %s: %d",
path,
fres);
return -ENOENT; return -ENOENT;
} }
...@@ -608,7 +684,8 @@ int l0der_load_path(const char *path, struct l0dable_info *info) ...@@ -608,7 +684,8 @@ int l0der_load_path(const char *path, struct l0dable_info *info)
uint32_t ph_start = hdr.e_phoff; uint32_t ph_start = hdr.e_phoff;
uint32_t ph_limit = hdr.e_phoff + (hdr.e_phnum * hdr.e_phentsize); uint32_t ph_limit = hdr.e_phoff + (hdr.e_phnum * hdr.e_phentsize);
if (ph_limit < ph_start) { if (ph_limit < ph_start) {
LOG_ERR("l0der", "l0der_load_path: invalid program header count/size: overflow"); LOG_ERR("l0der",
"l0der_load_path: invalid program header count/size: overflow");
return -ENOEXEC; return -ENOEXEC;
} }
if (ph_limit - ph_start == 0) { if (ph_limit - ph_start == 0) {
...@@ -616,11 +693,13 @@ int l0der_load_path(const char *path, struct l0dable_info *info) ...@@ -616,11 +693,13 @@ int l0der_load_path(const char *path, struct l0dable_info *info)
return -ENOEXEC; return -ENOEXEC;
} }
if (ph_limit > size) { if (ph_limit > size) {
LOG_ERR("l0der", "l0der_load_path: program header table extends past end of file"); LOG_ERR("l0der",
"l0der_load_path: program header table extends past end of file");
return -ENOEXEC; return -ENOEXEC;
} }
if (hdr.e_phentsize < sizeof(Elf32_Phdr)) { if (hdr.e_phentsize < sizeof(Elf32_Phdr)) {
LOG_ERR("l0der", "l0der_load_path: invalid program header table entry size"); LOG_ERR("l0der",
"l0der_load_path: invalid program header table entry size");
return -ENOEXEC; return -ENOEXEC;
} }
...@@ -629,26 +708,32 @@ int l0der_load_path(const char *path, struct l0dable_info *info) ...@@ -629,26 +708,32 @@ int l0der_load_path(const char *path, struct l0dable_info *info)
uint32_t sh_start = hdr.e_shoff; uint32_t sh_start = hdr.e_shoff;
uint32_t sh_limit = hdr.e_shoff + (hdr.e_shnum + hdr.e_shentsize); uint32_t sh_limit = hdr.e_shoff + (hdr.e_shnum + hdr.e_shentsize);
if (sh_limit < sh_start) { if (sh_limit < sh_start) {
LOG_ERR("l0der", "l0der_load_path: invalid section header count/size: overflow"); LOG_ERR("l0der",
"l0der_load_path: invalid section header count/size: overflow");
return -ENOEXEC; return -ENOEXEC;
} }
if (sh_limit > size) { if (sh_limit > size) {
LOG_ERR("l0der", "l0der_load_path: section header table extends past end of file"); LOG_ERR("l0der",
"l0der_load_path: section header table extends past end of file");
return -ENOEXEC; return -ENOEXEC;
} }
if (hdr.e_shentsize < sizeof(Elf32_Shdr)) { if (hdr.e_shentsize < sizeof(Elf32_Shdr)) {
LOG_ERR("l0der", "l0der_load_path: invalid section header table entry size"); LOG_ERR("l0der",
"l0der_load_path: invalid section header table entry size");
return -ENOEXEC; return -ENOEXEC;
} }
// Check whether it's something that we can load. // Check whether it's something that we can load.
if (hdr.e_type == ET_DYN && hdr.e_machine == EM_ARM && hdr.e_version == EV_CURRENT) { if (hdr.e_type == ET_DYN && hdr.e_machine == EM_ARM &&
hdr.e_version == EV_CURRENT) {
LOG_INFO("l0der", "Loading PIE l0dable %s ...", path); LOG_INFO("l0der", "Loading PIE l0dable %s ...", path);
res = _load_pie(&fh, &hdr, info); res = _load_pie(&fh, &hdr, info);
goto done; goto done;
} else { } else {
LOG_ERR("l0der", "l0der_load_path: %s: not an ARM PIE, cannot load.", path); LOG_ERR("l0der",
"l0der_load_path: %s: not an ARM PIE, cannot load.",
path);
res = -ENOEXEC; res = -ENOEXEC;
goto done; goto done;
} }
......
epicardium/main.c
+ 8
− 4
View file @ cbea5657
...@@ -95,7 +95,11 @@ int main(void) ...@@ -95,7 +95,11 @@ int main(void)
NULL, NULL,
tskIDLE_PRIORITY + 2, tskIDLE_PRIORITY + 2,
&dispatcher_task_id) != pdPASS) { &dispatcher_task_id) != pdPASS) {
LOG_CRIT("startup", "Failed to create %s task!", "API Dispatcher"); LOG_CRIT(
"startup",
"Failed to create %s task!",
"API Dispatcher"
);
abort(); abort();
} }
...@@ -114,7 +118,9 @@ int main(void) ...@@ -114,7 +118,9 @@ int main(void)
if (res != 0) { if (res != 0) {
LOG_ERR("startup", "l0der failed: %d\n", res); LOG_ERR("startup", "l0der failed: %d\n", res);
} else { } else {
LOG_INFO("startup", "Starting %s on core1 ...", l0dable); LOG_INFO(
"startup", "Starting %s on core1 ...", l0dable
);
core1_start(info.isr_vector); core1_start(info.isr_vector);
} }
} else { } else {
...@@ -122,8 +128,6 @@ int main(void) ...@@ -122,8 +128,6 @@ int main(void)
core1_start((void *)0x10080000); core1_start((void *)0x10080000);
} }
LOG_INFO("startup", "Starting FreeRTOS ..."); LOG_INFO("startup", "Starting FreeRTOS ...");
vTaskStartScheduler(); vTaskStartScheduler();
......
l0dables/blinky/main.c
+ 57
− 51
View file @ cbea5657
...@@ -7,24 +7,29 @@ int levels_display[11] = {0}; ...@@ -7,24 +7,29 @@ int levels_display[11] = {0};
// From https://learn.adafruit.com/led-tricks-gamma-correction/the-quick-fix // From https://learn.adafruit.com/led-tricks-gamma-correction/the-quick-fix
const uint8_t gamma8[] = { const uint8_t gamma8[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7,
10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11,
17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17,
25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25,
37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, 25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35,
51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, 35, 36, 37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47,
69, 70, 72, 73, 74, 75, 77, 78, 79, 81, 82, 83, 85, 86, 87, 89, 48, 49, 50, 50, 51, 52, 54, 55, 56, 57, 58, 59, 60, 61,
90, 92, 93, 95, 96, 98, 99,101,102,104,105,107,109,110,112,114, 62, 63, 64, 66, 67, 68, 69, 70, 72, 73, 74, 75, 77, 78,
115,117,119,120,122,124,126,127,129,131,133,135,137,138,140,142, 79, 81, 82, 83, 85, 86, 87, 89, 90, 92, 93, 95, 96, 98,
144,146,148,150,152,154,156,158,160,162,164,167,169,171,173,175, 99, 101, 102, 104, 105, 107, 109, 110, 112, 114, 115, 117, 119, 120,
177,180,182,184,186,189,191,193,196,198,200,203,205,208,210,213, 122, 124, 126, 127, 129, 131, 133, 135, 137, 138, 140, 142, 144, 146,
215,218,220,223,225,228,231,233,236,239,241,244,247,249,252,255 }; 148, 150, 152, 154, 156, 158, 160, 162, 164, 167, 169, 171, 173, 175,
177, 180, 182, 184, 186, 189, 191, 193, 196, 198, 200, 203, 205, 208,
210, 213, 215, 218, 220, 223, 225, 228, 231, 233, 236, 239, 241, 244,
247, 249, 252, 255
};
void fade() { void fade()
{
for (int i = 0; i < 11; i++) { for (int i = 0; i < 11; i++) {
int level = gamma8[levels[i]]; int level = gamma8[levels[i]];
if (levels_display[i] > 0) { if (levels_display[i] > 0) {
...@@ -42,7 +47,8 @@ void fade() { ...@@ -42,7 +47,8 @@ void fade() {
/* /*
* main() is called when l0dable is loaded and executed. * main() is called when l0dable is loaded and executed.
*/ */
int main(void) { int main(void)
{
// l0dables are running on a separate, exclusive-to-l0dables core. // l0dables are running on a separate, exclusive-to-l0dables core.
// Busy-waiting will not block the main operating system on core0 from // Busy-waiting will not block the main operating system on core0 from
// running - but it will drain batteries. // running - but it will drain batteries.
......
l0dables/lib/hardware.c
+ 28
− 27
View file @ cbea5657
...@@ -26,8 +26,7 @@ void SystemCoreClockUpdate(void) ...@@ -26,8 +26,7 @@ void SystemCoreClockUpdate(void)
// Determine the clock source and frequency // Determine the clock source and frequency
clk_src = (MXC_GCR->clkcn & MXC_F_GCR_CLKCN_CLKSEL); clk_src = (MXC_GCR->clkcn & MXC_F_GCR_CLKCN_CLKSEL);
switch (clk_src) switch (clk_src) {
{
case MXC_S_GCR_CLKCN_CLKSEL_HIRC: case MXC_S_GCR_CLKCN_CLKSEL_HIRC:
base_freq = HIRC_FREQ; base_freq = HIRC_FREQ;
break; break;
...@@ -57,7 +56,8 @@ void SystemCoreClockUpdate(void) ...@@ -57,7 +56,8 @@ void SystemCoreClockUpdate(void)
SystemCoreClock = base_freq >> div; SystemCoreClock = base_freq >> div;
} }
__weak void SystemInit() { __weak void SystemInit()
{
// Enable FPU. // Enable FPU.
SCB->CPACR |= SCB_CPACR_CP10_Msk | SCB_CPACR_CP11_Msk; SCB->CPACR |= SCB_CPACR_CP10_Msk | SCB_CPACR_CP11_Msk;
__DSB(); __DSB();
...@@ -68,7 +68,8 @@ __weak void SystemInit() { ...@@ -68,7 +68,8 @@ __weak void SystemInit() {
// Invalidate cache and wait until ready // Invalidate cache and wait until ready
MXC_ICC1->invalidate = 1; MXC_ICC1->invalidate = 1;
while (!(MXC_ICC1->cache_ctrl & MXC_F_ICC_CACHE_CTRL_CACHE_RDY)); while (!(MXC_ICC1->cache_ctrl & MXC_F_ICC_CACHE_CTRL_CACHE_RDY))
;
// Enable Cache // Enable Cache
MXC_ICC1->cache_ctrl |= MXC_F_ICC_CACHE_CTRL_CACHE_EN; MXC_ICC1->cache_ctrl |= MXC_F_ICC_CACHE_CTRL_CACHE_EN;
......
lib/card10/card10.c
+ 4
− 3
View file @ cbea5657
...@@ -199,7 +199,8 @@ void card10_diag(void) ...@@ -199,7 +199,8 @@ void card10_diag(void)
#endif #endif
} }
void core1_start(void *isr) { void core1_start(void *isr)
{
MXC_GCR->gp0 = (uint32_t)isr; MXC_GCR->gp0 = (uint32_t)isr;
MXC_GCR->perckcn1 &= ~MXC_F_GCR_PERCKCN1_CPU1; MXC_GCR->perckcn1 &= ~MXC_F_GCR_PERCKCN1_CPU1;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment