From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 11/15] s390: Consolidate Linux syscall definition
Date: Mon, 10 Feb 2020 16:20:34 -0300 [thread overview]
Message-ID: <20200210192038.23588-11-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20200210192038.23588-1-adhemerval.zanella@linaro.org>
The {INTERNAL,INLINE}_SYSCALL are defined only on s390 sysdep.h.
Checked on s390x-linux-gnu and s390-linux-gnu.
---
sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 95 ----------------
sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 97 -----------------
sysdeps/unix/sysv/linux/s390/sysdep.h | 102 ++++++++++++++++++
3 files changed, 102 insertions(+), 192 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
index f52b8b8735..520c9356c6 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
@@ -38,9 +38,6 @@
/* in newer 2.1 kernels __NR_syscall is missing so we define it here */
#define __NR_syscall 0
-#undef SYS_ify
-#define SYS_ify(syscall_name) __NR_##syscall_name
-
#ifdef __ASSEMBLER__
/* Linux uses a negative return value to indicate syscall errors, unlike
@@ -180,98 +177,6 @@
#endif /* __ASSEMBLER__ */
-#undef INLINE_SYSCALL
-#define INLINE_SYSCALL(name, nr, args...) \
- ({ \
- unsigned int _ret = INTERNAL_SYSCALL (name, , nr, args); \
- if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (_ret, ))) \
- { \
- __set_errno (INTERNAL_SYSCALL_ERRNO (_ret, )); \
- _ret = 0xffffffff; \
- } \
- (int) _ret; })
-
-#undef INTERNAL_SYSCALL_DECL
-#define INTERNAL_SYSCALL_DECL(err) do { } while (0)
-
-#undef INTERNAL_SYSCALL_DIRECT
-#define INTERNAL_SYSCALL_DIRECT(name, err, nr, args...) \
- ({ \
- DECLARGS_##nr(args) \
- register int _ret __asm__("2"); \
- __asm__ __volatile__ ( \
- "svc %b1\n\t" \
- : "=d" (_ret) \
- : "i" (__NR_##name) ASMFMT_##nr \
- : "memory" ); \
- _ret; })
-
-#undef INTERNAL_SYSCALL_SVC0
-#define INTERNAL_SYSCALL_SVC0(name, err, nr, args...) \
- ({ \
- DECLARGS_##nr(args) \
- register unsigned long _nr __asm__("1") = (unsigned long)(__NR_##name); \
- register int _ret __asm__("2"); \
- __asm__ __volatile__ ( \
- "svc 0\n\t" \
- : "=d" (_ret) \
- : "d" (_nr) ASMFMT_##nr \
- : "memory" ); \
- _ret; })
-
-#undef INTERNAL_SYSCALL_NCS
-#define INTERNAL_SYSCALL_NCS(no, err, nr, args...) \
- ({ \
- DECLARGS_##nr(args) \
- register unsigned long _nr __asm__("1") = (unsigned long)(no); \
- register int _ret __asm__("2"); \
- __asm__ __volatile__ ( \
- "svc 0\n\t" \
- : "=d" (_ret) \
- : "d" (_nr) ASMFMT_##nr \
- : "memory" ); \
- _ret; })
-
-#undef INTERNAL_SYSCALL
-#define INTERNAL_SYSCALL(name, err, nr, args...) \
- (((__NR_##name) < 256) \
- ? INTERNAL_SYSCALL_DIRECT(name, err, nr, args) \
- : INTERNAL_SYSCALL_SVC0(name, err,nr, args))
-
-#undef INTERNAL_SYSCALL_ERROR_P
-#define INTERNAL_SYSCALL_ERROR_P(val, err) \
- ((unsigned int) (val) >= 0xfffff001u)
-
-#undef INTERNAL_SYSCALL_ERRNO
-#define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
-
-#define DECLARGS_0()
-#define DECLARGS_1(arg1) \
- register unsigned long gpr2 __asm__ ("2") = (unsigned long)(arg1);
-#define DECLARGS_2(arg1, arg2) \
- DECLARGS_1(arg1) \
- register unsigned long gpr3 __asm__ ("3") = (unsigned long)(arg2);
-#define DECLARGS_3(arg1, arg2, arg3) \
- DECLARGS_2(arg1, arg2) \
- register unsigned long gpr4 __asm__ ("4") = (unsigned long)(arg3);
-#define DECLARGS_4(arg1, arg2, arg3, arg4) \
- DECLARGS_3(arg1, arg2, arg3) \
- register unsigned long gpr5 __asm__ ("5") = (unsigned long)(arg4);
-#define DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \
- DECLARGS_4(arg1, arg2, arg3, arg4) \
- register unsigned long gpr6 __asm__ ("6") = (unsigned long)(arg5);
-#define DECLARGS_6(arg1, arg2, arg3, arg4, arg5, arg6) \
- DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \
- register unsigned long gpr7 __asm__ ("7") = (unsigned long)(arg6);
-
-#define ASMFMT_0
-#define ASMFMT_1 , "0" (gpr2)
-#define ASMFMT_2 , "0" (gpr2), "d" (gpr3)
-#define ASMFMT_3 , "0" (gpr2), "d" (gpr3), "d" (gpr4)
-#define ASMFMT_4 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5)
-#define ASMFMT_5 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5), "d" (gpr6)
-#define ASMFMT_6 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5), "d" (gpr6), "d" (gpr7)
-
/* Pointer mangling support. */
#if IS_IN (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
index 9ff4479dc3..623059135e 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
@@ -50,9 +50,6 @@
# define __NR_pwrite __NR_pwrite64
#endif
-#undef SYS_ify
-#define SYS_ify(syscall_name) __NR_##syscall_name
-
#ifdef __ASSEMBLER__
/* Linux uses a negative return value to indicate syscall errors, unlike
@@ -186,100 +183,6 @@
#endif /* __ASSEMBLER__ */
-#undef INLINE_SYSCALL
-#define INLINE_SYSCALL(name, nr, args...) \
- ({ \
- long _ret = INTERNAL_SYSCALL (name, , nr, args); \
- if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (_ret, ))) \
- { \
- __set_errno (INTERNAL_SYSCALL_ERRNO (_ret, )); \
- _ret = -1; \
- } \
- _ret; })
-
-#undef INTERNAL_SYSCALL_DECL
-#define INTERNAL_SYSCALL_DECL(err) do { } while (0)
-
-#undef INTERNAL_SYSCALL_DIRECT
-#define INTERNAL_SYSCALL_DIRECT(name, err, nr, args...) \
- ({ \
- DECLARGS_##nr(args) \
- register long _ret __asm__("2"); \
- __asm__ __volatile__ ( \
- "svc %b1\n\t" \
- : "=d" (_ret) \
- : "i" (__NR_##name) ASMFMT_##nr \
- : "memory" ); \
- _ret; })
-
-#undef INTERNAL_SYSCALL_SVC0
-#define INTERNAL_SYSCALL_SVC0(name, err, nr, args...) \
- ({ \
- DECLARGS_##nr(args) \
- register unsigned long _nr __asm__("1") = (unsigned long)(__NR_##name); \
- register long _ret __asm__("2"); \
- __asm__ __volatile__ ( \
- "svc 0\n\t" \
- : "=d" (_ret) \
- : "d" (_nr) ASMFMT_##nr \
- : "memory" ); \
- _ret; })
-
-#undef INTERNAL_SYSCALL_NCS
-#define INTERNAL_SYSCALL_NCS(no, err, nr, args...) \
- ({ \
- DECLARGS_##nr(args) \
- register unsigned long _nr __asm__("1") = (unsigned long)(no); \
- register long _ret __asm__("2"); \
- __asm__ __volatile__ ( \
- "svc 0\n\t" \
- : "=d" (_ret) \
- : "d" (_nr) ASMFMT_##nr \
- : "memory" ); \
- _ret; })
-
-#undef INTERNAL_SYSCALL
-#define INTERNAL_SYSCALL(name, err, nr, args...) \
- (((__NR_##name) < 256) \
- ? INTERNAL_SYSCALL_DIRECT(name, err, nr, args) \
- : INTERNAL_SYSCALL_SVC0(name, err,nr, args))
-
-#undef INTERNAL_SYSCALL_ERROR_P
-#define INTERNAL_SYSCALL_ERROR_P(val, err) \
- ((unsigned long) (val) >= -4095UL)
-
-#undef INTERNAL_SYSCALL_ERRNO
-#define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
-
-#define DECLARGS_0()
-#define DECLARGS_1(arg1) \
- register unsigned long gpr2 __asm__ ("2") = (unsigned long)(arg1);
-#define DECLARGS_2(arg1, arg2) \
- DECLARGS_1(arg1) \
- register unsigned long gpr3 __asm__ ("3") = (unsigned long)(arg2);
-#define DECLARGS_3(arg1, arg2, arg3) \
- DECLARGS_2(arg1, arg2) \
- register unsigned long gpr4 __asm__ ("4") = (unsigned long)(arg3);
-#define DECLARGS_4(arg1, arg2, arg3, arg4) \
- DECLARGS_3(arg1, arg2, arg3) \
- register unsigned long gpr5 __asm__ ("5") = (unsigned long)(arg4);
-#define DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \
- DECLARGS_4(arg1, arg2, arg3, arg4) \
- register unsigned long gpr6 __asm__ ("6") = (unsigned long)(arg5);
-#define DECLARGS_6(arg1, arg2, arg3, arg4, arg5, arg6) \
- DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \
- register unsigned long gpr7 __asm__ ("7") = (unsigned long)(arg6);
-
-#define ASMFMT_0
-#define ASMFMT_1 , "0" (gpr2)
-#define ASMFMT_2 , "0" (gpr2), "d" (gpr3)
-#define ASMFMT_3 , "0" (gpr2), "d" (gpr3), "d" (gpr4)
-#define ASMFMT_4 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5)
-#define ASMFMT_5 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5), "d" (gpr6)
-#define ASMFMT_6 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5), "d" (gpr6), "d" (gpr7)
-
-#define SINGLE_THREAD_BY_GLOBAL 1
-
/* Pointer mangling support. */
#if IS_IN (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
diff --git a/sysdeps/unix/sysv/linux/s390/sysdep.h b/sysdeps/unix/sysv/linux/s390/sysdep.h
index 33ed86f252..1df0462cc4 100644
--- a/sysdeps/unix/sysv/linux/s390/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/sysdep.h
@@ -16,6 +16,106 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#ifndef __ASSEMBLY__
+
+#undef SYS_ify
+#define SYS_ify(syscall_name) __NR_##syscall_name
+
+#undef INLINE_SYSCALL
+#define INLINE_SYSCALL(name, nr, args...) \
+ ({ \
+ long _ret = INTERNAL_SYSCALL (name, , nr, args); \
+ if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (_ret, ))) \
+ { \
+ __set_errno (INTERNAL_SYSCALL_ERRNO (_ret, )); \
+ _ret = -1; \
+ } \
+ _ret; })
+
+#undef INTERNAL_SYSCALL_DECL
+#define INTERNAL_SYSCALL_DECL(err) do { } while (0)
+
+#undef INTERNAL_SYSCALL_DIRECT
+#define INTERNAL_SYSCALL_DIRECT(name, err, nr, args...) \
+ ({ \
+ DECLARGS_##nr(args) \
+ register long _ret __asm__("2"); \
+ __asm__ __volatile__ ( \
+ "svc %b1\n\t" \
+ : "=d" (_ret) \
+ : "i" (__NR_##name) ASMFMT_##nr \
+ : "memory" ); \
+ _ret; })
+
+#undef INTERNAL_SYSCALL_SVC0
+#define INTERNAL_SYSCALL_SVC0(name, err, nr, args...) \
+ ({ \
+ DECLARGS_##nr(args) \
+ register unsigned long _nr __asm__("1") = (unsigned long)(__NR_##name); \
+ register long _ret __asm__("2"); \
+ __asm__ __volatile__ ( \
+ "svc 0\n\t" \
+ : "=d" (_ret) \
+ : "d" (_nr) ASMFMT_##nr \
+ : "memory" ); \
+ _ret; })
+
+#undef INTERNAL_SYSCALL_NCS
+#define INTERNAL_SYSCALL_NCS(no, err, nr, args...) \
+ ({ \
+ DECLARGS_##nr(args) \
+ register unsigned long _nr __asm__("1") = (unsigned long)(no); \
+ register long _ret __asm__("2"); \
+ __asm__ __volatile__ ( \
+ "svc 0\n\t" \
+ : "=d" (_ret) \
+ : "d" (_nr) ASMFMT_##nr \
+ : "memory" ); \
+ _ret; })
+
+#undef INTERNAL_SYSCALL
+#define INTERNAL_SYSCALL(name, nr, args...) \
+ (((__NR_##name) < 256) \
+ ? INTERNAL_SYSCALL_DIRECT(name, nr, args) \
+ : INTERNAL_SYSCALL_SVC0(name, nr, args))
+
+#undef INTERNAL_SYSCALL_ERROR_P
+#define INTERNAL_SYSCALL_ERROR_P(val, err) \
+ ((unsigned long) (val) >= -4095UL)
+
+#undef INTERNAL_SYSCALL_ERRNO
+#define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
+
+#define DECLARGS_0()
+#define DECLARGS_1(arg1) \
+ register unsigned long gpr2 __asm__ ("2") = (unsigned long)(arg1);
+#define DECLARGS_2(arg1, arg2) \
+ DECLARGS_1(arg1) \
+ register unsigned long gpr3 __asm__ ("3") = (unsigned long)(arg2);
+#define DECLARGS_3(arg1, arg2, arg3) \
+ DECLARGS_2(arg1, arg2) \
+ register unsigned long gpr4 __asm__ ("4") = (unsigned long)(arg3);
+#define DECLARGS_4(arg1, arg2, arg3, arg4) \
+ DECLARGS_3(arg1, arg2, arg3) \
+ register unsigned long gpr5 __asm__ ("5") = (unsigned long)(arg4);
+#define DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \
+ DECLARGS_4(arg1, arg2, arg3, arg4) \
+ register unsigned long gpr6 __asm__ ("6") = (unsigned long)(arg5);
+#define DECLARGS_6(arg1, arg2, arg3, arg4, arg5, arg6) \
+ DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \
+ register unsigned long gpr7 __asm__ ("7") = (unsigned long)(arg6);
+
+#define ASMFMT_0
+#define ASMFMT_1 , "0" (gpr2)
+#define ASMFMT_2 , "0" (gpr2), "d" (gpr3)
+#define ASMFMT_3 , "0" (gpr2), "d" (gpr3), "d" (gpr4)
+#define ASMFMT_4 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5)
+#define ASMFMT_5 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5), "d" (gpr6)
+#define ASMFMT_6 , "0" (gpr2), "d" (gpr3), "d" (gpr4), "d" (gpr5), "d" (gpr6), "d" (gpr7)
+
+#define SINGLE_THREAD_BY_GLOBAL 1
+
+
#define VDSO_NAME "LINUX_2.6.29"
#define VDSO_HASH 123718585
@@ -29,3 +129,5 @@
#endif
#define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"
#define HAVE_GETCPU_VSYSCALL "__kernel_getcpu"
+
+#endif
--
2.17.1
next prev parent reply other threads:[~2020-02-10 19:22 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-10 19:20 [PATCH 01/15] powerpc: Consolidate Linux syscall definition Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 02/15] powerpc: Use Linux kABI for syscall return Adhemerval Zanella
2020-02-11 11:18 ` Florian Weimer
2020-02-11 12:14 ` Adhemerval Zanella
2020-02-11 12:31 ` Florian Weimer
2020-02-11 13:31 ` Adhemerval Zanella
2020-02-11 19:45 ` Florian Weimer
2020-02-11 19:45 ` Florian Weimer
2020-02-12 13:24 ` Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 03/15] sparc: " Adhemerval Zanella
2020-02-11 11:15 ` Florian Weimer
2020-02-11 18:55 ` Adhemerval Zanella
2020-02-11 19:24 ` Florian Weimer
2020-02-11 20:29 ` Adhemerval Zanella
2020-02-11 21:15 ` Florian Weimer
2020-02-12 12:35 ` Adhemerval Zanella
2020-02-12 12:38 ` Florian Weimer
2020-02-12 12:56 ` Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 04/15] alpha: Refactor syscall and " Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 05/15] ia64: " Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 06/15] mips64: Consolidate Linux sysdep.h Adhemerval Zanella
2020-02-10 22:48 ` Joseph Myers
2020-02-11 19:05 ` Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 07/15] mips: Use Linux kABI for syscall return Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 08/15] nios2: " Adhemerval Zanella
2020-02-11 11:20 ` Florian Weimer
2020-02-11 19:09 ` Adhemerval Zanella
2020-02-11 11:50 ` Andreas Schwab
2020-02-19 21:40 ` Vineet Gupta
2020-02-20 13:14 ` Adhemerval Zanella
2020-02-20 20:39 ` Vineet Gupta
2020-02-20 21:04 ` Vineet Gupta
2020-02-27 17:49 ` Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 09/15] microblaze: Avoid clobbering register parameters in syscall Adhemerval Zanella
2020-02-11 11:21 ` Florian Weimer
2020-02-11 19:10 ` Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 10/15] riscv: " Adhemerval Zanella
2020-02-10 19:51 ` DJ Delorie
2020-02-10 21:27 ` Palmer Dabbelt
2020-02-10 21:55 ` Adhemerval Zanella
2020-02-10 19:20 ` Adhemerval Zanella [this message]
2020-02-10 19:20 ` [PATCH 12/15] sparc: " Adhemerval Zanella
2020-02-11 11:22 ` Florian Weimer
2020-02-11 19:17 ` Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 13/15] linux: Consolidate INLINE_SYSCALL Adhemerval Zanella
2020-02-11 12:03 ` Florian Weimer
2020-02-11 20:53 ` Adhemerval Zanella
2020-02-11 21:00 ` Florian Weimer
2020-02-10 19:20 ` [PATCH 14/15] nptl: Remove ununsed pthread-errnos.h rule Adhemerval Zanella
2020-02-11 11:23 ` Florian Weimer
2020-02-11 11:51 ` Florian Weimer
2020-02-11 21:01 ` Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 15/15] linux: Remove INTERNAL_SYSCALL_DECL Adhemerval Zanella
2020-02-11 12:34 ` Florian Weimer
2020-02-11 12:36 ` Florian Weimer
2020-02-11 20:57 ` Adhemerval Zanella
2020-02-11 12:48 ` Florian Weimer
2020-02-11 20:55 ` Adhemerval Zanella
2020-02-15 7:51 ` Andreas Schwab
2020-02-15 9:32 ` [PATCH] arm: fix use of INTERNAL_SYSCALL_CALL Andreas Schwab
2020-02-15 9:55 ` Florian Weimer
2020-02-11 19:43 ` [PATCH 01/15] powerpc: Consolidate Linux syscall definition Florian Weimer
2020-02-12 13:19 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200210192038.23588-11-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).