summaryrefslogtreecommitdiff
path: root/arch/x86_64
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-19 21:36:10 -0400
committerRich Felker <dalias@aerifal.cx>2011-03-19 21:36:10 -0400
commit685e40bb09f5f24a2af54ea09c97328808f76990 (patch)
tree73bbf60045bb3a9c8af4f2639e8adb2ad1ea6994 /arch/x86_64
parent462dbfc20788a6c9dd1ea4bb1cef086aa189615a (diff)
downloadmusl-685e40bb09f5f24a2af54ea09c97328808f76990.tar.gz
syscall overhaul part two - unify public and internal syscall interface
with this patch, the syscallN() functions are no longer needed; a variadic syscall() macro allows syscalls with anywhere from 0 to 6 arguments to be made with a single macro name. also, manually casting each non-integer argument with (long) is no longer necessary; the casts are hidden in the macros. some source files which depended on being able to define the old macro SYSCALL_RETURNS_ERRNO have been modified to directly use __syscall() instead of syscall(). references to SYSCALL_SIGSET_SIZE and SYSCALL_LL have also been changed. x86_64 has not been tested, and may need a follow-up commit to fix any minor bugs/oversights.
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/bits/fcntl.h7
-rw-r--r--arch/x86_64/bits/syscall.h64
-rw-r--r--arch/x86_64/syscall.h113
3 files changed, 69 insertions, 115 deletions
diff --git a/arch/x86_64/bits/fcntl.h b/arch/x86_64/bits/fcntl.h
index 802c3d14..2487a308 100644
--- a/arch/x86_64/bits/fcntl.h
+++ b/arch/x86_64/bits/fcntl.h
@@ -14,12 +14,15 @@
#define O_NOFOLLOW 0400000
#define O_CLOEXEC 02000000
-#ifdef _GNU_SOURCE
-#define O_NDELAY O_NONBLOCK
+/* Extensions, but in the reserved namespace, so OK */
#define O_ASYNC 020000
#define O_DIRECT 040000
+#define O_LARGEFILE 0
#define O_NOATIME 01000000
+#define O_NDELAY O_NONBLOCK
#define F_DUPFD_CLOEXEC 1030
+
+#ifdef _GNU_SOURCE
#define FAPPENT O_APPEND
#define FFSYNC O_FSYNC
#define FASYNC O_ASYNC
diff --git a/arch/x86_64/bits/syscall.h b/arch/x86_64/bits/syscall.h
index ca75019d..c6f12230 100644
--- a/arch/x86_64/bits/syscall.h
+++ b/arch/x86_64/bits/syscall.h
@@ -1,3 +1,67 @@
+#define __SYSCALL_LL(x) (x)
+
+static inline long __syscall0(long __n)
+{
+ unsigned long __ret;
+ __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n) : "rcx", "r11", "memory");
+ return __ret;
+}
+
+static inline long __syscall1(long __n, long __a1)
+{
+ unsigned long __ret;
+ __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1) : "rcx", "r11", "memory");
+ return __ret;
+}
+
+static inline long __syscall2(long __n, long __a1, long __a2)
+{
+ unsigned long __ret;
+ __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2)
+ : "rcx", "r11", "memory");
+ return __ret;
+}
+
+static inline long __syscall3(long __n, long __a1, long __a2, long __a3)
+{
+ unsigned long __ret;
+ __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2),
+ "d"(__a3) : "rcx", "r11", "memory");
+ return __ret;
+}
+
+static inline long __syscall4(long __n, long __a1, long __a2, long __a3, long __a4)
+{
+ unsigned long __ret;
+ register long __r10 __asm__("r10") = __a4;
+ __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2),
+ "d"(__a3), "r"(__r10): "rcx", "r11", "memory");
+ return __ret;
+}
+
+static inline long __syscall5(long __n, long __a1, long __a2, long __a3, long __a4, long __a5)
+{
+ unsigned long __ret;
+ register long __r10 __asm__("r10") = __a4;
+ register long__ r8 __asm__("r8") = __a5;
+ __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2),
+ "d"(__a3), "r"(__r10), "r"(__r8) : "rcx", "r11", "memory");
+ return __ret;
+}
+
+static inline long __syscall6(long __n, long __a1, long __a2, long __a3, long __a4, long __a5, long __a6)
+{
+ unsigned long __ret;
+ register long __r10 __asm__("r10") = __a4;
+ register long __r8 __asm__("r8") = __a5;
+ register long __r9 __asm__("r9") = __a6;
+ __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2),
+ "d"(__a3), "r"(__r10), "r"(__r8), "r"(__r9) : "rcx", "r11", "memory");
+ return __ret;
+}
+
+#define __socketcall(nm, a, b, c, d, e, f) syscall(__NR_##nm, a, b, c, d, e, f)
+
#define __NR_read 0
#define __NR_write 1
#define __NR_open 2
diff --git a/arch/x86_64/syscall.h b/arch/x86_64/syscall.h
deleted file mode 100644
index 9f22e6ba..00000000
--- a/arch/x86_64/syscall.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef _SYSCALL_H
-#define _SYSCALL_H
-
-#include <sys/syscall.h>
-
-#define SYSCALL_LL(x) x, 0
-#define SYSCALL_SIGSET_SIZE 8
-
-#if defined(SYSCALL_NORETURN)
-static inline long __syscall_ret(unsigned long r)
-{
- for(;;);
- return 0;
-}
-#elif defined(SYSCALL_RETURN_ERRNO)
-static inline long __syscall_ret(unsigned long r)
-{
- return -r;
-}
-#else
-extern long __syscall_ret(unsigned long);
-#endif
-
-// 64: di, si, dx, r10, r8, r9
-// 32: ebx, ecx, edx, esi, edi, ebp
-
-#define SYSCALL "syscall"
-
-static inline long syscall0(long n)
-{
- unsigned long ret;
- __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n) : "rcx", "r11", "memory");
- return __syscall_ret(ret);
-}
-
-static inline long syscall1(long n, long a1)
-{
- unsigned long ret;
- __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1) : "rcx", "r11", "memory");
- return __syscall_ret(ret);
-}
-
-static inline long syscall2(long n, long a1, long a2)
-{
- unsigned long ret;
- __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2)
- : "rcx", "r11", "memory");
- return __syscall_ret(ret);
-}
-
-static inline long syscall3(long n, long a1, long a2, long a3)
-{
- unsigned long ret;
- __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
- "d"(a3) : "rcx", "r11", "memory");
- return __syscall_ret(ret);
-}
-
-static inline long syscall4(long n, long a1, long a2, long a3, long a4)
-{
- unsigned long ret;
- register long r10 __asm__("r10") = a4;
- __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
- "d"(a3), "r"(r10): "rcx", "r11", "memory");
- return __syscall_ret(ret);
-}
-
-static inline long syscall5(long n, long a1, long a2, long a3, long a4,
- long a5)
-{
- unsigned long ret;
- register long r10 __asm__("r10") = a4;
- register long r8 __asm__("r8") = a5;
- __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
- "d"(a3), "r"(r10), "r"(r8) : "rcx", "r11", "memory");
- return __syscall_ret(ret);
-}
-
-static inline long syscall6(long n, long a1, long a2, long a3, long a4,
- long a5, long a6)
-{
- unsigned long ret;
- register long r10 __asm__("r10") = a4;
- register long r8 __asm__("r8") = a5;
- register long r9 __asm__("r9") = a6;
- __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
- "d"(a3), "r"(r10), "r"(r8), "r"(r9) : "rcx", "r11", "memory");
- return __syscall_ret(ret);
-}
-
-#undef O_LARGEFILE
-#define O_LARGEFILE 0100000
-
-#define socketcall(nm, a, b, c, d, e, f) syscall6(__NR_##nm, \
- (long)a, (long)b, (long)c, (long)d, (long)e, (long)f)
-
-/* the following are needed for iso c functions to use */
-#define __syscall_open(filename, flags, mode) syscall3(__NR_open, (long)(filename), (flags)|O_LARGEFILE, (mode))
-#define __syscall_read(fd, buf, len) syscall3(__NR_read, (fd), (long)(buf), (len))
-#define __syscall_write(fd, buf, len) syscall3(__NR_write, (fd), (long)(buf), (len))
-#define __syscall_close(fd) syscall1(__NR_close, (fd))
-#define __syscall_fcntl(fd, cmd, arg) syscall3(__NR_fcntl, (fd), (cmd), (long)(arg))
-#define __syscall_dup2(old, new) syscall2(__NR_dup2, (old), (new))
-#define __syscall_unlink(path) syscall1(__NR_unlink, (long)(path))
-#define __syscall_getpid() syscall0(__NR_getpid)
-#define __syscall_kill(pid,sig) syscall2(__NR_kill, (pid), (sig))
-#define __syscall_sigaction(sig,new,old) syscall4(__NR_rt_sigaction, (sig), (long)(new), (long)(old), SYSCALL_SIGSET_SIZE)
-#define __syscall_ioctl(fd,ioc,arg) syscall3(__NR_ioctl, (fd), (ioc), (long)(arg))
-#define __syscall_exit(code) syscall1(__NR_exit, code)
-
-long __syscall(long, ...);
-
-#endif