From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 27/28] linux: Add generic C syscall implementation
Date: Wed, 18 Nov 2020 16:55:51 -0300 [thread overview]
Message-ID: <20201118195552.2687336-28-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20201118195552.2687336-1-adhemerval.zanella@linaro.org>
The hppa and riscv one are also removed. The riscv specially is
abusing the internal interfaces by defining it with a different
signature. If the idea is to provide an optimized version a better
alternative would be to provide an assembly one as other
architectures.
Checked on x86_64-linux-gnu and with build for the affected ABIs.
---
sysdeps/unix/sysv/linux/hppa/syscall.c | 65 -------------------
sysdeps/unix/sysv/linux/{riscv => }/syscall.c | 33 ++++++----
2 files changed, 20 insertions(+), 78 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/hppa/syscall.c
rename sysdeps/unix/sysv/linux/{riscv => }/syscall.c (53%)
diff --git a/sysdeps/unix/sysv/linux/hppa/syscall.c b/sysdeps/unix/sysv/linux/hppa/syscall.c
deleted file mode 100644
index 7f6794b09f..0000000000
--- a/sysdeps/unix/sysv/linux/hppa/syscall.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 1997-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-#include <stdarg.h>
-#include <sysdep.h>
-#include <errno.h>
-
-/* HPPA implements syscall() in 'C'; the assembler version would
- typically be in syscall.S. Also note that we have INLINE_SYSCALL,
- INTERNAL_SYSCALL, and all the generated pure assembly syscall wrappers.
- How often the function is used is unknown. */
-
-long int
-syscall (long int __sysno, ...)
-{
- /* FIXME: Keep this matching INLINE_SYSCALL for hppa */
- va_list args;
- long int arg0, arg1, arg2, arg3, arg4, arg5;
- long int __sys_res;
-
- /* Load varargs */
- va_start (args, __sysno);
- arg0 = va_arg (args, long int);
- arg1 = va_arg (args, long int);
- arg2 = va_arg (args, long int);
- arg3 = va_arg (args, long int);
- arg4 = va_arg (args, long int);
- arg5 = va_arg (args, long int);
- va_end (args);
-
- {
- LOAD_ARGS_6 (arg0, arg1, arg2, arg3, arg4, arg5)
- register unsigned long int __res asm("r28");
- PIC_REG_DEF
- LOAD_REGS_6
- asm volatile (SAVE_ASM_PIC
- " ble 0x100(%%sr2, %%r0) \n"
- " copy %1, %%r20 \n"
- LOAD_ASM_PIC
- : "=r" (__res)
- : "r" (__sysno) PIC_REG_USE ASM_ARGS_6
- : "memory", CALL_CLOB_REGS CLOB_ARGS_6);
- __sys_res = __res;
- }
- if ((unsigned long int) __sys_res >= (unsigned long int) -4095)
- {
- __set_errno (-__sys_res);
- __sys_res = -1;
- }
- return __sys_res;
-}
diff --git a/sysdeps/unix/sysv/linux/riscv/syscall.c b/sysdeps/unix/sysv/linux/syscall.c
similarity index 53%
rename from sysdeps/unix/sysv/linux/riscv/syscall.c
rename to sysdeps/unix/sysv/linux/syscall.c
index a99375c054..2e39ed9bc9 100644
--- a/sysdeps/unix/sysv/linux/riscv/syscall.c
+++ b/sysdeps/unix/sysv/linux/syscall.c
@@ -1,5 +1,5 @@
-/* system call interface. Linux/RISC-V version.
- Copyright (C) 2001-2020 Free Software Foundation, Inc.
+/* Indirect system call. Linux version.
+ Copyright (C) 2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,19 +16,26 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
+#include <stdarg.h>
#include <sysdep.h>
long int
-syscall (long int syscall_number, long int arg1, long int arg2, long int arg3,
- long int arg4, long int arg5, long int arg6, long int arg7)
+syscall (long int number, ...)
{
- long int ret;
-
- ret = INTERNAL_SYSCALL_NCS (syscall_number, 7, arg1, arg2, arg3, arg4,
- arg5, arg6, arg7);
-
- if (INTERNAL_SYSCALL_ERROR_P (ret))
- return __syscall_error (ret);
-
- return ret;
+ va_list args;
+
+ va_start (args, number);
+ long int arg0 = va_arg (args, long int);
+ long int arg1 = va_arg (args, long int);
+ long int arg2 = va_arg (args, long int);
+ long int arg3 = va_arg (args, long int);
+ long int arg4 = va_arg (args, long int);
+ long int arg5 = va_arg (args, long int);
+ va_end (args);
+
+ long int ret = INTERNAL_SYSCALL_NCS (number, 6, arg0, arg1, arg2,
+ arg3, arg4, arg5);
+ return INTERNAL_SYSCALL_ERROR_P (ret)
+ ? SYSCALL_ERROR_LABEL (INTERNAL_SYSCALL_ERRNO (ret))
+ : ret;
}
--
2.25.1
next prev parent reply other threads:[~2020-11-18 19:56 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 19:55 [PATCH 00/28] More Linux syscall refactor Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 01/28] Remove generic pthread linuxism on POSIX timer_routine Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 02/28] Removed ununsed pthread implementations Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 03/28] Remove local-setxid.h Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 04/28] Remove HAVE_INLINED_SYSCALLS usage on generic implementations Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 05/28] linux: Consolidate and cleanup personality syscall Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 06/28] x32: Remove syscalls.list Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 07/28] linux: Assume bind support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 08/28] linux: Assume getpeername support Adhemerval Zanella
2020-11-19 12:55 ` Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 09/28] linux: Assume getsockname support Adhemerval Zanella
2020-11-19 12:56 ` Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 10/28] linux: Assume getsockopt support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 11/28] linux: Assume listen support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 12/28] linux: Assume setsockopt support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 13/28] linux: Assume shutdown support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 14/28] linux: Assume socket support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 15/28] linux: Assume socketpair support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 16/28] linux: Remove superflous __ASSUME_CONNECT_SYSCALL definitions Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 17/28] x86_64: Remove ununsed syscalls.list entry Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 18/28] nptl: Add futex_trylock_pi Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 19/28] linux: Add fanotify_mark C implementation Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 20/28] linux: Add prlimit64 " Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 21/28] linux: Implement mremap in C Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 22/28] Linux: implement ioctl " Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 23/28] mips: Implement n32 lseek64 " Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 24/28] x32: Implement " Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 25/28] linux: Implement pipe in terms of __NR_pipe2 Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 26/28] linux: Consolidate brk implementation Adhemerval Zanella
2020-11-19 17:31 ` Tulio Magno Quites Machado Filho
2020-11-19 17:53 ` Adhemerval Zanella
2020-11-19 20:08 ` Adhemerval Zanella
2020-11-18 19:55 ` Adhemerval Zanella [this message]
2020-11-18 19:55 ` [PATCH 28/28] alpha: Move implementations to C Adhemerval Zanella
2020-11-18 21:06 ` [PATCH 00/28] More Linux syscall refactor Joseph Myers
2020-11-19 12:21 ` Adhemerval Zanella
2020-11-19 16:38 ` Joseph Myers
2020-11-19 17:43 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201118195552.2687336-28-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).