update syscall macros so both ldso and libc can use them

ldso/ldso/sparc/dl-syscalls.h

@@ -1,172 +1,6 @@
-/*
- * This file contains the system call macros and syscall 
- * numbers used by the shared library loader.
- *
- * NOTE: This should be integrated/moved to 
- *       sysdeps/linux/sparc/bits/syscalls.h at some point ...
- */
-
-#define _SYSCALL_H
-#include <bits/sysnum.h>
-
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-
-/* Here are the macros which define how this platform makes
- * system calls.  This particular variant does _not_ set 
- * errno (note how _dl_errno is used in __syscall_return) since
- * these will get called before the errno symbol is dynamicly 
- * linked. */
-
-#define __syscall_return(type, res) \
-do { \
-	if (res < -255 || res >= 0) \
-		return (type) res; \
-	__set_errno(-res); \
-	res = -1; \
-	return (type) res; \
-} while (0)
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-	long __res; \
-	register long __g1 __asm__ ("g1") = __NR_##name; \
-	__asm__ __volatile__ ( \
-		"t 0x10\n\t" \
-		"bcc 1f\n\t" \
-		"mov %%o0, %0\n\t" \
-		"sub %%g0, %%o0, %0\n\t" \
-		"1:\n\t" \
-		: "=r" (__res)\
-		: "r" (__g1) \
-		: "o0", "cc"); \
-	__syscall_return(type, __res); \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-	long __res; \
-	register long __g1 __asm__ ("g1") = __NR_##name; \
-	register long __o0 __asm__ ("o0") = (long)(arg1); \
-	__asm__ __volatile__ ( \
-		"t 0x10\n\t" \
-		"bcc 1f\n\t" \
-		"mov %%o0, %0\n\t" \
-		"sub %%g0, %%o0, %0\n\t" \
-		"1:\n\t" \
-		: "=r" (__res), "=&r" (__o0) \
-		: "1" (__o0), "r" (__g1) \
-		: "cc"); \
-	__syscall_return(type, __res); \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-	long __res; \
-	register long __g1 __asm__ ("g1") = __NR_##name; \
-	register long __o0 __asm__ ("o0") = (long)(arg1); \
-	register long __o1 __asm__ ("o1") = (long)(arg2); \
-	__asm__ __volatile__ ( \
-		"t 0x10\n\t" \
-		"bcc 1f\n\t" \
-		"mov %%o0, %0\n\t" \
-		"sub %%g0, %%o0, %0\n\t" \
-		"1:\n\t" \
-		: "=r" (__res), "=&r" (__o0) \
-		: "1" (__o0), "r" (__o1), "r" (__g1) \
-		: "cc"); \
-	__syscall_return(type, __res); \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-	long __res; \
-	register long __g1 __asm__ ("g1") = __NR_##name; \
-	register long __o0 __asm__ ("o0") = (long)(arg1); \
-	register long __o1 __asm__ ("o1") = (long)(arg2); \
-	register long __o2 __asm__ ("o2") = (long)(arg3); \
-	__asm__ __volatile__ ( \
-		"t 0x10\n\t" \
-		"bcc 1f\n\t" \
-		"mov %%o0, %0\n\t" \
-		"sub %%g0, %%o0, %0\n\t" \
-		"1:\n\t" \
-		: "=r" (__res), "=&r" (__o0) \
-		: "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \
-		: "cc"); \
-	__syscall_return(type, __res); \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-	long __res; \
-	register long __g1 __asm__ ("g1") = __NR_##name; \
-	register long __o0 __asm__ ("o0") = (long)(arg1); \
-	register long __o1 __asm__ ("o1") = (long)(arg2); \
-	register long __o2 __asm__ ("o2") = (long)(arg3); \
-	register long __o3 __asm__ ("o3") = (long)(arg4); \
-	__asm__ __volatile__ ( \
-		"t 0x10\n\t" \
-		"bcc 1f\n\t" \
-		"mov %%o0, %0\n\t" \
-		"sub %%g0, %%o0, %0\n\t" \
-		"1:\n\t" \
-		: "=r" (__res), "=&r" (__o0) \
-		: "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \
-		: "cc"); \
-	__syscall_return(type, __res); \
-} 
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-	long __res; \
-	register long __g1 __asm__ ("g1") = __NR_##name; \
-	register long __o0 __asm__ ("o0") = (long)(arg1); \
-	register long __o1 __asm__ ("o1") = (long)(arg2); \
-	register long __o2 __asm__ ("o2") = (long)(arg3); \
-	register long __o3 __asm__ ("o3") = (long)(arg4); \
-	register long __o4 __asm__ ("o4") = (long)(arg5); \
-	__asm__ __volatile__ ( \
-		"t 0x10\n\t" \
-		"bcc 1f\n\t" \
-		"mov %%o0, %0\n\t" \
-		"sub %%g0, %%o0, %0\n\t" \
-		"1:\n\t" \
-		: "=r" (__res), "=&r" (__o0) \
-		: "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \
-		: "cc"); \
-	__syscall_return(type, __res); \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5,type6,arg6) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
-{ \
-	long __res; \
-	register long __g1 __asm__ ("g1") = __NR_##name; \
-	register long __o0 __asm__ ("o0") = (long)(arg1); \
-	register long __o1 __asm__ ("o1") = (long)(arg2); \
-	register long __o2 __asm__ ("o2") = (long)(arg3); \
-	register long __o3 __asm__ ("o3") = (long)(arg4); \
-	register long __o4 __asm__ ("o4") = (long)(arg5); \
-	register long __o5 __asm__ ("o5") = (long)(arg6); \
-	__asm__ __volatile__ ( \
-		"t 0x10\n\t" \
-		"bcc 1f\n\t" \
-		"mov %%o0, %0\n\t" \
-		"sub %%g0, %%o0, %0\n\t" \
-		"1:\n\t" \
-		: "=r" (__res), "=&r" (__o0) \
-		: "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__o5), "r" (__g1) \
-		: "cc"); \
-	__syscall_return(type, __res); \
-}

libc/sysdeps/linux/sparc/bits/syscalls.h

@@ -4,6 +4,10 @@
 # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
+#define __UCLIBC_MMAP_HAS_6_ARGS__
+
+#include <bits/wordsize.h>
+
 /* This includes the `__NR_<name>' syscall numbers taken from the Linux kernel
  * header files.  It also defines the traditional `SYS_<name>' macros for older
  * programs.  */
@@ -13,47 +17,106 @@
 # define __set_errno(val) (*__errno_location ()) = (val)
 #endif
 
-/*
-   macros taken from glibc-2.3/sysdeps/unix/sysv/linux/sparc/sysdep.h
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
-   Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
-*/
-
 #ifndef __ASSEMBLER__
 
+#undef __SYSCALL_STRING
+#if __WORDSIZE == 32
+# define __SYSCALL_STRING \
+	"t 0x10\n\t" \
+	"bcc 1f\n\t" \
+	"mov %%o0, %0\n\t" \
+	"sub %%g0, %%o0, %0\n\t" \
+	"1:\n\t"
+# define __SYSCALL_RES_CHECK (__res < -255 || __res >= 0)
+#elif __WORDSIZE == 64
+# define __SYSCALL_STRING \
+	"t 0x6d\n\t" \
+	"sub %%g0, %%o0, %0\n\t" \
+	"movcc %%xcc, %%o0, %0\n\t"
+# define __SYSCALL_RES_CHECK (__res >= 0)
+#else
+# error unknown __WORDSIZE
+#endif
+
+#define __SYSCALL_RETURN(type) \
+	if (__SYSCALL_RES_CHECK) \
+		return (type) __res; \
+	__set_errno (-__res); \
+	return (type) -1;
+
 #undef _syscall0
 #define _syscall0(type,name) \
 type name(void) \
 { \
-return (type) (INLINE_SYSCALL(name, 0)); \
+long __res; \
+register long __g1 __asm__ ("g1") = __NR_##name; \
+__asm__ __volatile__ (__SYSCALL_STRING \
+		      : "=r" (__res)\
+		      : "r" (__g1) \
+		      : "o0", "cc"); \
+__SYSCALL_RETURN(type) \
 }
 
 #undef _syscall1
 #define _syscall1(type,name,type1,arg1) \
 type name(type1 arg1) \
 { \
-return (type) (INLINE_SYSCALL(name, 1, arg1)); \
+long __res; \
+register long __g1 __asm__ ("g1") = __NR_##name; \
+register long __o0 __asm__ ("o0") = (long)(arg1); \
+__asm__ __volatile__ (__SYSCALL_STRING \
+		      : "=r" (__res), "=&r" (__o0) \
+		      : "1" (__o0), "r" (__g1) \
+		      : "cc"); \
+__SYSCALL_RETURN(type) \
 }
 
 #undef _syscall2
 #define _syscall2(type,name,type1,arg1,type2,arg2) \
 type name(type1 arg1,type2 arg2) \
 { \
-return (type) (INLINE_SYSCALL(name, 2, arg1, arg2)); \
+long __res; \
+register long __g1 __asm__ ("g1") = __NR_##name; \
+register long __o0 __asm__ ("o0") = (long)(arg1); \
+register long __o1 __asm__ ("o1") = (long)(arg2); \
+__asm__ __volatile__ (__SYSCALL_STRING \
+		      : "=r" (__res), "=&r" (__o0) \
+		      : "1" (__o0), "r" (__o1), "r" (__g1) \
+		      : "cc"); \
+__SYSCALL_RETURN(type) \
 }
 
 #undef _syscall3
 #define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
 type name(type1 arg1,type2 arg2,type3 arg3) \
 { \
-return (type) (INLINE_SYSCALL(name, 3, arg1, arg2, arg3)); \
+long __res; \
+register long __g1 __asm__ ("g1") = __NR_##name; \
+register long __o0 __asm__ ("o0") = (long)(arg1); \
+register long __o1 __asm__ ("o1") = (long)(arg2); \
+register long __o2 __asm__ ("o2") = (long)(arg3); \
+__asm__ __volatile__ (__SYSCALL_STRING \
+		      : "=r" (__res), "=&r" (__o0) \
+		      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \
+		      : "cc"); \
+__SYSCALL_RETURN(type) \
 }
 
 #undef _syscall4
 #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
 type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
 { \
-return (type) (INLINE_SYSCALL(name, 4, arg1, arg2, arg3, arg4)); \
+long __res; \
+register long __g1 __asm__ ("g1") = __NR_##name; \
+register long __o0 __asm__ ("o0") = (long)(arg1); \
+register long __o1 __asm__ ("o1") = (long)(arg2); \
+register long __o2 __asm__ ("o2") = (long)(arg3); \
+register long __o3 __asm__ ("o3") = (long)(arg4); \
+__asm__ __volatile__ (__SYSCALL_STRING \
+		      : "=r" (__res), "=&r" (__o0) \
+		      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \
+		      : "cc"); \
+__SYSCALL_RETURN(type) \
 } 
 
 #undef _syscall5
@@ -61,7 +124,18 @@ return (type) (INLINE_SYSCALL(name, 4, arg1, arg2, arg3, arg4)); \
 	  type5,arg5) \
 type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
 { \
-return (type) (INLINE_SYSCALL(name, 5, arg1, arg2, arg3, arg4, arg5)); \
+long __res; \
+register long __g1 __asm__ ("g1") = __NR_##name; \
+register long __o0 __asm__ ("o0") = (long)(arg1); \
+register long __o1 __asm__ ("o1") = (long)(arg2); \
+register long __o2 __asm__ ("o2") = (long)(arg3); \
+register long __o3 __asm__ ("o3") = (long)(arg4); \
+register long __o4 __asm__ ("o4") = (long)(arg5); \
+__asm__ __volatile__ (__SYSCALL_STRING \
+		      : "=r" (__res), "=&r" (__o0) \
+		      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \
+		      : "cc"); \
+__SYSCALL_RETURN(type) \
 }
 
 #undef _syscall6
@@ -69,132 +143,20 @@ return (type) (INLINE_SYSCALL(name, 5, arg1, arg2, arg3, arg4, arg5)); \
 	  type5,arg5,type6,arg6) \
 type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6) \
 { \
-return (type) (INLINE_SYSCALL(name, 6, arg1, arg2, arg3, arg4, arg5, arg6)); \
+long __res; \
+register long __g1 __asm__ ("g1") = __NR_##name; \
+register long __o0 __asm__ ("o0") = (long)(arg1); \
+register long __o1 __asm__ ("o1") = (long)(arg2); \
+register long __o2 __asm__ ("o2") = (long)(arg3); \
+register long __o3 __asm__ ("o3") = (long)(arg4); \
+register long __o4 __asm__ ("o4") = (long)(arg5); \
+register long __o5 __asm__ ("o5") = (long)(arg6); \
+__asm__ __volatile__ (__SYSCALL_STRING \
+		      : "=r" (__res), "=&r" (__o0) \
+		      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__o5), "r" (__g1) \
+		      : "cc"); \
+__SYSCALL_RETURN(type) \
 }
 
