Implement ARM64 Support

bsd/arm/_types.h

@@ -19,8 +19,10 @@ typedef short                   __int16_t;
 typedef unsigned short          __uint16_t;
 typedef int                     __int32_t;
 typedef unsigned int            __uint32_t;
+#ifndef DARLING_LINUX_MIGCOM
 typedef long long               __int64_t;
 typedef unsigned long long      __uint64_t;
+#endif
 
 typedef long                    __darwin_intptr_t;
 typedef unsigned int            __darwin_natural_t;
@@ -52,9 +54,14 @@ typedef int                     __darwin_ct_rune_t;     /* ct_rune_t */
 typedef union {
 	char            __mbstate8[128];
 	long long       _mbstateL;                      /* for alignment */
+#ifndef DARLING_LINUX_MIGCOM
 } __mbstate_t;
 
 typedef __mbstate_t             __darwin_mbstate_t;     /* mbstate_t */
+#else
+// Redefinition conflict
+} __darwin_mbstate_t;
+#endif
 
 #if defined(__PTRDIFF_TYPE__)
 typedef __PTRDIFF_TYPE__        __darwin_ptrdiff_t;     /* ptr1 - ptr2 */

darling/src/libsystem_kernel/CMakeLists.txt

@@ -10,7 +10,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(emulation/linux)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -msse3 -w -fblocks -ffreestanding")
+if(TARGET_i386 OR TARGET_x86_64)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -msse3")
+endif()
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w -fblocks -ffreestanding")
 
 # Why -bind_at_load is necessary:
 # I couldn't find something like -Bsymbolic in Apple's ld

darling/src/libsystem_kernel/emulation/linux/base.c

@@ -18,11 +18,47 @@ long __unknown_syscall_machdep(int nr, ...)
 }
 
 VISIBLE
-int __linux_syscall(int nr, long a1, long a2, long a3, long a4, long a5, long a6)
+int __linux_syscall_6args(int nr, long a1, long a2, long a3, long a4, long a5, long a6)
 {
 	return linux_syscall(a1, a2, a3, a4, a5, a6, nr);
 }
 
