public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/syscall-refactor] s390: Add internal_syscall
@ 2020-06-29 21:45 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2020-06-29 21:45 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a1227b011afceceec39ed5ead020ed529b972a83
commit a1227b011afceceec39ed5ead020ed529b972a83
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu May 21 18:07:27 2020 -0300
s390: Add internal_syscall
Diff:
---
sysdeps/unix/sysv/linux/s390/mmap_internal.h | 2 +-
.../unix/sysv/linux/s390/s390-32/____longjmp_chk.c | 4 +-
.../unix/sysv/linux/s390/s390-32/posix_fadvise64.c | 12 +--
.../unix/sysv/linux/s390/s390-64/____longjmp_chk.c | 4 +-
sysdeps/unix/sysv/linux/s390/sysdep.h | 110 +++++++++++++++++++++
5 files changed, 117 insertions(+), 15 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/s390/mmap_internal.h b/sysdeps/unix/sysv/linux/s390/mmap_internal.h
index 2884f2844b..49c161039a 100644
--- a/sysdeps/unix/sysv/linux/s390/mmap_internal.h
+++ b/sysdeps/unix/sysv/linux/s390/mmap_internal.h
@@ -24,7 +24,7 @@
long int __args[6] = { (long int) (__addr), (long int) (__len), \
(long int) (__prot), (long int) (__flags), \
(long int) (__fd), (long int) (__offset) }; \
- INLINE_SYSCALL_CALL (__nr, __args); \
+ inline_syscall (__NR_##__nr, __args); \
})
#include_next <mmap_internal.h>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c b/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
index 1f214173fe..e97494c839 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
@@ -39,8 +39,8 @@
if (new_sp < cur_sp) \
{ \
stack_t oss; \
- int res = INTERNAL_SYSCALL_CALL (sigaltstack, NULL, &oss); \
- if (!INTERNAL_SYSCALL_ERROR_P (res)) \
+ int res = internal_syscall (__NR_sigaltstack, NULL, &oss); \
+ if (res == 0) \
{ \
if ((oss.ss_flags & SS_ONSTACK) == 0 \
|| ((uintptr_t) (oss.ss_sp + oss.ss_size) - new_sp \
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/posix_fadvise64.c b/sysdeps/unix/sysv/linux/s390/s390-32/posix_fadvise64.c
index b556a6caae..5df373ff90 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/posix_fadvise64.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/posix_fadvise64.c
@@ -36,16 +36,8 @@ struct fadvise64_64_layout
int
__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise)
{
- struct fadvise64_64_layout parameters;
-
- parameters.fd = fd;
- parameters.offset = offset;
- parameters.len = len;
- parameters.advise = advise;
- int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, ¶meters);
- if (!INTERNAL_SYSCALL_ERROR_P (ret))
- return 0;
- return INTERNAL_SYSCALL_ERRNO (ret);
+ struct fadvise64_64_layout parameters = { fd, offset, len, advise };
+ return -internal_syscall (__NR_fadvise64_64, ¶meters);
}
#include <shlib-compat.h>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c b/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
index bc74408135..041d3fc5dd 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
@@ -39,8 +39,8 @@
if (new_sp < cur_sp) \
{ \
stack_t oss; \
- int res = INTERNAL_SYSCALL_CALL (sigaltstack, NULL, &oss); \
- if (!INTERNAL_SYSCALL_ERROR_P (res)) \
+ int res = internal_syscall (__NR_sigaltstack, NULL, &oss); \
+ if (res == 0) \
{ \
if ((oss.ss_flags & SS_ONSTACK) == 0 \
|| ((uintptr_t) (oss.ss_sp + oss.ss_size) - new_sp \
diff --git a/sysdeps/unix/sysv/linux/s390/sysdep.h b/sysdeps/unix/sysv/linux/s390/sysdep.h
index e392960592..4a624ecabf 100644
--- a/sysdeps/unix/sysv/linux/s390/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/sysdep.h
@@ -110,4 +110,114 @@
#define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"
#define HAVE_GETCPU_VSYSCALL "__kernel_getcpu"
+#ifndef __ASSEMBLER__
+static inline long int
+__internal_syscall0 (long int name)
+{
+ register long int r1 asm ("1") = name;
+ register long int r2 asm ("2");
+ asm volatile ("svc 0\n\t"
+ : "=d" (r2)
+ : "d" (r1)
+ : "memory");
+ return r2;
+}
+
+static inline long int
+__internal_syscall1 (long int name, __syscall_arg_t arg1)
+{
+ register long int r1 asm ("1") = name;
+ register long int r2 asm ("2") = arg1;
+ asm volatile ("svc 0\n\t"
+ : "+d" (r2)
+ : "d" (r1)
+ : "memory");
+ return r2;
+}
+
+static inline long int
+__internal_syscall2 (long int name, __syscall_arg_t arg1,
+ __syscall_arg_t arg2)
+{
+ register long int r1 asm ("1") = name;
+ register long int r2 asm ("2") = arg1;
+ register long int r3 asm ("3") = arg2;
+ asm volatile ("svc 0\n\t"
+ : "+d" (r2)
+ : "d" (r1), "d" (r3)
+ : "memory");
+ return r2;
+}
+
+static inline long int
+__internal_syscall3 (long int name, __syscall_arg_t arg1,
+ __syscall_arg_t arg2, __syscall_arg_t arg3)
+{
+ register long int r1 asm ("1") = name;
+ register long int r2 asm ("2") = arg1;
+ register long int r3 asm ("3") = arg2;
+ register long int r4 asm ("4") = arg3;
+ asm volatile ("svc 0\n\t"
+ : "+d" (r2)
+ : "d" (r1), "d" (r3), "d" (r4)
+ : "memory");
+ return r2;
+}
+
+static inline long int
+__internal_syscall4 (long int name, __syscall_arg_t arg1,
+ __syscall_arg_t arg2, __syscall_arg_t arg3,
+ __syscall_arg_t arg4)
+{
+ register long int r1 asm ("1") = name;
+ register long int r2 asm ("2") = arg1;
+ register long int r3 asm ("3") = arg2;
+ register long int r4 asm ("4") = arg3;
+ register long int r5 asm ("5") = arg4;
+ asm volatile ("svc 0\n\t"
+ : "+d" (r2)
+ : "d" (r1), "d" (r3), "d" (r4), "d" (r5)
+ : "memory");
+ return r2;
+}
+
+static inline long int
+__internal_syscall5 (long int name, __syscall_arg_t arg1,
+ __syscall_arg_t arg2, __syscall_arg_t arg3,
+ __syscall_arg_t arg4, __syscall_arg_t arg5)
+{
+ register long int r1 asm ("1") = name;
+ register long int r2 asm ("2") = arg1;
+ register long int r3 asm ("3") = arg2;
+ register long int r4 asm ("4") = arg3;
+ register long int r5 asm ("5") = arg4;
+ register long int r6 asm ("6") = arg5;
+ asm volatile ("svc 0\n\t"
+ : "+d" (r2)
+ : "d" (r1), "d" (r3), "d" (r4), "d" (r5), "d" (r6)
+ : "memory");
+ return r2;
+}
+
+static inline long int
+__internal_syscall6 (long int name, __syscall_arg_t arg1,
+ __syscall_arg_t arg2, __syscall_arg_t arg3,
+ __syscall_arg_t arg4, __syscall_arg_t arg5,
+ __syscall_arg_t arg6)
+{
+ register long int r1 asm ("1") = name;
+ register long int r2 asm ("2") = arg1;
+ register long int r3 asm ("3") = arg2;
+ register long int r4 asm ("4") = arg3;
+ register long int r5 asm ("5") = arg4;
+ register long int r6 asm ("6") = arg5;
+ register long int r7 asm ("7") = arg6;
+ asm volatile ("svc 0\n\t"
+ : "+d" (r2)
+ : "d" (r1), "d" (r3), "d" (r4), "d" (r5), "d" (r6), "d" (r7)
+ : "memory");
+ return r2;
+}
+#endif /* __ASSEMBLER__ */
+
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-29 21:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-29 21:45 [glibc/azanella/syscall-refactor] s390: Add internal_syscall Adhemerval Zanella
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).