-#undef _syscall7
-#define _syscall7(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5,type6,arg6,type7,arg7) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6,type7 arg7) \
-{ \
-return (type) (INLINE_SYSCALL(name, 7, arg1, arg2, arg3, arg4, arg5, arg6, arg7)); \
-}
-
-#define __SYSCALL_STRING						\
-	"ta	0x10;"							\
-	"bcs	2f;"							\
-	" nop;"								\
-	"1:"								\
-	".subsection 2;"						\
-	"2:"								\
-	"save	%%sp, -192, %%sp;"					\
-	"call	__errno_location;"					\
-	" nop;"								\
-	"st	%%i0,[%%o0];"						\
-	"ba	1b;"							\
-	" restore %%g0, -1, %%o0;"					\
-	".previous;"
-
-#define __SYSCALL_CLOBBERS "g2", "g3", "g4", "g5", "g7",		\
-	"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",			\
-	"f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",		\
-	"f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",		\
-	"f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31",		\
-	"cc", "memory"
-
-#undef INLINE_SYSCALL
-#define INLINE_SYSCALL(name, nr, args...) _INLINE_SYSCALL##nr(name, args)
-
-#define _INLINE_SYSCALL0(name,dummy...)					\
-({									\
-	register long __o0 __asm__ ("o0");				\
-	register long __g1 __asm__ ("g1") = __NR_##name;		\
-	__asm __volatile (__SYSCALL_STRING : "=r" (__g1), "=r" (__o0) :	\
-			  "0" (__g1) :					\
-			  __SYSCALL_CLOBBERS);				\
-	__o0;								\
-})
-
-#define _INLINE_SYSCALL1(name,arg1)						\
-({									\
-	register long __o0 __asm__ ("o0") = (long)(arg1);		\
-	register long __g1 __asm__ ("g1") = __NR_##name;		\
-	__asm __volatile (__SYSCALL_STRING : "=r" (__g1), "=r" (__o0) :	\
-			  "0" (__g1), "1" (__o0) :			\
-			  __SYSCALL_CLOBBERS);				\
-	__o0;								\
-})
-
-#define _INLINE_SYSCALL2(name,arg1,arg2)					\
-({									\
-	register long __o0 __asm__ ("o0") = (long)(arg1);		\
-	register long __o1 __asm__ ("o1") = (long)(arg2);		\
-	register long __g1 __asm__ ("g1") = __NR_##name;		\
-	__asm __volatile (__SYSCALL_STRING : "=r" (__g1), "=r" (__o0) :	\
-			  "0" (__g1), "1" (__o0), "r" (__o1) :		\
-			  __SYSCALL_CLOBBERS);				\
-	__o0;								\
-})
-
-#define _INLINE_SYSCALL3(name,arg1,arg2,arg3)					\
-({									\
-	register long __o0 __asm__ ("o0") = (long)(arg1);		\
-	register long __o1 __asm__ ("o1") = (long)(arg2);		\
-	register long __o2 __asm__ ("o2") = (long)(arg3);		\
-	register long __g1 __asm__ ("g1") = __NR_##name;		\
-	__asm __volatile (__SYSCALL_STRING : "=r" (__g1), "=r" (__o0) :	\
-			  "0" (__g1), "1" (__o0), "r" (__o1),		\
-			  "r" (__o2) :					\
-			  __SYSCALL_CLOBBERS);				\
-	__o0;								\
-})
-
-#define _INLINE_SYSCALL4(name,arg1,arg2,arg3,arg4)				\
-({									\
-	register long __o0 __asm__ ("o0") = (long)(arg1);		\
-	register long __o1 __asm__ ("o1") = (long)(arg2);		\
-	register long __o2 __asm__ ("o2") = (long)(arg3);		\
-	register long __o3 __asm__ ("o3") = (long)(arg4);		\
-	register long __g1 __asm__ ("g1") = __NR_##name;		\
-	__asm __volatile (__SYSCALL_STRING : "=r" (__g1), "=r" (__o0) :	\
-			  "0" (__g1), "1" (__o0), "r" (__o1),		\
-			  "r" (__o2), "r" (__o3) :			\
-			  __SYSCALL_CLOBBERS);				\
-	__o0;								\
-})
-
-#define _INLINE_SYSCALL5(name,arg1,arg2,arg3,arg4,arg5)			\
-({									\
-	register long __o0 __asm__ ("o0") = (long)(arg1);		\
-	register long __o1 __asm__ ("o1") = (long)(arg2);		\
-	register long __o2 __asm__ ("o2") = (long)(arg3);		\
-	register long __o3 __asm__ ("o3") = (long)(arg4);		\
-	register long __o4 __asm__ ("o4") = (long)(arg5);		\
-	register long __g1 __asm__ ("g1") = __NR_##name;		\
-	__asm __volatile (__SYSCALL_STRING : "=r" (__g1), "=r" (__o0) :	\
-			  "0" (__g1), "1" (__o0), "r" (__o1),		\
-			  "r" (__o2), "r" (__o3), "r" (__o4) :		\
-			  __SYSCALL_CLOBBERS);				\
-	__o0;								\
-})
-
-#define _INLINE_SYSCALL6(name,arg1,arg2,arg3,arg4,arg5,arg6)			\
-({									\
-	register long __o0 __asm__ ("o0") = (long)(arg1);		\
-	register long __o1 __asm__ ("o1") = (long)(arg2);		\
-	register long __o2 __asm__ ("o2") = (long)(arg3);		\
-	register long __o3 __asm__ ("o3") = (long)(arg4);		\
-	register long __o4 __asm__ ("o4") = (long)(arg5);		\
-	register long __o5 __asm__ ("o5") = (long)(arg6);		\
-	register long __g1 __asm__ ("g1") = __NR_##name;		\
-	__asm __volatile (__SYSCALL_STRING : "=r" (__g1), "=r" (__o0) :	\
-			  "0" (__g1), "1" (__o0), "r" (__o1),		\
-			  "r" (__o2), "r" (__o3), "r" (__o4),		\
-			  "r" (__o5) :					\
-			  __SYSCALL_CLOBBERS);				\
-	__o0;								\
-})
-
 #endif /* __ASSEMBLER__ */
 #endif /* _BITS_SYSCALLS_H */
-