fef/ardix
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

init: fix init array pointer dereference bullshit

Browse source
This commit is contained in:
anna 2021-08-05 16:29:18 +02:00
parent 6287cb79be
commit c24b183c60
Signed by: fef
GPG key ID: EC22E476DC2D3D84
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/at91sam3x8e/handle_reset.c
View file

@ -22,11 +22,11 @@ __naked __noreturn void handle_reset(void)
memmove(&_srelocate, &_etext, (size_t)(&_erelocate) - (size_t)(&_srelocate)); memmove(&_srelocate, &_etext, (size_t)(&_erelocate) - (size_t)(&_srelocate));
memset(&_szero, 0, (size_t)(&_ezero) - (size_t)(&_szero)); memset(&_szero, 0, (size_t)(&_ezero) - (size_t)(&_szero));
for (uint32_t *fn = &__preinit_array_start; fn != &__preinit_array_end; fn++) for (uintptr_t *fn = &__preinit_array_start; fn != &__preinit_array_end; fn++)
( (void (*)(void))fn )(); ( (void (*)(void))*fn )();
for (uint32_t *fn = &__init_array_start; fn != &__init_array_end; fn++) for (uintptr_t *fn = &__init_array_start; fn != &__init_array_end; fn++)
( (void (*)(void))fn )(); ( (void (*)(void))*fn )();
/* start the Kernel */ /* start the Kernel */
main(); main();

4
arch/at91sam3x8e/include/arch/linker.h
View file

@ -60,9 +60,9 @@ extern uintptr_t __preinit_array_end;
* standard C library. They are executed after the preinit array, so memory * standard C library. They are executed after the preinit array, so memory
* allocation is already available. * allocation is already available.
*/ */
extern uint32_t __init_array_start; extern uintptr_t __init_array_start;
/** @brief End of init array. */ /** @brief End of init array. */
extern uint32_t __init_array_end; extern uintptr_t __init_array_end;
/* /*
* This file is part of Ardix. * This file is part of Ardix.