summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-09-08 22:43:14 -0400
committerRich Felker <dalias@aerifal.cx>2012-09-08 22:43:14 -0400
commit208eb584efbf995e0c5d92f76d5f4c08ae0054b4 (patch)
tree1d2613b937b371ca2fb3a1d550758ac298a4ebb7 /arch/mips
parentfe0260400eebb613338a720c9568c10ab4f17225 (diff)
downloadmusl-208eb584efbf995e0c5d92f76d5f4c08ae0054b4.tar.gz
syscall organization overhaul
now public syscall.h only exposes __NR_* and SYS_* constants and the variadic syscall function. no macros or inline functions, no __syscall_ret or other internal details, no 16-/32-bit legacy syscall renaming, etc. this logic has all been moved to src/internal/syscall.h with the arch-specific parts in arch/$(ARCH)/syscall_arch.h, and the amount of arch-specific stuff has been reduced to a minimum. changes still need to be reviewed/double-checked. minimal testing on i386 and mips has already been performed.
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/bits/syscall.h87
-rw-r--r--arch/mips/syscall_arch.h41
2 files changed, 41 insertions, 87 deletions
diff --git a/arch/mips/bits/syscall.h b/arch/mips/bits/syscall.h
index 9a2de2e3..66af2277 100644
--- a/arch/mips/bits/syscall.h
+++ b/arch/mips/bits/syscall.h
@@ -1,50 +1,3 @@
-#define __SYSCALL_LL_E(x) \
-((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
-((union { long long ll; long l[2]; }){ .ll = x }).l[1]
-#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
-
-#define __SYSCALL_SSLEN 16
-
-long (__syscall)(long, ...);
-
-static __inline long __syscall0(long n)
-{
- return (__syscall)(n);
-}
-
-static __inline long __syscall1(long n, long a)
-{
- return (__syscall)(n, a);
-}
-
-static __inline long __syscall2(long n, long a, long b)
-{
- return (__syscall)(n, a, b);
-}
-
-static __inline long __syscall3(long n, long a, long b, long c)
-{
- return (__syscall)(n, a, b, c);
-}
-
-static __inline long __syscall4(long n, long a, long b, long c, long d)
-{
- return (__syscall)(n, a, b, c, d);
-}
-
-static __inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
- return (__syscall)(n, a, b, c, d, e);
-}
-
-static __inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
-{
- return (__syscall)(n, a, b, c, d, e, f);
-}
-
-#define __socketcall(nm,a,b,c,d,e,f) syscall(SYS_##nm, a, b, c, d, e, f)
-#define __socketcall_cp(nm,a,b,c,d,e,f) syscall_cp(SYS_##nm, a, b, c, d, e, f)
-
#define __NR_syscall 4000
#define __NR_exit 4001
#define __NR_fork 4002
@@ -416,26 +369,6 @@ static __inline long __syscall6(long n, long a, long b, long c, long d, long e,
#define __NR_process_vm_readv 4345
#define __NR_process_vm_writev 4346
-/* fixup legacy 32-bit-vs-lfs64 junk */
-#undef __NR_fcntl
-#undef __NR_getdents
-#undef __NR_ftruncate
-#undef __NR_truncate
-#undef __NR_stat
-#undef __NR_fstat
-#undef __NR_lstat
-#undef __NR_statfs
-#undef __NR_fstatfs
-#define __NR_fcntl __NR_fcntl64
-#define __NR_getdents __NR_getdents64
-#define __NR_ftruncate __NR_ftruncate64
-#define __NR_truncate __NR_truncate64
-#define __NR_stat __NR_stat64
-#define __NR_fstat __NR_fstat64
-#define __NR_lstat __NR_lstat64
-#define __NR_statfs __NR_statfs64
-#define __NR_fstatfs __NR_fstatfs64
-
/* Repeated with SYS_ prefix */
#define SYS_syscall 4000
@@ -808,23 +741,3 @@ static __inline long __syscall6(long n, long a, long b, long c, long d, long e,
#define SYS_setns 4344
#define SYS_process_vm_readv 4345
#define SYS_process_vm_writev 4346
-
-/* fixup legacy 32-bit-vs-lfs64 junk */
-#undef SYS_fcntl
-#undef SYS_getdents
-#undef SYS_ftruncate
-#undef SYS_truncate
-#undef SYS_stat
-#undef SYS_fstat
-#undef SYS_lstat
-#undef SYS_statfs
-#undef SYS_fstatfs
-#define SYS_fcntl SYS_fcntl64
-#define SYS_getdents SYS_getdents64
-#define SYS_ftruncate SYS_ftruncate64
-#define SYS_truncate SYS_truncate64
-#define SYS_stat SYS_stat64
-#define SYS_fstat SYS_fstat64
-#define SYS_lstat SYS_lstat64
-#define SYS_statfs SYS_statfs64
-#define SYS_fstatfs SYS_fstatfs64
diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h
new file mode 100644
index 00000000..68e8dce3
--- /dev/null
+++ b/arch/mips/syscall_arch.h
@@ -0,0 +1,41 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
+
+#define __SYSCALL_SSLEN 16
+
+static inline long __syscall0(long n)
+{
+ return (__syscall)(n);
+}
+
+static inline long __syscall1(long n, long a)
+{
+ return (__syscall)(n, a);
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+ return (__syscall)(n, a, b);
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+ return (__syscall)(n, a, b, c);
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+ return (__syscall)(n, a, b, c, d);
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+ return (__syscall)(n, a, b, c, d, e);
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+ return (__syscall)(n, a, b, c, d, e, f);
+}