1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +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
2015-05-22 08:36:08 -03:00
parent dc6b5aed1b
commit 60dce8b904
63 changed files with 702 additions and 1718 deletions

View File

@@ -1,179 +0,0 @@
/* Copyright (C) 1999-2015 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
<http://www.gnu.org/licenses/>. */
#include <sysdep-cancel.h>
#include <socketcall.h>
#include <tls.h>
#define P(a, b) P2(a, b)
#define P2(a, b) a##b
.text
/* 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. */
#ifndef __socket
#ifndef NO_WEAK_ALIAS
#define __socket P(__,socket)
#else
#define __socket socket
#endif
#endif
#define PUSHARGS_1 mov.l r4,@-r15; \
cfi_adjust_cfa_offset (4); \
cfi_rel_offset (r4, 0)
#define PUSHARGS_2 mov.l r5,@-r15; \
cfi_adjust_cfa_offset (4); \
cfi_rel_offset (r5, 0); \
PUSHARGS_1
#define PUSHARGS_3 mov.l r6,@-r15; \
cfi_adjust_cfa_offset (4); \
cfi_rel_offset (r6, 0); \
PUSHARGS_2
#define PUSHARGS_4 mov.l r7,@-r15; \
cfi_adjust_cfa_offset (4); \
cfi_rel_offset (r7, 0); \
PUSHARGS_3
#define PUSHARGS_5 PUSHARGS_4 /* Caller has already pushed arg 5 */
#define PUSHARGS_6 PUSHARGS_4 /* Caller has already pushed arg 5,6 */
#define POPARGS_1 add #4,r15; cfi_adjust_cfa_offset (-4)
#define POPARGS_2 add #8,r15; cfi_adjust_cfa_offset (-8)
#define POPARGS_3 add #12,r15; cfi_adjust_cfa_offset (-12)
#define POPARGS_4 add #16,r15; cfi_adjust_cfa_offset (-16)
#define POPARGS_5 POPARGS_4
#define POPARGS_6 POPARGS_4
#define ADJUSTCFI_1 cfi_adjust_cfa_offset (4); \
cfi_offset (r4, -4)
#define ADJUSTCFI_2 cfi_adjust_cfa_offset (8); \
cfi_offset (r4, -4); \
cfi_offset (r5, -8)
#define ADJUSTCFI_3 cfi_adjust_cfa_offset (12); \
cfi_offset (r4, -4); \
cfi_offset (r5, -8); \
cfi_offset (r6, -12)
#define ADJUSTCFI_4 cfi_adjust_cfa_offset (16); \
cfi_offset (r4, -4); \
cfi_offset (r5, -8); \
cfi_offset (r6, -12); \
cfi_offset (r7, -16)
#define ADJUSTCFI_5 ADJUSTCFI_4
#define ADJUSTCFI_6 ADJUSTCFI_4
#ifndef NARGS
/* If we were called with no wrapper, this is really socket(). */
#define NARGS 3
#endif
.globl __socket
ENTRY (__socket)
/* This will not work in the case of a socket call being interrupted
by a signal. If the signal handler uses any stack the arguments
to socket will be trashed. The results of a restart of any
socket call are then unpredictable. */
/* Push args onto the stack. */
P(PUSHARGS_,NARGS)
#if defined NEED_CANCELLATION && defined CENABLE
SINGLE_THREAD_P
bf .Lsocket_cancel
#endif
/* Do the system call trap. */
mov #+P(SOCKOP_,socket), r4
mov r15, r5
mov.l .L1,r3
trapa #0x12
/* Pop args off the stack */
P(POPARGS_,NARGS)
mov r0, r1
mov #-12, r2
shad r2, r1
not r1, r1 // r1=0 means r0 = -1 to -4095
tst r1, r1 // i.e. error in linux
bf .Lpseudo_end
.Lsyscall_error:
SYSCALL_ERROR_HANDLER
.Lpseudo_end:
/* Successful; return the syscall's value. */
rts
nop
#if defined NEED_CANCELLATION && defined CENABLE
.Lsocket_cancel:
/* Enable asynchronous cancellation. */
P(ADJUSTCFI_,NARGS)
sts.l pr,@-r15
cfi_adjust_cfa_offset (4)
cfi_rel_offset (pr, 0)
CENABLE
lds.l @r15+,pr
cfi_adjust_cfa_offset (-4)
cfi_restore (pr)
/* Do the system call trap. */
mov #+P(SOCKOP_,socket), r4
mov r15, r5
mov.l .L1,r3
trapa #0x12
sts.l pr,@-r15
cfi_adjust_cfa_offset (4)
cfi_rel_offset (pr, 0)
mov.l r0,@-r15
cfi_adjust_cfa_offset (4)
cfi_rel_offset (r0, 0)
CDISABLE
mov.l @r15+,r0
cfi_adjust_cfa_offset (-4)
cfi_restore (r0)
lds.l @r15+,pr
cfi_adjust_cfa_offset (-4)
cfi_restore (pr)
/* Pop args off the stack */
P(POPARGS_,NARGS)
mov r0, r1
mov #-12, r2
shad r2, r1
not r1, r1 // r1=0 means r0 = -1 to -4095
tst r1, r1 // i.e. error in linux
bf .Lpseudo_end
bra .Lsyscall_error
nop
#endif
.align 2
.L1:
.long SYS_ify(socketcall)
PSEUDO_END (__socket)
#ifndef NO_WEAK_ALIAS
weak_alias (__socket, socket)
#endif