From 439d1d4560aa3e261c065c43e3995779809b4cb2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 22 Jul 1995 10:48:43 +0000 Subject: Sat Jul 22 01:56:03 1995 Roland McGrath * sysdeps/unix/i386/sysdep.h (JUMPTARGET): New macro; use name@PLT #ifdef PIC. (PSEUDO): Use JUMPTARGET(syscall_error) in jump insn. * sysdeps/unix/i386/syscall.S: Use JUMPTARGET(syscall_error) in jump insn. * sysdeps/unix/sysv/sysv4/linux/i386/sysdep.h: Rewritten. * sysdeps/unix/sysv/sysv4/linux/i386/syscall.S: New file. * sysdeps/unix/sysv/sysv4/linux/i386/socket.S: Include . Save %ebx in call-clobbered %edx instead of stack. Use JUMPTARGET(syscall_error) in jump insn. * Makeconfig (+gccwarn): Add -Wbad-function-cast -Wconversion. * sysdeps/unix/i386/sysdep.h (ENTRY): Use ASM_GLOBAL_DIRECTIVE and ASM_TYPE_DIRECTIVE. (ASM_TYPE_DIRECTIVE): New macro; defined using `.type' #ifdef ELF. * sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S (__syscall_error): Rewritten, #include'ing unix/i386/sysdep.S for most of the code. * sysdeps/unix/i386/sysdep.S [PIC]: Store into `errno' through the GOT. Fixes to help Linux, inspired by drepper's work: * configure.in (os=linux*): Use unix/sysv/sysv4 for $base_os, instead of unix/sysv. * sysdeps/posix/utimes.c: New file. * sysdeps/generic/getdomain.c: New file. * sysdeps/i386/init-first.c: Removed gratuitous #include . * sysdeps/generic/dl-sysdep.c: Include and declare externals _dl_argc, _dl_argc, and _environ. * sysdeps/unix/sysv/linux/{accept,connect,getsockname,rename, socketpair,waitpid,bind,getpeername,listen,setsid,wait4}.S: Moved to new directory sysdeps/unix/sysv/sysv4/linux. * sysdeps/unix/sysv/linux: Directory removed. * sysdeps/unix/sysv/i386/linux/{socket.S,sysdep.h,sysdep.S}: Moved to new directory sysdeps/unix/sysv/sysv4/linux/i386. * sysdeps/unix/sysv/linux/i386: Directory removed. --- sysdeps/unix/sysv/sysv4/linux/accept.S | 2 + sysdeps/unix/sysv/sysv4/linux/bind.S | 2 + sysdeps/unix/sysv/sysv4/linux/connect.S | 2 + sysdeps/unix/sysv/sysv4/linux/getpeername.S | 2 + sysdeps/unix/sysv/sysv4/linux/getsockname.S | 2 + sysdeps/unix/sysv/sysv4/linux/i386/socket.S | 54 +++++++++++++++++ sysdeps/unix/sysv/sysv4/linux/i386/syscall.S | 29 ++++++++++ sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S | 27 +++++++++ sysdeps/unix/sysv/sysv4/linux/i386/sysdep.h | 86 ++++++++++++++++++++++++++++ sysdeps/unix/sysv/sysv4/linux/listen.S | 2 + sysdeps/unix/sysv/sysv4/linux/rename.S | 1 + sysdeps/unix/sysv/sysv4/linux/setsid.S | 1 + sysdeps/unix/sysv/sysv4/linux/socketpair.S | 2 + sysdeps/unix/sysv/sysv4/linux/wait4.S | 1 + sysdeps/unix/sysv/sysv4/linux/waitpid.S | 24 ++++++++ 15 files changed, 237 insertions(+) create mode 100644 sysdeps/unix/sysv/sysv4/linux/accept.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/bind.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/connect.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/getpeername.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/getsockname.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/i386/socket.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/i386/syscall.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/i386/sysdep.h create mode 100644 sysdeps/unix/sysv/sysv4/linux/listen.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/rename.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/setsid.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/socketpair.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/wait4.S create mode 100644 sysdeps/unix/sysv/sysv4/linux/waitpid.S (limited to 'sysdeps/unix/sysv/sysv4') diff --git a/sysdeps/unix/sysv/sysv4/linux/accept.S b/sysdeps/unix/sysv/sysv4/linux/accept.S new file mode 100644 index 0000000000..5936a0185b --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/accept.S @@ -0,0 +1,2 @@ +#define socket accept +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/bind.S b/sysdeps/unix/sysv/sysv4/linux/bind.S new file mode 100644 index 0000000000..fc82b65a2f --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/bind.S @@ -0,0 +1,2 @@ +#define socket bind +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/connect.S b/sysdeps/unix/sysv/sysv4/linux/connect.S new file mode 100644 index 0000000000..3433043d8c --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/connect.S @@ -0,0 +1,2 @@ +#define socket connect +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/getpeername.S b/sysdeps/unix/sysv/sysv4/linux/getpeername.S new file mode 100644 index 0000000000..8429fcdf76 --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/getpeername.S @@ -0,0 +1,2 @@ +#define socket getpeername +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/getsockname.S b/sysdeps/unix/sysv/sysv4/linux/getsockname.S new file mode 100644 index 0000000000..6782707f88 --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/getsockname.S @@ -0,0 +1,2 @@ +#define socket getsockname +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/i386/socket.S b/sysdeps/unix/sysv/sysv4/linux/i386/socket.S new file mode 100644 index 0000000000..7b8dd75ed8 --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/i386/socket.S @@ -0,0 +1,54 @@ +/* Copyright (C) 1995 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#include + +.globl syscall_error + +/* The socket-oriented system calls are handled unusally in Linux. + They are all gated through the single `socketcall' system call number. + `socketcall' takes two arguments: the first is the subcode, specifying + which socket function is being called; and the second is a pointer to + the arguments to the specific function. + + The .S files for the other calls just #define socket and #include this. */ + +ENTRY (socket) + + /* Save registers. */ + movl %ebx, %edx + + movl $SYS_socketcall, %eax /* System call number in %eax. */ + + /* Use ## so `socket' is a separate token that might be #define'd. */ + movl $SYS_##socket, %ebx /* Subcode is first arg to syscall. */ + lea 8(%esp), %ecx /* Address of args is 2nd arg. */ + + /* Do the system call trap. */ + int $0x80 + + /* Restore registers. */ + movl %edx, %ebx + + /* %eax is < 0 if there was an error. */ + testl %eax, %eax + jl JUMPTARGET(syscall_error) + + /* Successful; return the syscall's value. */ + ret diff --git a/sysdeps/unix/sysv/sysv4/linux/i386/syscall.S b/sysdeps/unix/sysv/sysv4/linux/i386/syscall.S new file mode 100644 index 0000000000..efe6d36086 --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/i386/syscall.S @@ -0,0 +1,29 @@ +/* Copyright (C) 1995 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include + +ASM_GLOBAL_DIRECTIVE syscall_error +ENTRY (syscall) + popl %ecx /* Pop return address into %ecx. */ + popl %eax /* Pop syscall number into %eax. */ + pushl %ecx /* Push back return address. */ + DO_CALL (5) /* Frob the args and do the system call. */ + testl %eax, %eax /* Check %eax for error. */ + jl JUMPTARGET(syscall_error) /* Jump to error handler if negative. */ + ret /* Return to caller. */ diff --git a/sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S b/sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S new file mode 100644 index 0000000000..5cf29ec0cf --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S @@ -0,0 +1,27 @@ +/* Copyright (C) 1995 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +/* The syscall stubs jump here when they detect an error. + The code for Linux is almost identical to the canonical Unix/i386 + code, except that the error number in %eax is negated. */ + +__syscall_error: + negl %eax + +#define __syscall_error __syscall_error_1 +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/i386/sysdep.h b/sysdeps/unix/sysv/sysv4/linux/i386/sysdep.h new file mode 100644 index 0000000000..d0c1c10dba --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/i386/sysdep.h @@ -0,0 +1,86 @@ +/* Copyright (C) 1992, 1993, 1995 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +/* In the Linux/ELF world, C symbols are asm symbols. */ +#define NO_UNDERSCORES + +/* There is some commonality. */ +#include + +#ifdef ASSEMBLER + +/* Linux uses a negative return value to indicate syscall errors, unlike + most Unices, which use the condition codes' carry flag. */ +#undef PSEUDO +#define PSEUDO(name, syscall_name, args) \ + .text; \ + .globl __syscall_error; \ + ENTRY (name) \ + movl $SYS_##syscall_name, %eax; \ + DO_CALL (args) \ + testl %eax, %eax; \ + jl JUMPTARGET(__syscall_error) + + +/* Linux takes system call arguments in registers: + + syscall number %eax call-clobbered + arg 1 %ebx call-saved + arg 2 %ecx call-clobbered + arg 3 %edx call-clobbered + arg 4 %esi call-saved + arg 5 %edi call-saved + + The stack layout upon entering the function is: + + 24(%esp) Arg# 5 + 20(%esp) Arg# 4 + 16(%esp) Arg# 3 + 12(%esp) Arg# 2 + 8(%esp) Arg# 1 + 4(%esp) Return address + (%esp) + + (Of course a function with e.g. 3 argumentS does not have entries for + arguments 4 and 5.) + + We put the arguments into registers from the stack, and save the + call-saved registers, by using the 386 `xchg' instruction to swap the + values in both directions. */ + +#undef DO_CALL +#define DO_CALL(args) \ + DOARGS_##args \ + int $0x80; \ + UNDOARGS_##args \ + +#define DOARGS_0 /* No arguments to frob. */ +#define UNDOARGS_0 /* No arguments to unfrob. */ +#define DOARGS_1 xchg 8(%esp), %ebx; DOARGS_0 /* Save %ebx on stack. */ +#define UNDOARGS_1 xchg 8(%esp), %ebx; UNDOARGS_0 /* Restore %ebx */ +#define DOARGS_2 movel 12(%esp), %ecx; DOARGS_1 +#define UNDOARGS_2 UNDOARGS_1 /* %ecx is clobbered. */ +#define DOARGS_3 movel 16(%esp), %edx; DOARGS_2 +#define UNDOARGS_3 UNDOARGS_2 /* %edx is clobbered. */ +#define DOARGS_4 xchg 20(%esp), %esi; DOARGS_3 /* Save %esi on stack. */ +#define UNDOARGS_4 xchg 20(%esp), %esi; UNDOARGS_3 /* Restore %esi. */ +#define DOARGS_5 xchg 24(%esp), %edi; DOARGS_3 /* Save %edi on stack. */ +#define UNDOARGS_5 xchg 24(%esp), %edi; UNDOARGS_3 /* Restore %edi. */ + + +#endif /* ASSEMBLER */ diff --git a/sysdeps/unix/sysv/sysv4/linux/listen.S b/sysdeps/unix/sysv/sysv4/linux/listen.S new file mode 100644 index 0000000000..d2cbec60a0 --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/listen.S @@ -0,0 +1,2 @@ +#define socket listen +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/rename.S b/sysdeps/unix/sysv/sysv4/linux/rename.S new file mode 100644 index 0000000000..a5a8dfeeef --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/rename.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/setsid.S b/sysdeps/unix/sysv/sysv4/linux/setsid.S new file mode 100644 index 0000000000..4930c56dcf --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/setsid.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/socketpair.S b/sysdeps/unix/sysv/sysv4/linux/socketpair.S new file mode 100644 index 0000000000..da71c57dea --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/socketpair.S @@ -0,0 +1,2 @@ +#define socket socketpair +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/wait4.S b/sysdeps/unix/sysv/sysv4/linux/wait4.S new file mode 100644 index 0000000000..e4c322341d --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/wait4.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/sysv4/linux/waitpid.S b/sysdeps/unix/sysv/sysv4/linux/waitpid.S new file mode 100644 index 0000000000..20d9d669bb --- /dev/null +++ b/sysdeps/unix/sysv/sysv4/linux/waitpid.S @@ -0,0 +1,24 @@ +/* Copyright (C) 1991, 1992, 1995 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include + +SYSCALL__ (waitpid, 3) + ret + +weak_alias (__waitpid, waitpid) -- cgit 1.4.1