From 14fe83facd456d369de93ca2feb7c1ecabc3901a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C5=8Dshin?= Date: Sun, 31 Dec 2023 09:42:36 -0500 Subject: [PATCH] aarch64 loader passes os (#1042) * Reorder Launch arguments, pass aarch64 os Third and fourth arguments are now identical between cosmo and Launch. By passing sp as argument 4, we save a bit of register juggling. Fourth argument (os) is now always passed by the loader on aarch64. It is not yet processed by cosmo. Pushing this change separately, as the cosmo side turns out to be somewhat more involved. * cosmo2 receives os from loader FreeBSD aarch64 now traps early rather than pretending to be Linux. o/aarch64/examples/env.com still works on Linux and Xnu. --- ape/ape-m1.c | 4 ++-- ape/launch.S | 9 ++++----- ape/loader.c | 4 ++-- libc/crt/crt.S | 5 +++-- libc/runtime/cosmo2.c | 28 +++++++++++++++++++--------- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/ape/ape-m1.c b/ape/ape-m1.c index 874f452e1..4c32ebf85 100644 --- a/ape/ape-m1.c +++ b/ape/ape-m1.c @@ -726,10 +726,10 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd, register long *x0 __asm__("x0") = sp; register char *x2 __asm__("x2") = path; + register int x3 __asm__("x3") = 8; /* _HOSTXNU */ register struct Syslib *x15 __asm__("x15") = lib; register long x16 __asm__("x16") = e->e_entry; __asm__ volatile("mov\tx1,#0\n\t" - "mov\tx3,#0\n\t" "mov\tx4,#0\n\t" "mov\tx5,#0\n\t" "mov\tx6,#0\n\t" @@ -758,7 +758,7 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd, "mov\tx0,#0\n\t" "br\tx16" : /* no outputs */ - : "r"(x0), "r"(x2), "r"(x15), "r"(x16) + : "r"(x0), "r"(x2), "r"(x3), "r"(x15), "r"(x16) : "memory"); __builtin_unreachable(); } diff --git a/ape/launch.S b/ape/launch.S index 87489f9f5..ae2cb58a1 100644 --- a/ape/launch.S +++ b/ape/launch.S @@ -32,15 +32,15 @@ // @param rdi is passed through as-is // @param rsi is address of entrypoint (becomes zero) // @param rdx is passed through as-is -// @param rcx is stack pointer (becomes r8) +// @param rcx is passed through as-is +// @param r8 is stack pointer (becomes zero) // @noreturn Launch: #ifdef __aarch64__ mov x16,x1 - mov sp,x3 + mov sp,x4 mov x1,0 - mov x3,x4 mov x4,0 mov x5,0 mov x6,0 @@ -70,8 +70,7 @@ Launch: #else - mov %rcx,%rsp - mov %r8,%rcx + mov %r8,%rsp xor %r8d,%r8d xor %r9d,%r9d xor %r10d,%r10d diff --git a/ape/loader.c b/ape/loader.c index b11ff2982..744e8fe14 100644 --- a/ape/loader.c +++ b/ape/loader.c @@ -224,7 +224,7 @@ struct ApeLoader { }; EXTERN_C long SystemCall(long, long, long, long, long, long, long, int); -EXTERN_C void Launch(void *, long, void *, void *, int) +EXTERN_C void Launch(void *, long, void *, int, void *) __attribute__((__noreturn__)); extern char __executable_start[]; @@ -768,7 +768,7 @@ __attribute__((__noreturn__)) static void Spawn(int os, char *exe, int fd, Msyscall(dynbase + code, codesize, os); /* call program entrypoint */ - Launch(IsFreebsd() ? sp : 0, dynbase + e->e_entry, exe, sp, os); + Launch(IsFreebsd() ? sp : 0, dynbase + e->e_entry, exe, os, sp); } static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf, diff --git a/libc/crt/crt.S b/libc/crt/crt.S index 591bcd0ce..f55042d09 100644 --- a/libc/crt/crt.S +++ b/libc/crt/crt.S @@ -127,7 +127,7 @@ _start: #if SupportsFreebsd() // save first arg - mov x3,x0 + mov x4,x0 #endif // save original stack pointer @@ -147,7 +147,8 @@ _start: // should be set to zero on other platforms mov x1,x15 -// third arg (x2) is the program path passed by ape-m1.c +// third arg is program path passed by loader +// fourth arg is detected os passed by loader // switch to c code bl cosmo diff --git a/libc/runtime/cosmo2.c b/libc/runtime/cosmo2.c index 7326b22b6..c1f5b9b34 100644 --- a/libc/runtime/cosmo2.c +++ b/libc/runtime/cosmo2.c @@ -79,7 +79,7 @@ static const char *DecodeMagnum(const char *p, long *r) { } wontreturn textstartup void cosmo(long *sp, struct Syslib *m1, char *exename, - long *is_freebsd) { + int os, long *is_freebsd) { // get startup timestamp as early as possible // its used by --strace and also kprintf() %T @@ -117,17 +117,27 @@ wontreturn textstartup void cosmo(long *sp, struct Syslib *m1, char *exename, __program_executable_name = exename; program_invocation_name = argv[0]; __oldstack = (intptr_t)sp; + if (!(hostos = os)) { + if (SupportsFreebsd() && is_freebsd) { + hostos = _HOSTFREEBSD; + } else if (SupportsXnu() && m1) { + hostos = _HOSTXNU; + } else if (SupportsLinux()) { + hostos = _HOSTLINUX; + } else { + notpossible; + } + } - // detect apple m1 environment const char *magnums; - if (SupportsFreebsd() && is_freebsd) { - hostos = _HOSTFREEBSD; + if (IsFreebsd()) { magnums = syscon_freebsd; - } else if (SupportsXnu() && (__syslib = m1)) { - hostos = _HOSTXNU; + } else if (IsXnu()) { + if (!(__syslib = m1)) { + notpossible; + } magnums = syscon_xnu; - } else if (SupportsLinux()) { - hostos = _HOSTLINUX; + } else if (IsLinux()) { magnums = syscon_linux; } else { notpossible; @@ -139,7 +149,7 @@ wontreturn textstartup void cosmo(long *sp, struct Syslib *m1, char *exename, } // check system call abi compatibility - if (SupportsXnu() && __syslib && __syslib->__version < SYSLIB_VERSION) { + if (IsXnu() && __syslib->__version < SYSLIB_VERSION) { sys_write(2, "need newer ape loader\n", 22); _Exit(127); }