diff options
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/createthread.c | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S | 17 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 15 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/pt-socket.S | 80 |
4 files changed, 98 insertions, 20 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/createthread.c b/nptl/sysdeps/unix/sysv/linux/i386/createthread.c index fc252e185d..f9abce2df2 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/createthread.c +++ b/nptl/sysdeps/unix/sysv/linux/i386/createthread.c @@ -82,6 +82,9 @@ create_thread (struct pthread *pd, STACK_VARIABLES_PARMS) /* Failed. */ return errno; + /* We now have for sure more than one thread. */ + pd->header.data.multiple_threads = 1; + /* Now fill in the information about the new thread in the newly created thread's data structure. We cannot let the new thread do this since we don't know whether it was @@ -142,5 +145,8 @@ create_thread (struct pthread *pd, STACK_VARIABLES_PARMS) /* Failed. */ return errno; + /* We now have for sure more than one thread. */ + pd->header.data.multiple_threads = 1; + return 0; } diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S index 65e39e7829..27275e3158 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include <sysdep.h> +#include <tls.h> .text @@ -48,13 +49,7 @@ __lll_lock_wait: orl $-1, %eax /* Load -1. */ #ifndef UP -# ifdef PIC - call __i686.get_pc_thunk.dx - addl $_GLOBAL_OFFSET_TABLE_, %edx - cmpl $0, __libc_locking_needed@GOTOFF(%edx) -# else - cmpl $0, __libc_locking_needed -# endif + cmpl $0, %gs:MULTIPLE_THREADS_OFFSET je,pt 0f lock 0: @@ -83,13 +78,7 @@ lll_unlock_wake_cb: movl 20(%esp), %ebx #ifndef UP -# ifdef PIC - call __i686.get_pc_thunk.dx - addl $_GLOBAL_OFFSET_TABLE_, %edx - cmpl $0, __libc_locking_needed@GOTOFF(%edx) -# else - cmpl $0, __libc_locking_needed -# endif + cmpl $0, %gs:MULTIPLE_THREADS_OFFSET je,pt 0f lock 0: diff --git a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 94c0314c12..7c516ee36a 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -21,6 +21,7 @@ #define _LOWLEVELLOCK_H 1 #include <time.h> +#include <sys/param.h> #include <bits/pthreadtypes.h> #ifndef LOCK_INSTR @@ -182,26 +183,27 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden; the lock prefix when the thread library is not used. XXX In future we might even want to avoid it on UP machines. */ +# include <tls.h> /* Nonzero if locking is needed. */ extern int __libc_locking_needed attribute_hidden; # define lll_trylock(futex) \ ({ unsigned char ret; \ - __asm __volatile ("cmpl $0, %5\n\t" \ + __asm __volatile ("cmpl $0, %%gs:%P5\n\t" \ "je,pt 0f\n\t" \ "lock\n" \ "0:\tcmpxchgl %2, %1; setne %0" \ : "=a" (ret), "=m" (futex) \ : "r" (0), "1" (futex), "0" (1), \ - "m" (__libc_locking_needed) \ + "i" (offsetof (tcbhead_t, multiple_threads)) \ : "memory"); \ ret; }) # define lll_lock(futex) \ (void) ({ int ignore1, ignore2; \ - __asm __volatile ("cmpl $0, %5\n\t" \ + __asm __volatile ("cmpl $0, %%gs:%P5\n\t" \ "je,pt 0f\n\t" \ "lock\n" \ "0:\txaddl %0, %2\n\t" \ @@ -214,13 +216,13 @@ extern int __libc_locking_needed attribute_hidden; "2:" \ : "=a" (ignore1), "=&c" (ignore2), "=m" (futex) \ : "0" (-1), "2" (futex), \ - "m" (__libc_locking_needed) \ + "i" (offsetof (tcbhead_t, multiple_threads)) \ : "memory"); }) # define lll_unlock(futex) \ (void) ({ int ignore; \ - __asm __volatile ("cmpl $0, %3\n\t" \ + __asm __volatile ("cmpl $0, %%gs:%P3\n\t" \ "je,pt 0f\n\t" \ "lock\n" \ "0:\tincl %0\n\t" \ @@ -232,7 +234,8 @@ extern int __libc_locking_needed attribute_hidden; ".previous\n" \ "2:" \ : "=m" (futex), "=&a" (ignore) \ - : "0" (futex), "m" (__libc_locking_needed) \ + : "0" (futex), \ + "i" (offsetof (tcbhead_t, multiple_threads)) \ : "memory"); }) #endif diff --git a/nptl/sysdeps/unix/sysv/linux/i386/pt-socket.S b/nptl/sysdeps/unix/sysv/linux/i386/pt-socket.S new file mode 100644 index 0000000000..0b8523bd86 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/i386/pt-socket.S @@ -0,0 +1,80 @@ +/* Copyright (C) 1995, 1996, 1997, 1998, 2002 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sysdep.h> +#include <socketcall.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 +# error "__socket and socket must be defined" +#endif + +.globl __socket +ENTRY (__socket) + /* We need one more register. */ + pushl %esi + + /* Enable asynchronous cancellation. */ + call __libc_enable_asynccancel /* No @plt */ + movl %eax, %esi + + /* Save registers. */ + movl %ebx, %edx + + movl $SYS_ify(socketcall), %eax /* System call number in %eax. */ + + /* Use ## so `socket' is a separate token that might be #define'd. */ + movl $P(SOCKOP_,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 the cancellation. */ + xchgl %esi, %eax + call __libc_disable_asynccancel /* No @plt */ + + /* Restore registers. */ + movl %esi, %eax + movl %edx, %ebx + popl %esi + + /* %eax is < 0 if there was an error. */ + cmpl $-125, %eax + jae SYSCALL_ERROR_LABEL + + /* Successful; return the syscall's value. */ +L(pseudo_end): + ret + +PSEUDO_END (__socket) + +#ifndef NO_WEAK_ALIAS +weak_alias (__socket, socket) +#endif |