diff options
| author | Andreas Jaeger <aj@suse.de> | 2002-02-07 10:39:07 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2002-02-07 10:39:07 +0000 |
| commit | a6049f98edbe1bbcfe62c9b7bb80a8f783c0e2b0 (patch) | |
| tree | daefebc2ad33b01ce974909aef938cc96f68a98b /linuxthreads | |
| parent | cd30b01ee9cdefd2e6f81b1c25ee6897243706fc (diff) | |
| download | glibc-a6049f98edbe1bbcfe62c9b7bb80a8f783c0e2b0.tar.gz glibc-a6049f98edbe1bbcfe62c9b7bb80a8f783c0e2b0.tar.xz glibc-a6049f98edbe1bbcfe62c9b7bb80a8f783c0e2b0.zip | |
Do not use branch likely.
2002-02-05 H.J. Lu <hjl@gnu.org> * sysdeps/mips/pspinlock.c (__pthread_spin_lock): Not use branch likely. * sysdeps/mips/pt-machine.h (testandset): Likewise. (__compare_and_swap): Likewise. >>>>>>> 1.469
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 8 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/mips/pspinlock.c | 9 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/mips/pt-machine.h | 11 |
3 files changed, 17 insertions, 11 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 49f1aa752a..7617d651fa 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2002-02-05 H.J. Lu <hjl@gnu.org> + + * sysdeps/mips/pspinlock.c (__pthread_spin_lock): Not use + branch likely. + * sysdeps/mips/pt-machine.h (testandset): Likewise. + (__compare_and_swap): Likewise. + 2002-02-07 Ulrich Drepper <drepper@redhat.com> * internals.h: Move declarations/definitions of @@ -9,6 +16,7 @@ * sysdeps/i386/tls.h: Add TLS definitions also for !FLOATING_STACKS. Define THREAD_GETMEM accordingly. +>>>>>>> 1.469 2002-02-06 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/tls.h: Include <stddef.h> for size_t. diff --git a/linuxthreads/sysdeps/mips/pspinlock.c b/linuxthreads/sysdeps/mips/pspinlock.c index bf0a2c833d..3a4f586fc1 100644 --- a/linuxthreads/sysdeps/mips/pspinlock.c +++ b/linuxthreads/sysdeps/mips/pspinlock.c @@ -32,17 +32,16 @@ __pthread_spin_lock (pthread_spinlock_t *lock) unsigned int tmp1, tmp2; asm volatile - ("\t\t\t# spin_lock\n\t" - "ll %1,%3\n" + ("\t\t\t# spin_lock\n" "1:\n\t" + "ll %1,%3\n\t" ".set push\n\t" ".set noreorder\n\t" "bnez %1,1b\n\t" " li %2,1\n\t" + ".set pop\n\t" "sc %2,%0\n\t" - "beqzl %2,1b\n\t" - " ll %1,%3\n\t" - ".set pop" + "beqz %2,1b" : "=m" (*lock), "=&r" (tmp1), "=&r" (tmp2) : "m" (*lock) : "memory"); diff --git a/linuxthreads/sysdeps/mips/pt-machine.h b/linuxthreads/sysdeps/mips/pt-machine.h index 368235e1a5..506cc3f979 100644 --- a/linuxthreads/sysdeps/mips/pt-machine.h +++ b/linuxthreads/sysdeps/mips/pt-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent pthreads configuration and inline functions. - Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ralf Baechle <ralf@gnu.org>. Based on the Alpha version by Richard Henderson <rth@tamu.edu>. @@ -57,18 +57,17 @@ __compare_and_swap (long int *p, long int oldval, long int newval) long int ret, temp; __asm__ __volatile__ - ("/* Inline compare & swap */\n\t" - "ll %1,%5\n" + ("/* Inline compare & swap */\n" "1:\n\t" + "ll %1,%5\n\t" ".set push\n\t" ".set noreorder\n\t" "bne %1,%3,2f\n\t" " move %0,$0\n\t" + ".set pop\n\t" "move %0,%4\n\t" "sc %0,%2\n\t" - "beqzl %0,1b\n\t" - " ll %1,%5\n\t" - ".set pop\n" + "beqz %0,1b\n" "2:\n\t" "/* End compare & swap */" : "=&r" (ret), "=&r" (temp), "=m" (*p) |