From f5e48e94a2f4d4bbd6e5628c7f2afafc6dbcc459 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Thu, 7 Mar 2024 17:28:52 -0500 Subject: build: Build mlibc + add distclean target Signed-off-by: Ian Moffett --- lib/mlibc/sysdeps/managarm/aarch64/crt-src/Scrt1.S | 10 ---- lib/mlibc/sysdeps/managarm/aarch64/crt-src/crt0.S | 11 ----- lib/mlibc/sysdeps/managarm/aarch64/crt-src/crti.S | 15 ------ lib/mlibc/sysdeps/managarm/aarch64/crt-src/crtn.S | 11 ----- lib/mlibc/sysdeps/managarm/aarch64/signals.S | 10 ---- lib/mlibc/sysdeps/managarm/aarch64/thread.cpp | 56 ---------------------- lib/mlibc/sysdeps/managarm/aarch64/thread_entry.S | 11 ----- 7 files changed, 124 deletions(-) delete mode 100644 lib/mlibc/sysdeps/managarm/aarch64/crt-src/Scrt1.S delete mode 100644 lib/mlibc/sysdeps/managarm/aarch64/crt-src/crt0.S delete mode 100644 lib/mlibc/sysdeps/managarm/aarch64/crt-src/crti.S delete mode 100644 lib/mlibc/sysdeps/managarm/aarch64/crt-src/crtn.S delete mode 100644 lib/mlibc/sysdeps/managarm/aarch64/signals.S delete mode 100644 lib/mlibc/sysdeps/managarm/aarch64/thread.cpp delete mode 100644 lib/mlibc/sysdeps/managarm/aarch64/thread_entry.S (limited to 'lib/mlibc/sysdeps/managarm/aarch64') diff --git a/lib/mlibc/sysdeps/managarm/aarch64/crt-src/Scrt1.S b/lib/mlibc/sysdeps/managarm/aarch64/crt-src/Scrt1.S deleted file mode 100644 index 3e56608..0000000 --- a/lib/mlibc/sysdeps/managarm/aarch64/crt-src/Scrt1.S +++ /dev/null @@ -1,10 +0,0 @@ -.section .text -.global _start -_start: - mov x0, sp - adr x1, main - - bl __mlibc_entry - brk #0 - -.section .note.GNU-stack,"",%progbits diff --git a/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crt0.S b/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crt0.S deleted file mode 100644 index 5e59593..0000000 --- a/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crt0.S +++ /dev/null @@ -1,11 +0,0 @@ - -.section .text -.global _start -_start: - mov x0, sp - adrp x1, main - add x1, x1, :lo12:main - bl __mlibc_entry - -.section .note.GNU-stack,"",%progbits - diff --git a/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crti.S b/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crti.S deleted file mode 100644 index 4307dfb..0000000 --- a/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crti.S +++ /dev/null @@ -1,15 +0,0 @@ - .ident "aarch64-managarm-mlibc crti" - - .section .init - .global _init -_init: - stp x29, x30, [sp, -16]! - mov x29, sp - - .section .fini - .global _fini -_fini: - stp x29, x30, [sp, -16]! - mov x29, sp - - .section .note.GNU-stack,"",%progbits diff --git a/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crtn.S b/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crtn.S deleted file mode 100644 index 005d870..0000000 --- a/lib/mlibc/sysdeps/managarm/aarch64/crt-src/crtn.S +++ /dev/null @@ -1,11 +0,0 @@ - .ident "aarch64-managarm-mlibc crtn" - - .section .init - ldp x29, x30, [sp], #16 - ret - - .section .fini - ldp x29, x30, [sp], #16 - ret - - .section .note.GNU-stack,"",%progbits diff --git a/lib/mlibc/sysdeps/managarm/aarch64/signals.S b/lib/mlibc/sysdeps/managarm/aarch64/signals.S deleted file mode 100644 index 044767d..0000000 --- a/lib/mlibc/sysdeps/managarm/aarch64/signals.S +++ /dev/null @@ -1,10 +0,0 @@ - -.section .text -.global __mlibc_signal_restore -__mlibc_signal_restore: - ldr x0, =0x80000006 - svc 0 - brk #1 - -.section .note.GNU-stack,"",%progbits - diff --git a/lib/mlibc/sysdeps/managarm/aarch64/thread.cpp b/lib/mlibc/sysdeps/managarm/aarch64/thread.cpp deleted file mode 100644 index 88f1bf3..0000000 --- a/lib/mlibc/sysdeps/managarm/aarch64/thread.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -extern "C" void __mlibc_enter_thread(void *entry, void *user_arg, Tcb *tcb) { - // Wait until our parent sets up the TID. - while(!__atomic_load_n(&tcb->tid, __ATOMIC_RELAXED)) - mlibc::sys_futex_wait(&tcb->tid, 0, nullptr); - - if(mlibc::sys_tcb_set(tcb)) - __ensure(!"sys_tcb_set() failed"); - - tcb->invokeThreadFunc(entry, user_arg); - - auto self = reinterpret_cast(tcb); - - __atomic_store_n(&self->didExit, 1, __ATOMIC_RELEASE); - mlibc::sys_futex_wake(&self->didExit); - - mlibc::sys_thread_exit(); -} - -namespace mlibc { - -static constexpr size_t default_stacksize = 0x200000; - -int sys_prepare_stack(void **stack, void *entry, void *user_arg, void *tcb, size_t *stack_size, size_t *guard_size, void **stack_base) { - if (!*stack_size) - *stack_size = default_stacksize; - *guard_size = 0; - - if (*stack) { - *stack_base = *stack; - } else { - *stack_base = mmap(nullptr, *stack_size, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if(*stack_base == MAP_FAILED) { - return errno; - } - } - - uintptr_t *sp = reinterpret_cast(reinterpret_cast(*stack_base) + *stack_size); - - *--sp = reinterpret_cast(tcb); - *--sp = reinterpret_cast(user_arg); - *--sp = reinterpret_cast(entry); - *stack = reinterpret_cast(sp); - return 0; -} - -} //namespace mlibc diff --git a/lib/mlibc/sysdeps/managarm/aarch64/thread_entry.S b/lib/mlibc/sysdeps/managarm/aarch64/thread_entry.S deleted file mode 100644 index 4cfcb4c..0000000 --- a/lib/mlibc/sysdeps/managarm/aarch64/thread_entry.S +++ /dev/null @@ -1,11 +0,0 @@ - -.section .text -.global __mlibc_start_thread -__mlibc_start_thread: - ldp x0, x1, [sp] - ldr x2, [sp, #16] - add sp, sp, #24 - bl __mlibc_enter_thread - -.section .note.GNU-stack,"",%progbits - -- cgit v1.2.3