fix: syscalls

Author: m-hilgendorf

packages/std/packages/stub/include/aarch64/debug.h

@@ -1,5 +1,5 @@
 #pragma once
-#ifdef SOFTWARE_BREAKPOINTS
+#ifdef BREAKPOINTS
 	#define BREAK do { asm volatile ("brk #0"); } while (0)
 #else
 	#define BREAK

packages/std/packages/stub/include/aarch64/syscall.h

@@ -1,21 +1,21 @@
 #pragma once
 
-static long syscall1 (
+static inline long syscall1 (
 	long nr,
 	long arg1
 ) {
 	register long x8 asm("x8") = nr;
 	register long x0 asm("x0") = arg1;
 	asm volatile (
-		"svc #0;"
-		"ret;"
-		:
+		"svc #0"
+		: "=r"(x0)
 		: "r"(x8), "r"(x0)
 		: "memory"
 	);
+	return x0;
 }
 
-static long syscall2 (
+static inline long syscall2 (
 	long nr,
 	long arg1,
 	long arg2
@@ -24,15 +24,15 @@ static long syscall2 (
 	register long x0 asm("x0") = arg1;
 	register long x1 asm("x1") = arg2;
 	asm volatile (
-		"svc #0;"
-		"ret;"
-		:
+		"svc #0"
+		: "=r"(x0)
 		: "r"(x8), "r"(x0), "r"(x1)
 		: "memory"
 	);
+	return x0;
 }
 
-static long syscall3 (
+static inline long syscall3 (
 	long nr,
 	long arg1,
 	long arg2,
@@ -43,15 +43,15 @@ static long syscall3 (
 	register long x1 asm("x1") = arg2;
 	register long x2 asm("x2") = arg3;
 	asm volatile (
-		"svc #0;"
-		"ret;"
-		:
+		"svc #0"
+		: "=r"(x0)
 		: "r"(x8), "r"(x0), "r"(x1), "r"(x2)
 		: "memory"
 	);
+	return x0;
 }
 
-static long syscall4 (
+static inline long syscall4 (
 	long nr,
 	long arg1,
 	long arg2,
@@ -64,15 +64,15 @@ static long syscall4 (
 	register long x2 asm("x2") = arg3;
 	register long x3 asm("x3") = arg4;
 	asm volatile (
-		"svc #0;"
-		"ret;"
-		:
+		"svc #0"
+		: "=r"(x0)
 		: "r"(x8), "r"(x0), "r"(x1), "r"(x2), "r"(x3)
 		: "memory"
 	);
+	return x0;
 }
 
-static long syscall5 (
+static inline long syscall5 (
 	long nr,
 	long arg1,
 	long arg2,
@@ -87,15 +87,15 @@ static long syscall5 (
 	register long x3 asm("x3") = arg4;
 	register long x4 asm("x4") = arg5;
 	asm volatile (
-		"svc #0;"
-		"ret;"
-		:
+		"svc #0"
+		: "=r"(x0)
 		: "r"(x8), "r"(x0), "r"(x1), "r"(x2), "r"(x3), "r"(x4)
 		: "memory"
 	);
+	return x0;
 }
 
-static long syscall6 (
+static inline long syscall6 (
 	long nr,
 	long arg1,
 	long arg2,
@@ -112,10 +112,10 @@ static long syscall6 (
 	register long x4 asm("x4") = arg5;
 	register long x5 asm("x5") = arg6;
 	asm volatile (
-		"svc #0;"
-		"ret;"
-		:
+		"svc #0"
+		: "=r"(x0)
 		: "r"(x8), "r"(x0), "r"(x1), "r"(x2), "r"(x3), "r"(x4), "r"(x5)
 		: "memory"
 	);
-}
+	return x0;
+}

packages/std/packages/stub/include/syscall.h

@@ -81,22 +81,12 @@ static inline int close (int fd) {
 	return (int)syscall1(__NR_close, (long)fd);
 }
 
-static inline long lseek (int fd, off_t offset, int whence) {
-	return syscall3(__NR_lseek, (long)fd, (long)offset, (long)whence);
-}
-
-static inline int getrlimit (int resource, rlimit_t* rlim) {
-	return (int)syscall2(__NR_getrlimit, (long)resource, (long)rlim);
-}
-
-static inline int pread64 (int fd, void* buf, size_t count, off_t offset) {
-	return (int)syscall4(__NR_pread64, (long)fd, (long)buf, (long)count, (long)offset);
+static inline int stat (const char* pathname, stat_t* statbuf) {
+	return (int)syscall2(__NR_stat, (long)pathname, (long)statbuf);
 }
 
-static inline void exit (int status)
-{
-	syscall1(__NR_exit, (long)status);
-	__builtin_unreachable();
+static inline long lseek (int fd, off_t offset, int whence) {
+	return syscall3(__NR_lseek, (long)fd, (long)offset, (long)whence);
 }
 
 static inline void* mmap(
@@ -122,22 +112,31 @@ static inline int munmap(void* addr, uint64_t len) {
 	return (int)syscall2(__NR_munmap, (long)addr, (long)len);
 }
 
-static inline int getcwd(char* buf, size_t size) {
-	return (int)syscall2(__NR_getcwd, (long)buf, (long)size);
+static inline int pread64 (int fd, void* buf, size_t count, off_t offset) {
+	return (int)syscall4(__NR_pread64, (long)fd, (long)buf, (long)count, (long)offset);
 }
 
-static inline int stat (const char* pathname, stat_t* statbuf) {
-	return (int)syscall2(__NR_stat, (long)pathname, (long)statbuf);
+static inline int execve (char* pathname, char** argv, char** envp) {
+	return (int)syscall3(__NR_execve, (long)pathname, (long)argv, (long)envp);
 }
 
-static inline long getrandom (void *buf, size_t buflen, unsigned int flags) {
-	return (long)syscall3(__NR_getrandom, (long)buf, (long)buflen, (long)flags);
+static inline void exit (int status) {
+	syscall1(__NR_exit, (long)status);
+	__builtin_unreachable();
 }
 
-static inline int execve (char* pathname, char** argv, char** envp) {
-	return (int)syscall3(__NR_execve, (long)pathname, (long)argv, (long)envp);
+static inline int getcwd(char* buf, size_t size) {
+	return (int)syscall2(__NR_getcwd, (long)buf, (long)size);
 }
 
 static inline long readlink (const char* pathname, char* buf, size_t bufsiz) {
 	return syscall3(__NR_readlink, (long)pathname, (long)buf, (long)bufsiz);
 }
+
+static inline int getrlimit (int resource, rlimit_t* rlim) {
+	return (int)syscall2(__NR_getrlimit, (long)resource, (long)rlim);
+}
+
+static inline long getrandom (void *buf, size_t buflen, unsigned int flags) {
+	return (long)syscall3(__NR_getrandom, (long)buf, (long)buflen, (long)flags);
+}

packages/std/packages/stub/include/x86_64/syscall.h

@@ -1,106 +1,106 @@
 #pragma once
-__attribute__((naked))
-static long syscall1 (
+
+static inline long syscall1 (
 	long nr,
 	long arg1
 ) {
+	long ret;
 	register long rax asm("rax") = nr;
 	register long rdi asm("rdi") = arg1;
 	asm volatile (
-		"syscall;"
-		"ret;"
-		:
+		"syscall"
+		: "=a"(ret)
 		: "a"(rax), "D"(rdi)
 		: "rcx", "r11", "memory"
 	);
+	return ret;
 }
 
-__attribute__((naked))
-static long syscall2 (
+static inline long syscall2 (
 	long nr,
 	long arg1,
 	long arg2
 ) {
+	long ret;
 	register long rax asm("rax") = nr;
 	register long rdi asm("rdi") = arg1;
 	register long rsi asm("rsi") = arg2;
 	asm volatile (
-		"syscall;"
-		"ret;"
-		:
+		"syscall"
+		: "=a"(ret)
 		: "a"(rax), "D"(rdi), "S"(rsi)
 		: "rcx", "r11", "memory"
 	);
+	return ret;
 }
 
-__attribute__((naked))
-static long syscall3 (
+static inline long syscall3 (
 	long nr,
 	long arg1,
 	long arg2,
 	long arg3
 ) {
+	long ret;
 	register long rax asm("rax") = nr;
 	register long rdi asm("rdi") = arg1;
 	register long rsi asm("rsi") = arg2;
 	register long rdx asm("rdx") = arg3;
 	asm volatile (
-		"syscall;"
-		"ret;"
-		:
+		"syscall"
+		: "=a"(ret)
 		: "a"(rax), "D"(rdi), "S"(rsi), "d"(rdx)
 		: "rcx", "r11", "memory"
 	);
+	return ret;
 }
 
-__attribute__((naked))
-static long syscall4 (
+static inline long syscall4 (
 	long nr,
 	long arg1,
 	long arg2,
 	long arg3,
 	long arg4
 ) {
+	long ret;
 	register long rax asm("rax") = nr;
 	register long rdi asm("rdi") = arg1;
 	register long rsi asm("rsi") = arg2;
 	register long rdx asm("rdx") = arg3;
 	register long r10 asm("r10") = arg4;
 	asm volatile (
-		"syscall;"
-		"ret;"
-		:
+		"syscall"
+		: "=a"(ret)
 		: "a"(rax), "D"(rdi), "S"(rsi), "d"(rdx), "r"(r10)
 		: "rcx", "r11", "memory"
 	);
+	return ret;
 }
 
-__attribute__((naked))
-static long syscall5 (
+static inline long syscall5 (
 	long nr,
 	long arg1,
 	long arg2,
 	long arg3,
 	long arg4,
 	long arg5
 ) {
+	long ret;
 	register long rax asm("rax") = nr;
 	register long rdi asm("rdi") = arg1;
 	register long rsi asm("rsi") = arg2;
 	register long rdx asm("rdx") = arg3;
 	register long r10 asm("r10") = arg4;
 	register long r8 asm("r8") = arg5;
 	asm volatile (
-		"syscall;"
-		"ret;"
-		:
+		"syscall"
+		: "=a"(ret)
 		: "a"(rax), "D"(rdi), "S"(rsi), "d"(rdx), "r"(r10), "r"(r8)
 		: "rcx", "r11", "memory"
 	);
+	return ret;
 }
 
-__attribute__((naked))
-static long syscall6 (
+static inline long syscall6 (
 	long nr,
 	long arg1,
 	long arg2,
@@ -109,6 +109,7 @@ static long syscall6 (
 	long arg5,
 	long arg6
 ) {
+	long ret;
 	register long rax asm("rax") = nr;
 	register long rdi asm("rdi") = arg1;
 	register long rsi asm("rsi") = arg2;
@@ -117,10 +118,10 @@ static long syscall6 (
 	register long r8 asm("r8") = arg5;
 	register long r9 asm("r9") = arg6;
 	asm volatile (
-		"syscall;"
-		"ret;"
-		:
+		"syscall"
+		: "=a"(ret)
 		: "a"(rax), "D"(rdi), "S"(rsi), "d"(rdx), "r"(r10), "r"(r8), "r"(r9)
 		: "rcx", "r11", "memory"
 	);
+	return ret;
 }