mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-28 07:18:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aarch64 loader passes os (#1042)

Browse source 
* 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.
This commit is contained in:
Jōshin 2023-12-31 09:42:36 -05:00 • committed by GitHub
parent d8ad34686a
commit 14fe83facd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libc/crt/crt.S
View file

@ -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

28
libc/runtime/cosmo2.c
View file

@ -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);
}