From 14c36e203e45cf97d16c762a8a252a985a482e1a Mon Sep 17 00:00:00 2001 From: flysand7 Date: Fri, 4 Aug 2023 04:17:41 +1100 Subject: [PATCH] pass dyn instead of dynv to loader --- src/loader/loader-self-reloc.c | 4 ++-- src/loader/loader.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/loader/loader-self-reloc.c b/src/loader/loader-self-reloc.c index a4e3627..25f5576 100644 --- a/src/loader/loader-self-reloc.c +++ b/src/loader/loader-self-reloc.c @@ -119,7 +119,7 @@ static void _dbg_printf(char *fmt, ...) { va_end(args); } -extern void loader_entry(u64 *sp, Elf64_Dyn *dynv, u64 *aux); +extern void loader_entry(u64 *sp, u64 *dyn, u64 *aux); void _dlstart_reloc_c(u64 *sp, Elf64_Dyn *dynv) { _dbg_print_string("Entered dynamic loader\n"); @@ -266,7 +266,7 @@ void _dlstart_reloc_c(u64 *sp, Elf64_Dyn *dynv) { } _dbg_printf("Self-relocation finished. Entering the loader\n"); - loader_entry(sp, dynv, aux); + loader_entry(sp, dyn, aux); _syscall_exit(0); } diff --git a/src/loader/loader.c b/src/loader/loader.c index 676a811..7d784f9 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -3,7 +3,7 @@ #include #include "syscall.c" -void loader_entry(u64 *sp, Elf64_Dyn *dynv, u64 *aux) { +void loader_entry(u64 *sp, u64 *dynv, u64 *aux) { char str[] = "Hello world??\n"; _syscall_write(STDOUT_FILENO, str, sizeof str); _syscall_exit(0);