nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Initialize heap, increase stack size

Browse source
This commit is contained in:
TuxSH 2018-05-04 23:56:01 +02:00
parent dc3099781d
commit 0d344e45af
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fusee/fusee-secondary/src/main.c
View file

@ -14,32 +14,40 @@ char g_bct0[0x8000];
/* Allow for main(int argc, void **argv) signature. */ /* Allow for main(int argc, void **argv) signature. */
#pragma GCC diagnostic ignored "-Wmain" #pragma GCC diagnostic ignored "-Wmain"
void __init_heap(void) {
extern char* fake_heap_start;
extern char* fake_heap_end;
fake_heap_start = (char*)0xF0000000;
fake_heap_end = (char*)0xFFF00000;
}
int main(int argc, void **argv) { int main(int argc, void **argv) {
stage2_args_t args = {0}; stage2_args_t args = {0};
loader_ctx_t *loader_ctx = get_loader_ctx(); loader_ctx_t *loader_ctx = get_loader_ctx();
if (argc != STAGE2_ARGC || ((args = *((stage2_args_t *)argv[STAGE2_ARGV_ARGUMENT_STRUCT])).version != 0)) { if (argc != STAGE2_ARGC || ((args = *((stage2_args_t *)argv[STAGE2_ARGV_ARGUMENT_STRUCT])).version != 0)) {
generic_panic(); generic_panic();
} }
resume_sd_state((struct mmc *)args.sd_mmc, (FATFS *)args.sd_fs); resume_sd_state((struct mmc *)args.sd_mmc, (FATFS *)args.sd_fs);
/* Copy the BCT0 from unsafe primary memory into our memory. */ /* Copy the BCT0 from unsafe primary memory into our memory. */
strncpy(g_bct0, args.bct0, sizeof(g_bct0)); strncpy(g_bct0, args.bct0, sizeof(g_bct0));
/* TODO: What other hardware init should we do here? */ /* TODO: What other hardware init should we do here? */
/* Setup LFB. */ /* Setup LFB. */
video_resume(args.lfb, args.console_row, args.console_col); video_resume(args.lfb, args.console_row, args.console_col);
printk("Welcome to Atmosph\xe8re Fus\xe9" "e Stage 2!\n"); printk("Welcome to Atmosph\xe8re Fus\xe9" "e Stage 2!\n");
printk("Stage 2 executing from: %s\n", (const char *)argv[STAGE2_ARGV_PROGRAM_PATH]); printk("Stage 2 executing from: %s\n", (const char *)argv[STAGE2_ARGV_PROGRAM_PATH]);
/* This will load all remaining binaries off of the SD. */ /* This will load all remaining binaries off of the SD. */
load_payload(g_bct0); load_payload(g_bct0);
printk("Loaded payloads!\n"); printk("Loaded payloads!\n");
if (loader_ctx->chainload_entrypoint != NULL) { if (loader_ctx->chainload_entrypoint != NULL) {
/* TODO: What do we want to do in terms of argc/argv? */ /* TODO: What do we want to do in terms of argc/argv? */
loader_ctx->chainload_entrypoint(0, NULL); loader_ctx->chainload_entrypoint(0, NULL);

5
fusee/fusee-secondary/src/start.s
View file

@ -33,7 +33,7 @@ _start:
_relocation_loop_end: _relocation_loop_end:
/* Set the stack pointer */ /* Set the stack pointer */
ldr sp, =0x40008000 ldr sp, =0x40010000
mov fp, #0 mov fp, #0
stmfd sp!, {r0, r1} stmfd sp!, {r0, r1}
@ -44,6 +44,9 @@ _start:
sub r2, r2, r0 sub r2, r2, r0
bl memset bl memset
/* Initialize the heap */
bl __init_heap
/* Call global constructors */ /* Call global constructors */
bl __libc_init_array bl __libc_init_array