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.

19 files changed, 53 insertions, 31 deletions

diff --git a/src/exit/_Exit.c b/src/exit/_Exit.c
index 8ef85a8f..d18b6183 100644
--- a/src/exit/_Exit.c
+++ b/src/exit/_Exit.c
@@ -1,9 +1,8 @@
 #include <stdlib.h>
-#define SYSCALL_NORETURN
 #include "syscall.h"
 
 void _Exit(int ec)
 {
-	syscall1(__NR_exit_group, ec);
-	syscall1(__NR_exit, ec);
+	__syscall(__NR_exit_group, ec);
+	__syscall(__NR_exit, ec);
 }
diff --git a/src/internal/syscall.h b/src/internal/syscall.h
new file mode 100644
index 00000000..819aafe6
--- /dev/null
+++ b/src/internal/syscall.h
@@ -0,0 +1,32 @@
+#ifndef _SYSCALL_H
+#define _SYSCALL_H
+
+/* This header is mostly useless leftover wrapper cruft */
+
+#include <sys/syscall.h>
+
+#define syscall0 syscall
+#define syscall1 syscall
+#define syscall2 syscall
+#define syscall3 syscall
+#define syscall4 syscall
+#define syscall5 syscall
+#define syscall6 syscall
+
+#define socketcall __socketcall
+
+/* the following are needed for iso c functions to use */
+#define __syscall_open(filename, flags, mode) syscall(__NR_open, (filename), (flags)|0100000, (mode))
+#define __syscall_read(fd, buf, len)          syscall(__NR_read, (fd), (buf), (len))
+#define __syscall_write(fd, buf, len)         syscall(__NR_write, (fd), (buf), (len))
+#define __syscall_close(fd)                   syscall(__NR_close, (fd))
+#define __syscall_fcntl(fd, cmd, arg)         syscall(__NR_fcntl, (fd), (cmd), (arg))
+#define __syscall_dup2(old, new)              syscall(__NR_dup2, (old), (new))
+#define __syscall_unlink(path)                syscall(__NR_unlink, (path))
+#define __syscall_getpid()                    syscall(__NR_getpid)
+#define __syscall_kill(pid,sig)               syscall(__NR_kill, (pid), (sig))
+#define __syscall_sigaction(sig,new,old)      syscall(__NR_rt_sigaction, (sig), (new), (old), 8)
+#define __syscall_ioctl(fd,ioc,arg)           syscall(__NR_ioctl, (fd), (ioc), (arg))
+#define __syscall_exit(code)                  syscall(__NR_exit, code)
+
+#endif
diff --git a/src/signal/sigpending.c b/src/signal/sigpending.c
index 7deda256..496025a7 100644
--- a/src/signal/sigpending.c
+++ b/src/signal/sigpending.c
@@ -3,5 +3,5 @@
 
 int sigpending(sigset_t *set)
 {
-	return syscall2(__NR_rt_sigpending, (long)set, SYSCALL_SIGSET_SIZE);
+	return syscall(__NR_rt_sigpending, set, 8);
 }
diff --git a/src/signal/sigsuspend.c b/src/signal/sigsuspend.c
index 0806288c..6c13fce1 100644
--- a/src/signal/sigsuspend.c
+++ b/src/signal/sigsuspend.c
@@ -6,7 +6,7 @@ int sigsuspend(const sigset_t *mask)
 {
 	int ret;
 	CANCELPT_BEGIN;
-	ret = syscall2(__NR_rt_sigsuspend, (long)mask, SYSCALL_SIGSET_SIZE);
+	ret = syscall(__NR_rt_sigsuspend, mask, 8);
 	CANCELPT_END;
 	return ret;
 }
diff --git a/src/signal/sigtimedwait.c b/src/signal/sigtimedwait.c
index 93f31a71..a0edaaf3 100644
--- a/src/signal/sigtimedwait.c
+++ b/src/signal/sigtimedwait.c
@@ -8,7 +8,7 @@ int sigtimedwait(const sigset_t *mask, siginfo_t *si, const struct timespec *tim
 	int ret;
 	CANCELPT_BEGIN;
 	do {
-		ret = syscall4(__NR_rt_sigtimedwait, (long)mask, (long)si, (long)timeout, SYSCALL_SIGSET_SIZE);
+		ret = syscall(__NR_rt_sigtimedwait, mask, si, timeout, 8);
 	} while (ret<0 && errno==EINTR);
 	CANCELPT_END;
 	return ret;
diff --git a/src/thread/__lock.c b/src/thread/__lock.c
index 557c6a62..21cb71a8 100644
--- a/src/thread/__lock.c
+++ b/src/thread/__lock.c
@@ -1,4 +1,3 @@
-#define SYSCALL_RETURN_ERRNO
 #include "pthread_impl.h"
 
 void __lock(volatile int *l)
@@ -8,5 +7,5 @@ void __lock(volatile int *l)
 	 * assignment to optimize non-pathological code with no contention. */
 	while (a_xchg(l, 1))
 		if (spins) spins--, a_spin();
-		else syscall0(__NR_sched_yield);
+		else __syscall(__NR_sched_yield);
 }
diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c
index 988eb70d..b38ea990 100644
--- a/src/thread/__timedwait.c
+++ b/src/thread/__timedwait.c
@@ -1,7 +1,6 @@
 #include <time.h>
 #include <errno.h>
 #include "futex.h"
-#define SYSCALL_RETURN_ERRNO
 #include "syscall.h"
 #include <stdio.h>
 int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, int priv)
@@ -18,7 +17,7 @@ int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespe
 		if (to.tv_sec < 0) return ETIMEDOUT;
 	}
 	if (priv) priv = 128; priv=0;
-	r = syscall4(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0);
+	r = __syscall(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0);
 	if (r == ETIMEDOUT) return r;
 	return 0;
 }
diff --git a/src/thread/__wait.c b/src/thread/__wait.c
index 8c249cd3..b0969bb2 100644
--- a/src/thread/__wait.c
+++ b/src/thread/__wait.c
@@ -1,4 +1,3 @@
-#define SYSCALL_RETURN_ERRNO
 #include "pthread_impl.h"
 
 void __wait(volatile int *addr, volatile int *waiters, int val, int priv)
@@ -11,6 +10,6 @@ void __wait(volatile int *addr, volatile int *waiters, int val, int priv)
 	}
 	if (waiters) a_inc(waiters);
 	while (*addr==val)
-		syscall4(__NR_futex, (long)addr, FUTEX_WAIT|priv, val, 0);
+		__syscall(__NR_futex, (long)addr, FUTEX_WAIT|priv, val, 0);
 	if (waiters) a_dec(waiters);
 }
diff --git a/src/thread/__wake.c b/src/thread/__wake.c
index 048ddcc0..6f2f894a 100644
--- a/src/thread/__wake.c
+++ b/src/thread/__wake.c
@@ -1,9 +1,8 @@
-#define SYSCALL_RETURN_ERRNO
 #include "pthread_impl.h"
 
 void __wake(volatile int *addr, int cnt, int priv)
 {
 	if (priv) priv = 128; priv=0;
 	if (cnt<0) cnt = INT_MAX;
-	syscall3(__NR_futex, (long)addr, FUTEX_WAKE | priv, cnt);
+	__syscall(__NR_futex, (long)addr, FUTEX_WAKE | priv, cnt);
 }
