From c92305221770bb1316d026c200d569ca4e930e42 Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Thu, 28 Aug 2025 16:20:17 -0400 Subject: merge libc files, new init methods for libjove --- apps/init/main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'apps/init/main.c') diff --git a/apps/init/main.c b/apps/init/main.c index 6deb12c..b802bf4 100644 --- a/apps/init/main.c +++ b/apps/init/main.c @@ -14,18 +14,19 @@ spin_fail(void) for(;;); } -extern void __libc_heap_init(uintptr_t); +extern void __libjove_init(uint8_t, void*); +extern void __libjove_init_untypeddir(uint8_t); +extern void __libjove_heap_init(uintptr_t); void main(void *message_ptr) { - __jove_syscall_obj = INIT_OBJECT_MESSAGE; - __jove_syscall_ptr = message_ptr; - _jove_alloc_objdir_inplace(&__jove_untyped_directory, &__rootdir, INIT_OBJECT_UNTYPED_DIR); + __libjove_init(INIT_OBJECT_MESSAGE, message_ptr); + __libjove_init_untypeddir(INIT_OBJECT_UNTYPED_DIR); + pager_setup(); + __libjove_heap_init((uintptr_t)message_ptr + KO_MESSAGE_BYTES); jove_kprintf("Hello, Userland!\n"); - pager_setup(); - __libc_heap_init((uintptr_t)message_ptr + KO_MESSAGE_BYTES); for(;;); } -- cgit v1.2.1