From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 05/15] ia64: Use Linux kABI for syscall return
Date: Mon, 10 Feb 2020 16:20:28 -0300 [thread overview]
Message-ID: <20200210192038.23588-5-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20200210192038.23588-1-adhemerval.zanella@linaro.org>
It changes the ia64 INTERNAL_SYSCALL_NCS macro to return a negative
value instead of 'r10' register value on 'err' macro argument.
The macro INTERNAL_SYSCALL_DECL is no longer required, and the
INTERNAL_SYSCALL_ERROR_P follows the other Linux kABIS.
Checked on ia64-linux-gnu.
---
sysdeps/unix/sysv/linux/ia64/sysdep.h | 58 +++++++++++----------------
1 file changed, 24 insertions(+), 34 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 59442c50e9..729bfadad0 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -191,13 +191,13 @@
#ifdef IA64_USE_NEW_STUB
-# define DO_INLINE_SYSCALL_NCS(name, nr, args...) \
+# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
+({ \
LOAD_ARGS_##nr (args) \
register long _r8 __asm ("r8"); \
register long _r10 __asm ("r10"); \
register long _r15 __asm ("r15") = name; \
register void *_b7 __asm ("b7") = ((tcbhead_t *)__thread_self)->__private;\
- long _retval; \
LOAD_REGS_##nr \
/* \
* Don't specify any unwind info here. We mark ar.pfs as \
@@ -209,60 +209,50 @@
ASM_OUTARGS_##nr \
: "0" (_b7), "3" (_r15) ASM_ARGS_##nr \
: "memory", "ar.pfs" ASM_CLOBBERS_##nr); \
- _retval = _r8;
+ _r10 == -1 ? -_r8 : _r8; \
+})
#else /* !IA64_USE_NEW_STUB */
-# define DO_INLINE_SYSCALL_NCS(name, nr, args...) \
+# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
+({ \
LOAD_ARGS_##nr (args) \
register long _r8 asm ("r8"); \
register long _r10 asm ("r10"); \
register long _r15 asm ("r15") = name; \
- long _retval; \
LOAD_REGS_##nr \
__asm __volatile (BREAK_INSN (__IA64_BREAK_SYSCALL) \
: "=r" (_r8), "=r" (_r10), "=r" (_r15) \
ASM_OUTARGS_##nr \
: "2" (_r15) ASM_ARGS_##nr \
: "memory" ASM_CLOBBERS_##nr); \
- _retval = _r8;
+ _r10 == -1 ? -_r8 : _r8; \
+})
#endif /* !IA64_USE_NEW_STUB */
-#define DO_INLINE_SYSCALL(name, nr, args...) \
- DO_INLINE_SYSCALL_NCS (__NR_##name, nr, ##args)
-
-#undef INLINE_SYSCALL
-#define INLINE_SYSCALL(name, nr, args...) \
- ({ \
- DO_INLINE_SYSCALL_NCS (__NR_##name, nr, args) \
- if (_r10 == -1) \
- { \
- __set_errno (_retval); \
- _retval = -1; \
- } \
- _retval; })
-
-#undef INTERNAL_SYSCALL_DECL
-#define INTERNAL_SYSCALL_DECL(err) long int err __attribute__ ((unused))
-
-#undef INTERNAL_SYSCALL
-#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
- ({ \
- DO_INLINE_SYSCALL_NCS (name, nr, args) \
- err = _r10; \
- _retval; })
+# undef INLINE_SYSCALL
+# define INLINE_SYSCALL(name, nr, args...) \
+ ({ unsigned long _sys_result = INTERNAL_SYSCALL (name, , nr, args); \
+ if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (_sys_result, ), 0))\
+ { \
+ __set_errno (INTERNAL_SYSCALL_ERRNO (_sys_result, )); \
+ _sys_result = (unsigned long) -1; \
+ } \
+ (long) _sys_result; })
+
+# undef INTERNAL_SYSCALL_DECL
+# define INTERNAL_SYSCALL_DECL(err) do { } while (0)
+
#define INTERNAL_SYSCALL(name, err, nr, args...) \
INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args)
#undef INTERNAL_SYSCALL_ERROR_P
-#define INTERNAL_SYSCALL_ERROR_P(val, err) \
- ({ (void) (val); \
- (err == -1); \
- })
+#define INTERNAL_SYSCALL_ERROR_P(val, err) \
+ ((unsigned long) (val) >= (unsigned long) -4095)
#undef INTERNAL_SYSCALL_ERRNO
-#define INTERNAL_SYSCALL_ERRNO(val, err) (val)
+#define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
#define LOAD_ARGS_0()
#define LOAD_REGS_0
--
2.17.1
next prev parent reply other threads:[~2020-02-10 19:21 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 ` Adhemerval Zanella [this message]
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 ` [PATCH 11/15] s390: Consolidate Linux syscall definition Adhemerval Zanella
2020-02-10 19:20 ` [PATCH 12/15] sparc: Avoid clobbering register parameters in syscall 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-5-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).