* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Fix asm syntax.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/lowlevelmutex.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/pthread_once.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sem_post.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sem_trywait.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Likewise.
* sysdeps/x86_64/tls.h (THREAD_SELF, THREAD_GETMEM, THREAD_GETMEM_NC,
THREAD_SETMEM, THREAD_SETMEM_NC): Correct asm syntax.
* allocatestack.c [! TLS_MULTIPLE_THREADS_IN_TCB] (allocate_stack):
Initialize *__libc_multiple_threads_ptr not __libc_multiple_threads.
* sysdeps/pthread/createthread.c [! TLS_MULTIPLE_THREADS_IN_TCB]
(create_thread): Likewise.
Define __pthread_multiple_threads and __libc_multiple_threads_ptr.
* init.c (__pthread_initialize_minimal_internal): Initialize
__libc_multiple_threads_ptr if necessary.
* pthreadP.h: Adjust prototype for __libc_pthread_init. Declare
__pthread_multiple_threads and __libc_multiple_threads_ptr.
* sysdeps/unix/sysv/linux/libc_pthread_init.c: Define
__libc_multiple_threads.
(__libc_pthread_init): Return pointer to __libc_pthread_init if
necessary.
* sysdeps/i386/tls.h (THREAD_SETMEM): Fix one-byte variant.
(THREAD_SETMEM_NC): Likewise.
* sysdeps/x86_64/pthread_spin_trylock.c: Removed.
* sysdeps/x86_64/pthread_spin_trylock.S: New file.
* sysdeps/x86_64/pthread_spin_unlock.c: Removed.
* sysdeps/x86_64/pthread_spin_unlock.S: New file.
* sysdeps/i386/i486/pthread_spin_trylock.S (pthread_spin_trylock):
Eliminate one entire instruction.
2003-03-11 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Fix asm syntax.
+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/lowlevelmutex.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_once.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sem_post.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sem_trywait.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Likewise.
+
+ * sysdeps/x86_64/tls.h (THREAD_SELF, THREAD_GETMEM, THREAD_GETMEM_NC,
+ THREAD_SETMEM, THREAD_SETMEM_NC): Correct asm syntax.
+
+ * allocatestack.c [! TLS_MULTIPLE_THREADS_IN_TCB] (allocate_stack):
+ Initialize *__libc_multiple_threads_ptr not __libc_multiple_threads.
+ * sysdeps/pthread/createthread.c [! TLS_MULTIPLE_THREADS_IN_TCB]
+ (create_thread): Likewise.
+ Define __pthread_multiple_threads and __libc_multiple_threads_ptr.
+ * init.c (__pthread_initialize_minimal_internal): Initialize
+ __libc_multiple_threads_ptr if necessary.
+ * pthreadP.h: Adjust prototype for __libc_pthread_init. Declare
+ __pthread_multiple_threads and __libc_multiple_threads_ptr.
+ * sysdeps/unix/sysv/linux/libc_pthread_init.c: Define
+ __libc_multiple_threads.
+ (__libc_pthread_init): Return pointer to __libc_pthread_init if
+ necessary.
+
+ * sysdeps/i386/tls.h (THREAD_SETMEM): Fix one-byte variant.
+ (THREAD_SETMEM_NC): Likewise.
+
+ * sysdeps/x86_64/pthread_spin_trylock.c: Removed.
+ * sysdeps/x86_64/pthread_spin_trylock.S: New file.
+ * sysdeps/x86_64/pthread_spin_unlock.c: Removed.
+ * sysdeps/x86_64/pthread_spin_unlock.S: New file.
+
+ * sysdeps/i386/i486/pthread_spin_trylock.S (pthread_spin_trylock):
+ Eliminate one entire instruction.
+
* cancellation.c (__pthread_enable_asynccancel_2): New function.
* pthreadP.h: Declare __pthread_enable_asynccancel_2.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
/* This is at least the second thread. */
pd->multiple_threads = 1;
#else
- __pthread_multiple_threads = __libc_multiple_threads = 1;
+ __pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
#endif
#ifdef NEED_DL_SYSINFO
/* This is at least the second thread. */
pd->multiple_threads = 1;
#else
- __pthread_multiple_threads = __libc_multiple_threads = 1;
+ __pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
#endif
#ifdef NEED_DL_SYSINFO
#endif
/* Register the fork generation counter with the libc. */
- __libc_pthread_init (&__fork_generation, __reclaim_stacks,
- ptr_pthread_functions);
+#ifndef TLS_MULTIPLE_THREADS_IN_TCB
+ __libc_multiple_threads_ptr =
+#endif
+ __libc_pthread_init (&__fork_generation, __reclaim_stacks,
+ ptr_pthread_functions);
}
strong_alias (__pthread_initialize_minimal_internal,
__pthread_initialize_minimal)
hidden_proto (__nptl_death_event)
/* Register the generation counter in the libpthread with the libc. */
+#ifdef TLS_MULTIPLE_THREADS_IN_TCB
extern void __libc_pthread_init (unsigned long int *ptr,
void (*reclaim) (void),
- const struct pthread_functions *functions);
+ const struct pthread_functions *functions)
+ internal_function;
+#else
+extern int *__libc_pthread_init (unsigned long int *ptr,
+ void (*reclaim) (void),
+ const struct pthread_functions *functions)
+ internal_function;
+
+/* Variable set to a nonzero value if more than one thread runs or ran. */
+extern int __pthread_multiple_threads attribute_hidden;
+/* Pointer to the corresponding variable in libc. */
+extern int *__libc_multiple_threads_ptr attribute_hidden;
+#endif
/* Namespace save aliases. */
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
xorl %ecx, %ecx
LOCK
cmpxchgl %ecx, (%edx)
- movl $EBUSY, %edx
- movl %ecx, %eax
+ movl $EBUSY, %eax
#ifdef HAVE_CMOV
- cmovnel %edx, %eax
+ cmovel %ecx, %eax
#else
- je 0f
- movl %edx, %eax
+ jne 0f
+ movl %ecx, %eax
0:
#endif
ret
/* Same as THREAD_SETMEM, but the member offset can be non-constant. */
# define THREAD_SETMEM(descr, member, value) \
({ if (sizeof (descr->member) == 1) \
- asm volatile ("movb %0,%%gs:%P1" : \
+ asm volatile ("movb %b0,%%gs:%P1" : \
: "iq" (value), \
"i" (offsetof (struct pthread, member))); \
else if (sizeof (descr->member) == 4) \
/* Set member of the thread descriptor directly. */
# define THREAD_SETMEM_NC(descr, member, idx, value) \
({ if (sizeof (descr->member[0]) == 1) \
- asm volatile ("movb %0,%%gs:%P1(%2)" : \
+ asm volatile ("movb %b0,%%gs:%P1(%2)" : \
: "iq" (value), \
"i" (offsetof (struct pthread, member)), \
"r" (idx)); \
#endif
+#ifndef TLS_MULTIPLE_THREADS_IN_TCB
+/* Variable set to a nonzero value if more than one thread runs or ran. */
+int __pthread_multiple_threads attribute_hidden;
+/* Pointer to the corresponding variable in libc. */
+int *__libc_multiple_threads_ptr attribute_hidden;
+#endif
+
+
static int
create_thread (struct pthread *pd, STACK_VARIABLES_PARMS)
{
/* We now have for sure more than one thread. */
pd->multiple_threads = 1;
#else
- __pthread_multiple_threads = __libc_multiple_threads = 1;
+ __pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
#endif
/* Now fill in the information about the new thread in
struct fork_handler __pthread_child_handler attribute_hidden;
+#ifdef TLS_MULTIPLE_THREADS_IN_TCB
void
+#else
+int __libc_multiple_threads attribute_hidden;
+
+int *
+#endif
__libc_pthread_init (ptr, reclaim, functions)
unsigned long int *ptr;
void (*reclaim) (void);
memcpy (&__libc_pthread_functions, functions,
sizeof (__libc_pthread_functions));
#endif
+
+#ifndef TLS_MULTIPLE_THREADS_IN_TCB
+ return &__libc_multiple_threads;
+#endif
}
.hidden __lll_timedwait_tid
.align 16
__lll_timedwait_tid:
- movl %rdi, %r8
- movl %rsi, %r9
+ movq %rdi, %r8
+ movq %rsi, %r9
subq $16, %rsp
syscall
/* Compute relative timeout. */
- movq 8(%esp), %rax
+ movq 8(%rsp), %rax
movq $1000, %rdi
mul %rdi /* Milli seconds to nano seconds. */
movq (%r9), %rdi
".previous\n" \
"2:" \
: "=a" (result), "=&D" (ignore1), "=&S" (ignore2), \
- "=&d" (ignore2), "=m" (futex) \
+ "=&d" (ignore3), "=m" (futex) \
: "0" (1), "4" (futex), "m" (timeout) \
: "memory", "cx", "cc", "r10"); \
result; })
int __ignore; \
register __typeof (tid) _tid asm ("edx") = (tid); \
if (_tid != 0) \
- __asm __volatile ("1:\tmovq %1, %%rax\n\t" \
+ __asm __volatile ("xorq %%r10, %%r10\n\t" \
+ "1:\tmovq %3, %%rax\n\t" \
"syscall\n\t" \
"cmpl $0, (%%rdi)\n\t" \
"jne 1b" \
: "=&a" (__ignore) \
- : "i" (SYS_futex), "D" (&tid), "r10" (0), \
- "S" (FUTEX_WAIT), "d" (_tid) \
- : "memory", "cc", "r11", "cx"); \
+ : "S" (FUTEX_WAIT), "i" (SYS_futex), "D" (&tid), \
+ "d" (_tid) \
+ : "memory", "cc", "r10", "r11", "cx"); \
} while (0)
extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
movq %rdi, %r8
movq %rdx, %r9
- leal 1(%eax), %edx
+ leaq 1(%rax), %rdx
/* Get current time. */
1:
syscall
/* Compute relative timeout. */
- movq 8(%esp), %rax
+ movq 8(%rsp), %rax
movq $1000, %rdi
mul %rdi /* Milli seconds to nano seconds. */
movq (%r9), %rdi
/* Wake up one thread. */
movq $FUTEX_WAKE, %rsi
movq $SYS_futex, %rax
- movq %rsi, %edx /* movl $1, %edx */
+ movq %rsi, %rdx /* movl $1, %edx */
syscall
/* Unlock. */
__condvar_cleanup:
/* Get internal lock. */
movq %rdi, %r8
- movl 8(%rdi), %rdi
+ movq 8(%rdi), %rdi
movl $1, %esi
LOCK
#if cond_lock == 0
2: testq $2, (%r8)
jne 3f
- movq 16(%r8), %edi
+ movq 16(%r8), %rdi
callq __pthread_mutex_lock_internal
3: retq
.type __pthread_cond_wait, @function
.align 16
__pthread_cond_wait:
- pushq %12
+ pushq %r12
subq $64, %rsp
/* Prepare structure passed to cancellation handler. */
/* Install cancellation handler. */
#ifdef PIC
- leaq __condvar_cleanup@GOTOFF(%rip), %rsi
+ leaq __condvar_cleanup(%rip), %rsi
#else
leaq __condvar_cleanup, %rsi
#endif
#endif
jne 3f
-4: movq %rsp, %edi
+4: movq %rsp, %rdi
callq __pthread_enable_asynccancel_2
movq 8(%rsp), %rdi
/* Somebody else got here first. Wait. */
movq %r10, %rsi /* movl $FUTEX_WAIT, %ecx */
- movq $SYS_futex, %eax
+ movq $SYS_futex, %rax
syscall
jmp 6b
__new_sem_post:
movl $1, %edx
LOCK
- xaddl %edx, (%ebx)
+ xaddl %edx, (%rdi)
movq $SYS_futex, %rax
movq $FUTEX_WAKE, %rsi
2: testl %eax, %eax
je 1f
- leal -1(%eax), %edx
+ leaq -1(%rax), %rdx
LOCK
cmpxchgl %edx, (%rdi)
jne 2b
movl $EINVAL, %eax
jae 6f
-7: xorl %rsi, %rsi
+7: xorq %rsi, %rsi
movq %rsp, %rdi
movq $SYS_gettimeofday, %rax
syscall
/* Compute relative timeout. */
- movq 8(%rsp), %eax
+ movq 8(%rsp), %rax
movq $1000, %rdi
mul %rdi /* Milli seconds to nano seconds. */
movq (%r9), %rdi
movl $ETIMEDOUT, %eax
js 6f /* Time is already up. */
- movl %rdi, (%rsp) /* Store relative timeout. */
- movl %rsi, 8(%rsp)
+ movq %rdi, (%rsp) /* Store relative timeout. */
+ movq %rsi, 8(%rsp)
movq %r8, %rdi
xorq %rsi, %rsi
8: testl %eax, %eax
je 7b
- leal -1(%eax), %ecx
+ leaq -1(%rax), %rcx
LOCK
cmpxchgl %ecx, (%rdi)
jne 8b
xorl %eax, %eax
retq
-3: negq %eax
+3: negq %rax
6:
#if USE___THREAD
movq errno@gottpoff(%rip), %rdx
2: testl %eax, %eax
jz 1f
- leal -1(%eax), %edx
+ leaq -1(%rax), %rdx
LOCK
cmpxchgl %edx, (%rdi)
jne 2b
2: testl %eax, %eax
je 1f
- leal -1(%eax), %edx
+ leaq -1(%rax), %rdx
LOCK
cmpxchgl %edx, (%rdi)
jne 2b
--- /dev/null
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+
+ 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. */
+
+#define EBUSY 16
+
+
+#ifdef UP
+# define LOCK
+#else
+# define LOCK lock
+#endif
+
+ .globl pthread_spin_trylock
+ .type pthread_spin_trylock,@function
+ .align 16
+pthread_spin_trylock:
+ movl $1, %eax
+ xorl %ecx, %ecx
+ LOCK
+ cmpxchgl %ecx, (%rdi)
+ movl $EBUSY, %eax
+ cmovel %ecx, %eax
+ retq
+ .size pthread_spin_trylock,.-pthread_spin_trylock
+++ /dev/null
-#include "../i386/i686/pthread_spin_trylock.c"
--- /dev/null
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+
+ 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. */
+
+ .globl pthread_spin_unlock
+ .type pthread_spin_unlock,@function
+ .align 16
+pthread_spin_unlock:
+ movl $1, (%rdi)
+ xorl %eax, %eax
+ retq
+ .size pthread_spin_unlock,.-pthread_spin_unlock
+
+ /* The implementation of pthread_spin_init is identical. */
+ .globl pthread_spin_init
+pthread_spin_init = pthread_spin_unlock
+++ /dev/null
-#include "../i386/pthread_spin_unlock.c"
do not get optimized away. */
# define THREAD_SELF \
({ struct pthread *__self; \
- asm ("movq %%fs:%c1,%0" : "=r" (__self) \
+ asm ("movq %%fs:%c1,%q0" : "=r" (__self) \
: "i" (offsetof (struct pthread, self))); \
__self;})
4 or 8. */ \
abort (); \
\
- asm ("movq %%fs:%P1,%0" \
+ asm ("movq %%fs:%P1,%q0" \
: "=r" (__value) \
: "i" (offsetof (struct pthread, member))); \
} \
# define THREAD_GETMEM_NC(descr, member, idx) \
({ __typeof (descr->member[0]) __value; \
if (sizeof (__value) == 1) \
- asm ("movb %%fs:%P2(%3),%b0" \
+ asm ("movb %%fs:%P2(%q3),%b0" \
: "=q" (__value) \
: "0" (0), "i" (offsetof (struct pthread, member[0])), \
"r" (idx)); \
else if (sizeof (__value) == 4) \
- asm ("movl %%fs:%P1(,%2,4),%0" \
+ asm ("movl %%fs:%P1(,%q2,4),%0" \
: "=r" (__value) \
: "i" (offsetof (struct pthread, member[0])), "r" (idx)); \
else \
4 or 8. */ \
abort (); \
\
- asm ("movq %%fs:%P1(,%2,8),%0" \
+ asm ("movq %%fs:%P1(,%q2,8),%q0" \
: "=r" (__value) \
: "i" (offsetof (struct pthread, member[0])), "r" (idx)); \
} \
/* Same as THREAD_SETMEM, but the member offset can be non-constant. */
# define THREAD_SETMEM(descr, member, value) \
({ if (sizeof (descr->member) == 1) \
- asm volatile ("movb %0,%%fs:%P1" : \
+ asm volatile ("movb %b0,%%fs:%P1" : \
: "iq" (value), \
"i" (offsetof (struct pthread, member))); \
else if (sizeof (descr->member) == 4) \
4 or 8. */ \
abort (); \
\
- asm volatile ("movq %0,%%fs:%P1" : \
+ asm volatile ("movq %q0,%%fs:%P1" : \
: "ir" ((unsigned long int) value), \
"i" (offsetof (struct pthread, member))); \
}})
/* Set member of the thread descriptor directly. */
# define THREAD_SETMEM_NC(descr, member, idx, value) \
({ if (sizeof (descr->member[0]) == 1) \
- asm volatile ("movb %0,%%fs:%P1(%2)" : \
+ asm volatile ("movb %b0,%%fs:%P1(%q2)" : \
: "iq" (value), \
"i" (offsetof (struct pthread, member[0])), \
"r" (idx)); \
else if (sizeof (descr->member[0]) == 4) \
- asm volatile ("movl %0,%%fs:%P1(,%2,4)" : \
+ asm volatile ("movl %0,%%fs:%P1(,%q2,4)" : \
: "ir" (value), \
"i" (offsetof (struct pthread, member[0])), \
"r" (idx)); \
4 or 8. */ \
abort (); \
\
- asm volatile ("movq %0,%%fs:%P1(,%2,8)" : \
+ asm volatile ("movq %q0,%%fs:%P1(,%q2,8)" : \
: "r" ((unsigned long int) value), \
"i" (offsetof (struct pthread, member[0])), \
"r" (idx)); \
projects / thirdparty / glibc.git / commitdiff