+VISIBLE
+int __linux_syscall_noargs(int nr)
+{
+	return __linux_syscall_6args(nr, 0, 0, 0, 0, 0, 0);
+}
+
+VISIBLE
+int __linux_syscall_1arg(int nr, long a1)
+{
+	return __linux_syscall_6args(nr, a1, 0, 0, 0, 0, 0);
+}
+
+VISIBLE
+int __linux_syscall_2args(int nr, long a1, long a2)
+{
+	return __linux_syscall_6args(nr, a1, a2, 0, 0, 0, 0);
+}
+
+VISIBLE
+int __linux_syscall_3args(int nr, long a1, long a2, long a3)
+{
+	return __linux_syscall_6args(nr, a1, a2, a3, 0, 0, 0);
+}
+
+VISIBLE
+int __linux_syscall_4args(int nr, long a1, long a2, long a3, long a4)
+{
+	return __linux_syscall_6args(nr, a1, a2, a3, a4, 0, 0);
+}
+
+VISIBLE
+int __linux_syscall_5args(int nr, long a1, long a2, long a3, long a4, long a5)
+{
+	return __linux_syscall_6args(nr, a1, a2, a3, a4, a5, 0);
+}
+
 #ifdef __TESTING
 void _start()
 {

darling/src/libsystem_kernel/emulation/linux/base.h

@@ -21,8 +21,13 @@ long linux_syscall(long a1, long a2, long a3, long a4, long a5, long a6, int nr)
 
 #ifndef BUILDING_BASE_C
 
-VISIBLE
-int __linux_syscall(int nr, ...);
+VISIBLE int __linux_syscall_noargs(int);
+VISIBLE int __linux_syscall_1arg(int,long);
+VISIBLE int __linux_syscall_2args(int,long,long);
+VISIBLE int __linux_syscall_3args(int,long,long,long);
+VISIBLE int __linux_syscall_4args(int,long,long,long,long);
+VISIBLE int __linux_syscall_5args(int,long,long,long,long,long);
+VISIBLE int __linux_syscall_6args(int,long,long,long,long,long,long);
 
 #endif /* BUILDING_BASE_C */
 

darling/src/libsystem_kernel/emulation/linux/bsdthread/bsdthread_register.c

@@ -81,6 +81,13 @@ void pthread_entry_point_wrapper(void* self, int thread_port, void* funptr,
 	register void*         arg4 asm("edx") = funarg;
 	register unsigned long arg5 asm("edi") = stack_addr;
 	register unsigned int  arg6 asm("esi") = flags;
+#elif __arm64__
+	register void*         arg1 asm("x0") = self;
+	register int           arg2 asm("w1") = thread_port;
+	register void*         arg3 asm("x2") = funptr;
+	register void*         arg4 asm("x3") = funarg;
+	register unsigned long arg5 asm("x4") = stack_addr;
+	register unsigned int  arg6 asm("w5") = flags;
 #endif
 
 #if __x86_64__
@@ -105,6 +112,14 @@ void pthread_entry_point_wrapper(void* self, int thread_port, void* funptr,
 		"r"(arg1),"r"(arg2),"r"(arg3),"r"(arg4),"r"(arg5),"r"(arg6),
 		[pthread_entry_point] "rmi"(pthread_entry_point)
 	);
+#elif __arm64__
+	__asm__ __volatile__ (
+		"br %[pthread_entry_point]\n"
+		::
+		// Arguments follow the usual arm64 calling conventions.
+		"r"(arg1),"r"(arg2),"r"(arg3),"r"(arg4),"r"(arg5),"r"(arg6),
+		[pthread_entry_point] "r"(pthread_entry_point)
+	);
 #else
 	#error "Missing assembly for architecture"
 	// pthread_entry_point(self, thread_port, funptr, funarg, stack_addr, flags);
@@ -146,6 +161,13 @@ void wqueue_entry_point_asm_jump(void* self, int thread_port, void* stackaddr,
 	register void* arg4 asm("edx") = item;
 	register int   arg5 asm("edi") = reuse;
 	register int   arg6 asm("esi") = nevents;
+#elif __arm64__
+	register void* arg1 asm("x0") = self;
+	register int   arg2 asm("w1") = thread_port;
+	register void* arg3 asm("x2") = stackaddr;
+	register void* arg4 asm("x3") = item;
+	register int   arg5 asm("w4") = reuse;
+	register int   arg6 asm("w5") = nevents;
 #endif
 
 #if __x86_64__
@@ -170,6 +192,14 @@ void wqueue_entry_point_asm_jump(void* self, int thread_port, void* stackaddr,
 		"r"(arg1),"r"(arg2),"r"(arg3),"r"(arg4),"r"(arg5),"r"(arg6),
 		[wqueue_entry_point] "rmi"(wqueue_entry_point)
 	);
+#elif defined(__arm64__)
+	__asm__ __volatile__ (
+		"br %[wqueue_entry_point]\n"
+		::
+		// Arguments follow the usual arm64 calling conventions.
+		"r"(arg1),"r"(arg2),"r"(arg3),"r"(arg4),"r"(arg5),"r"(arg6),
+		[wqueue_entry_point] "r"(wqueue_entry_point)
+	);
 #else
 	#error "Missing assembly for architecture"
 	// wqueue_entry_point(self, thread_port, stackaddr, item, reuse, nevents);

darling/src/libsystem_kernel/emulation/linux/elfcalls_wrapper.c

@@ -2,6 +2,7 @@
 #include <elfcalls.h>
 #include <dlfcn.h>
 #include "simple.h"
+#include "base.h"
 
 extern struct elf_calls* _elfcalls;
 
@@ -92,6 +93,16 @@ void __dserver_close_socket(int socket) {
 	return elfcalls()->dserver_close_socket(socket);
 };
 
+VISIBLE
+void* __darling_thread_get_tsd() {
+	return elfcalls()->get_tsd();
+}
+
+VISIBLE
+void __darling_thread_set_tsd(void* value) {
+	elfcalls()->set_tsd(value);
+}
+
 int __dserver_get_process_lifetime_pipe() {
 	return elfcalls()->dserver_get_process_lifetime_pipe();
 }

darling/src/libsystem_kernel/emulation/linux/elfcalls_wrapper.h

@@ -33,6 +33,9 @@ int __dserver_per_thread_socket(void);
 void __dserver_per_thread_socket_refresh(void);
 void __dserver_close_socket(int socket);
 
+void* __darling_thread_get_tsd();
+void __darling_thread_set_tsd(void* value);
+
 int __dserver_get_process_lifetime_pipe(void);
 int __dserver_process_lifetime_pipe_refresh(void);
 void __dserver_close_process_lifetime_pipe(int fd);

darling/src/libsystem_kernel/emulation/linux/ext/epoll_create.c

@@ -6,22 +6,8 @@
 extern long cerror(int __err);
 
 VISIBLE
-int epoll_create (int __size)
+int epoll_create (__unused int __size)
 {
-	#if defined(__NR_epoll_create)
-		int rv;
-
-		rv = LINUX_SYSCALL(__NR_epoll_create, __size);
-		if (rv < 0)
-		{
-			cerror(errno_linux_to_bsd(-rv));
-			return -1;
-		}
-
-		return rv;
-	#else
-		// The size argument in __NR_epoll_create is ignored
-		return epoll_create1(0);
-	#endif
+	return epoll_create1(0);
 }
 

darling/src/libsystem_kernel/emulation/linux/ext/sys/epoll.h

@@ -2,12 +2,6 @@
 #define LINUX_EPOLL_H
 #include <stdint.h>
 
-#define epoll_create	__linux_epoll_create
-#define epoll_create1	__linux_epoll_create1
-#define epoll_ctl		__linux_epoll_ctl
-#define epoll_wait		__linux_epoll_wait
-#define epoll_pwait		__linux_epoll_pwait
-
 #ifndef __THROW
 #	define __THROW
 #endif
@@ -34,6 +28,14 @@ enum EPOLL_EVENTS
 #define EPOLL_CTL_DEL 2
 #define EPOLL_CTL_MOD 3
 
+#if defined(__x86_64__) || defined(__i386__)
+#define __EPOLL_PACKED __attribute__ ((__packed__))
+#elif defined(__arm64__)
+#define __EPOLL_PACKED
+#else
+#error "Missing __EPOLL_PACKED definition for arch"
+#endif
+
 typedef union epoll_data
 {
 	void *ptr;
@@ -46,10 +48,12 @@ struct epoll_event
 {
 	uint32_t events;
 	epoll_data_t data;
-} __attribute__((packed));
+} __EPOLL_PACKED;
 
 extern int epoll_create (int __size) __THROW;
 
+extern int epoll_create1 (int __flags);
+
 extern int epoll_ctl (int __epfd, int __op, int __fd,
 						struct epoll_event *__event) __THROW;
 

darling/src/libsystem_kernel/emulation/linux/fcntl/open.h

@@ -4,21 +4,77 @@
 long sys_open(const char* filename, int flags, unsigned int mode);
 long sys_open_nocancel(const char* filename, int flags, unsigned int mode);
 
+
+#if defined(__arm64__)
+#define LINUX_O_DIRECTORY 040000
+#define LINUX_O_NOFOLLOW 0100000
+#define LINUX_O_DIRECT 0200000
+#define LINUX_O_LARGEFILE 0400000
+#endif
+
+// Based on <bits/fcntl-linux.h>
+#define LINUX_O_ACCMODE 0003
 #define LINUX_O_RDONLY 00
 #define LINUX_O_WRONLY 01
 #define LINUX_O_RDWR 02
+
+#ifndef LINUX_O_CREAT
 #define LINUX_O_CREAT 0100
+#endif
+#ifndef LINUX_O_EXCL
 #define LINUX_O_EXCL 0200
+#endif
+#ifndef LINUX_O_NOCTTY
 #define LINUX_O_NOCTTY 0400
+#endif
+#ifndef LINUX_O_TRUNC
 #define LINUX_O_TRUNC 01000
+#endif
+#ifndef LINUX_O_APPEND
 #define LINUX_O_APPEND 02000
+#endif
+#ifndef LINUX_O_NONBLOCK
 #define LINUX_O_NONBLOCK 04000
+#endif
+#ifndef LINUX_O_NDELAY
+#define LINUX_O_NDELAY O_NONBLOCK
+#endif
+#ifndef LINUX_O_SYNC
 #define LINUX_O_SYNC 04010000
+#endif
+#ifndef LINUX_O_ASYNC
 #define LINUX_O_ASYNC 020000
-#define LINUX_O_CLOEXEC 02000000
+#endif
+#ifndef LINUX_O_LARGEFILE
 #define LINUX_O_LARGEFILE 0100000
-#define LINUX_O_NOFOLLOW 0400000
+#endif
+#ifndef LINUX_O_DIRECTORY
 #define LINUX_O_DIRECTORY 0200000
+#endif
+#ifndef LINUX_O_NOFOLLOW
+#define LINUX_O_NOFOLLOW 0400000
+#endif
+#ifndef LINUX_O_CLOEXEC
+#define LINUX_O_CLOEXEC 02000000
+#endif
+#ifndef LINUX_O_DIRECT
+#define LINUX_O_DIRECT 040000
+#endif
+#ifndef LINUX_O_NOATIME
+#define LINUX_O_NOATIME 01000000
+#endif
+#ifndef LINUX_O_PATH
+#define LINUX_O_PATH 010000000
+#endif
+#ifndef LINUX_O_DSYNC
+#define LINUX_O_DSYNC 010000
+#endif
+#ifndef LINUX_O_TMPFILE
+#define LINUX_O_TMPFILE (020000000 | LINUX_O_DIRECTORY)
+#endif
+
+#define LINUX_O_FSYNC LINUX_O_SYNC
+
 
 #define BSD_O_RDONLY 0
 #define BSD_O_WRONLY 1

darling/src/libsystem_kernel/emulation/linux/linux-syscall.S

@@ -2,6 +2,9 @@
 .globl _linux_syscall
 .private_extern _linux_syscall
 
+#if defined(__arm64__)
+.balign 4
+#endif
 _linux_syscall:
 
 #if defined(__x86_64__)
@@ -69,6 +72,11 @@ _linux_syscall:
 	pop %ebp
 	ret
 
+#elif defined(__arm64__)
+	mov x8, x6
+	svc #0
+	ret
+
 #else
 
 #	error Missing assembly!