Skip to content

capdl-loader-app: use sel4muslcsys_setup_morecore_region() #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
axel-h wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

capdl-loader-app: use sel4muslcsys_setup_morecore_region() #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7103849
capdl-loader-app: comment end of conditional block
Nov 14, 2023
249b674
capdl-loader-app: adapt to sel4muslcsys change
Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions capdl-loader-app/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <string.h>
#include <stdint.h>
#include <inttypes.h>
#include <muslcsys/sys_morecore.h>
#include <sel4platsupport/platsupport.h>
#include <cpio/cpio.h>
#include <simple-default/simple-default.h>
Expand Down Expand Up @@ -2117,20 +2118,19 @@ static void init_system(CDL_Model *spec)
* for stdin, stdout, and stderr. The heap pool base address and size is
* expected to be page aligned.
*/
extern char *morecore_area;
extern size_t morecore_size;
static char ALIGN(PAGE_SIZE_4K) debug_libc_morecore_area[PAGE_SIZE_4K];

static void CONSTRUCTOR(MUSLCSYS_WITH_VSYSCALL_PRIORITY) init_bootinfo(void)
{
/* Init memory area for musl. */
morecore_area = debug_libc_morecore_area;
morecore_size = sizeof(debug_libc_morecore_area);
sel4muslcsys_setup_morecore_region(
debug_libc_morecore_area,
sizeof(debug_libc_morecore_area));

/* Allow us to print via seL4_Debug_PutChar. */
platsupport_serial_setup_bootinfo_failsafe();
}
#endif
#endif /* CONFIG_DEBUG_BUILD */

int main(void)
{
Expand Down