mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Remove socket.S implementation
This patch removes the socket.S implementation for all ports and replace it by a C implementation using socketcall. For ports that implement the syscall directly, there is no change. The patch idea is to simplify the socket function implementation that uses the socketcall to be based on C implemetation instead of a pseudo assembly implementation with arch specific parts. The patch then remove the assembly implementatation for the ports which uses socketcall (i386, microblaze, mips, powerpc, sparc, m68k, s390 and sh). I have cross-build GLIBC for afore-mentioned ports and tested on both i386 and ppc32 without regressions.
This commit is contained in:
Adhemerval Zanella
@ -1,116 +0,0 @@
|
||||
/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, 1997.
|
||||
|
||||
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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <sysdep-cancel.h>
|
||||
#include <socketcall.h>
|
||||
|
||||
#define P(a, b) P2(a, b)
|
||||
#define P2(a, b) a##b
|
||||
|
||||
#ifndef NARGS
|
||||
#ifdef socket
|
||||
#error NARGS not defined
|
||||
#endif
|
||||
#define NARGS 3
|
||||
#endif
|
||||
|
||||
.text
|
||||
/* The socket-oriented system calls are handled unusually 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. */
|
||||
|
||||
#ifndef __socket
|
||||
# ifndef NO_WEAK_ALIAS
|
||||
# define __socket P(__,socket)
|
||||
# else
|
||||
# define __socket socket
|
||||
# endif
|
||||
#endif
|
||||
|
||||
.globl __syscall_error
|
||||
ENTRY (__socket)
|
||||
|
||||
/* Drop up to 6 arguments (recvfrom) into the memory allocated by
|
||||
the caller for varargs, since that's really what we have. */
|
||||
st %o0, [%sp + 68 + 0]
|
||||
st %o1, [%sp + 68 + 4]
|
||||
#if NARGS > 2
|
||||
st %o2, [%sp + 68 + 8]
|
||||
#if NARGS > 3
|
||||
st %o3, [%sp + 68 + 12]
|
||||
#if NARGS > 4
|
||||
st %o4, [%sp + 68 + 16]
|
||||
#if NARGS > 5
|
||||
st %o5, [%sp + 68 + 20]
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined NEED_CANCELLATION && defined CENABLE
|
||||
SINGLE_THREAD_P
|
||||
cmp %g1, 0
|
||||
bne .Lsocket_cancel
|
||||
#endif
|
||||
mov P(SOCKOP_,socket), %o0 /* arg 1: socket subfunction */
|
||||
add %sp, 68, %o1 /* arg 2: parameter block */
|
||||
LOADSYSCALL(socketcall)
|
||||
t 0x10
|
||||
bcc 1f
|
||||
mov %o7, %g1
|
||||
call __syscall_error
|
||||
mov %g1, %o7
|
||||
1: jmpl %o7 + 8, %g0
|
||||
nop
|
||||
|
||||
#if defined NEED_CANCELLATION && defined CENABLE
|
||||
.Lsocket_cancel:
|
||||
save %sp, -96, %sp
|
||||
cfi_def_cfa_register(%fp)
|
||||
cfi_window_save
|
||||
cfi_register(%o7, %i7)
|
||||
CENABLE
|
||||
nop
|
||||
mov %o0, %l0
|
||||
add %sp, 68 + 96, %o1
|
||||
mov P(SOCKOP_,socket), %o0
|
||||
LOADSYSCALL(socketcall)
|
||||
t 0x10
|
||||
bcc 1f
|
||||
mov %o0, %l1
|
||||
CDISABLE;
|
||||
mov %l0, %o0;
|
||||
call __syscall_error;
|
||||
mov %l1, %o0;
|
||||
b 1f
|
||||
mov -1, %l1;
|
||||
1: CDISABLE
|
||||
mov %l0, %o0
|
||||
2: jmpl %i7 + 8, %g0
|
||||
restore %g0, %l1, %o0
|
||||
#endif
|
||||
|
||||
END (__socket)
|
||||
|
||||
#ifndef NO_WEAK_ALIAS
|
||||
weak_alias (__socket, socket)
|
||||
#endif
|
||||
@ -1,118 +0,0 @@
|
||||
/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, 1997.
|
||||
|
||||
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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <sysdep-cancel.h>
|
||||
#include <socketcall.h>
|
||||
|
||||
#define P(a, b) P2(a, b)
|
||||
#define P2(a, b) a##b
|
||||
|
||||
#ifndef NARGS
|
||||
#ifdef socket
|
||||
#error NARGS not defined
|
||||
#endif
|
||||
#define NARGS 3
|
||||
#endif
|
||||
|
||||
.text
|
||||
/* The socket-oriented system calls are handled unusually 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. */
|
||||
|
||||
#ifndef __socket
|
||||
# ifndef NO_WEAK_ALIAS
|
||||
# define __socket P(__,socket)
|
||||
# else
|
||||
# define __socket socket
|
||||
# endif
|
||||
#endif
|
||||
|
||||
.globl __syscall_error
|
||||
ENTRY(__socket)
|
||||
|
||||
/* Drop up to 6 arguments (recvfrom) into the memory allocated by
|
||||
the caller for varargs, since that's really what we have. */
|
||||
stx %o0, [%sp + STACK_BIAS + 128 + 0]
|
||||
stx %o1, [%sp + STACK_BIAS + 128 + 8]
|
||||
#if NARGS > 2
|
||||
stx %o2, [%sp + STACK_BIAS + 128 + 16]
|
||||
#if NARGS > 3
|
||||
stx %o3, [%sp + STACK_BIAS + 128 + 24]
|
||||
#if NARGS > 4
|
||||
stx %o4, [%sp + STACK_BIAS + 128 + 32]
|
||||
#if NARGS > 5
|
||||
stx %o5, [%sp + STACK_BIAS + 128 + 40]
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined NEED_CANCELLATION && defined CENABLE
|
||||
SINGLE_THREAD_P
|
||||
cmp %g1, 0
|
||||
bne .Lsocket_cancel
|
||||
#endif
|
||||
mov P(SOCKOP_,socket), %o0 /* arg 1: socket subfunction */
|
||||
add %sp, STACK_BIAS + 128, %o1 /* arg 2: parameter block */
|
||||
LOADSYSCALL(socketcall)
|
||||
ta 0x6d
|
||||
|
||||
bcc,pt %xcc, 1f
|
||||
mov %o7, %g1
|
||||
call __syscall_error
|
||||
mov %g1, %o7
|
||||
1: retl
|
||||
nop
|
||||
|
||||
#if defined NEED_CANCELLATION && defined CENABLE
|
||||
.Lsocket_cancel:
|
||||
save %sp, -160, %sp
|
||||
cfi_def_cfa_register (%fp)
|
||||
cfi_window_save
|
||||
cfi_register (%o7, %i7)
|
||||
CENABLE
|
||||
nop
|
||||
mov %o0, %l0
|
||||
add %sp, 160 + STACK_BIAS + 128, %o1
|
||||
mov P(SOCKOP_,socket), %o0
|
||||
LOADSYSCALL(socketcall)
|
||||
ta 0x6d
|
||||
|
||||
bcc,pt %xcc, 1f
|
||||
mov %o0, %l1
|
||||
CDISABLE;
|
||||
mov %l0, %o0;
|
||||
call __syscall_error;
|
||||
mov %l1, %o0;
|
||||
ba,pt %xcc, 2f
|
||||
mov -1, %l1;
|
||||
1: CDISABLE
|
||||
mov %l0, %o0
|
||||
2: jmpl %i7 + 8, %g0
|
||||
restore %g0, %l1, %o0
|
||||
#endif
|
||||
|
||||
END(__socket)
|
||||
|
||||
#ifndef NO_WEAK_ALIAS
|
||||
weak_alias (__socket, socket)
|
||||
#endif
|
||||
Reference in New Issue
Block a user