diff --git a/src/thread/pthread_cancel.c b/src/thread/pthread_cancel.c
index 9397ffe9..9f7829e6 100644
--- a/src/thread/pthread_cancel.c
+++ b/src/thread/pthread_cancel.c
@@ -1,7 +1,6 @@
-#define SYSCALL_RETURN_ERRNO
 #include "pthread_impl.h"
 
 int pthread_cancel(pthread_t t)
 {
-	return syscall3(__NR_tgkill, t->pid, t->tid, SIGCANCEL);
+	return pthread_kill(t, SIGCANCEL);
 }
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index fccfa191..3716f75a 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -32,7 +32,7 @@ void __pthread_unwind_next(struct __ptcb *cb)
 		exit(0);
 
 	if (self->detached && self->map_base) {
-		syscall4(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
+		syscall(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
 		__unmapself(self->map_base, self->map_size);
 	}
 
@@ -91,7 +91,7 @@ static void rsyscall_handler(int sig, siginfo_t *si, void *ctx)
 		return;
 	}
 
-	if (__syscall(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2],
+	if (syscall(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2],
 		rs.arg[3], rs.arg[4], rs.arg[5]) < 0 && !rs.err) rs.err=errno;
 
 	a_inc(&rs.cnt);
@@ -140,7 +140,7 @@ static int rsyscall(int nr, long a, long b, long c, long d, long e, long f)
 	while((i=rs.cnt)) __wait(&rs.cnt, 0, i, 1);
 
 	if (rs.err) errno = rs.err, ret = -1;
-	else ret = __syscall(nr, a, b, c, d, e, f);
+	else ret = syscall(nr, a, b, c, d, e, f);
 
 	UNLOCK(&rs.lock);
 	return ret;
diff --git a/src/thread/pthread_kill.c b/src/thread/pthread_kill.c
index 9d85fa5b..6448d978 100644
--- a/src/thread/pthread_kill.c
+++ b/src/thread/pthread_kill.c
@@ -1,7 +1,6 @@
-#define SYSCALL_RETURN_ERRNO
 #include "pthread_impl.h"
 
 int pthread_kill(pthread_t t, int sig)
 {
-	return syscall3(__NR_tgkill, t->pid, t->tid, sig);
+	return __syscall(__NR_tgkill, t->pid, t->tid, sig);
 }
diff --git a/src/time/clock_nanosleep.c b/src/time/clock_nanosleep.c
index ffb9a8af..c777c179 100644
--- a/src/time/clock_nanosleep.c
+++ b/src/time/clock_nanosleep.c
@@ -1,4 +1,3 @@
-#define SYSCALL_RETURN_ERRNO
 #include <time.h>
 #include "syscall.h"
 #include "libc.h"
@@ -7,7 +6,7 @@ int clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct
 {
 	int ret;
 	CANCELPT_BEGIN;
-	ret = syscall4(__NR_clock_nanosleep, clk, flags, (long)req, (long)rem);
+	ret = __syscall(__NR_clock_nanosleep, clk, flags, req, rem);
 	CANCELPT_END;
 	return ret;
 }
diff --git a/src/time/gettimeofday.c b/src/time/gettimeofday.c
index 2b8a287d..521b4d57 100644
--- a/src/time/gettimeofday.c
+++ b/src/time/gettimeofday.c
@@ -1,9 +1,8 @@
-#define SYSCALL_RETURN_ERRNO
 #include <sys/time.h>
 #include "syscall.h"
 
 int gettimeofday(struct timeval *tv, void *tz)
 {
-	syscall2(__NR_gettimeofday, (long)tv, 0);
+	__syscall(__NR_gettimeofday, tv, 0);
 	return 0;
 }
diff --git a/src/time/time.c b/src/time/time.c
index 3457dade..2d2cfd44 100644
--- a/src/time/time.c
+++ b/src/time/time.c
@@ -1,4 +1,3 @@
-#define SYSCALL_RETURN_ERRNO
 #include <time.h>
 #include <sys/time.h>
 #include "syscall.h"
@@ -6,7 +5,7 @@
 time_t time(time_t *t)
 {
 	struct timeval tv;
-	syscall2(__NR_gettimeofday, (long)&tv, 0);
+	__syscall(__NR_gettimeofday, &tv, 0);
 	if (t) *t = tv.tv_sec;
 	return tv.tv_sec;
 }
diff --git a/src/unistd/ftruncate.c b/src/unistd/ftruncate.c
index db5da844..f57ea120 100644
--- a/src/unistd/ftruncate.c
+++ b/src/unistd/ftruncate.c
@@ -4,7 +4,7 @@
 
 int ftruncate(int fd, off_t length)
 {
-	return syscall3(__NR_ftruncate, fd, SYSCALL_LL(length));
+	return syscall(__NR_ftruncate, fd, __SYSCALL_LL(length));
 }
 
 LFS64(ftruncate);
diff --git a/src/unistd/pread.c b/src/unistd/pread.c
index 534215ac..16320e2c 100644
--- a/src/unistd/pread.c
+++ b/src/unistd/pread.c
@@ -6,7 +6,7 @@ ssize_t pread(int fd, void *buf, size_t size, off_t ofs)
 {
 	ssize_t r;
 	CANCELPT_BEGIN;
-	r = syscall5(__NR_pread, fd, (long)buf, size, SYSCALL_LL(ofs));
+	r = syscall(__NR_pread, fd, buf, size, __SYSCALL_LL(ofs));
 	CANCELPT_END;
 	return r;
 }
diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c
index 56ed6b4c..c4d3aff5 100644
--- a/src/unistd/pwrite.c
+++ b/src/unistd/pwrite.c
@@ -6,7 +6,7 @@ ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs)
 {
 	ssize_t r;
 	CANCELPT_BEGIN;
-	r = syscall5(__NR_pwrite, fd, (long)buf, size, SYSCALL_LL(ofs));
+	r = syscall(__NR_pwrite, fd, buf, size, __SYSCALL_LL(ofs));
 	CANCELPT_END;
 	return r;
 }
diff --git a/src/unistd/truncate.c b/src/unistd/truncate.c
index 322349d2..3edacd12 100644
--- a/src/unistd/truncate.c
+++ b/src/unistd/truncate.c
@@ -4,7 +4,7 @@
 
 int truncate(const char *path, off_t length)
 {
-	return syscall3(__NR_truncate, (long)path, SYSCALL_LL(length));
+	return syscall(__NR_truncate, path, __SYSCALL_LL(length));
 }
 
 LFS64(truncate);