diff options
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/arm/pt-machine.h')
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/arm/pt-machine.h | 69 |
1 files changed, 6 insertions, 63 deletions
diff --git a/libpthread/linuxthreads/sysdeps/arm/pt-machine.h b/libpthread/linuxthreads/sysdeps/arm/pt-machine.h index 2b877f980..0a455b97d 100644 --- a/libpthread/linuxthreads/sysdeps/arm/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/arm/pt-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent pthreads configuration and inline functions. ARM version. - Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Philip Blundell <philb@gnu.org>. @@ -21,86 +21,29 @@ #ifndef _PT_MACHINE_H #define _PT_MACHINE_H 1 -#include <sys/syscall.h> -#include <unistd.h> +#include <features.h> #ifndef PT_EI # define PT_EI __extern_always_inline #endif -#if defined(__thumb__) -#if defined(__USE_LDREXSTREX__) -PT_EI long int ldrex(int *spinlock) -{ - long int ret; - __asm__ __volatile__( - "ldrex %0, [%1]\n" - : "=r"(ret) - : "r"(spinlock) : "memory"); - return ret; -} - -PT_EI long int strex(int val, int *spinlock) -{ - long int ret; - __asm__ __volatile__( - "strex %0, %1, [%2]\n" - : "=r"(ret) - : "r" (val), "r"(spinlock) : "memory"); - return ret; -} - -/* Spinlock implementation; required. */ -PT_EI long int -testandset (int *spinlock) -{ - register unsigned int ret; - - do { - ret = ldrex(spinlock); - } while (strex(1, spinlock)); - - return ret; -} - -#else /* __USE_LDREXSTREX__ */ - /* This will not work on ARM1 or ARM2 because SWP is lacking on those machines. Unfortunately we have no way to detect this at compile time; let's hope nobody tries to use one. */ /* Spinlock implementation; required. */ -PT_EI long int testandset (int *spinlock); -PT_EI long int testandset (int *spinlock) +PT_EI long int +testandset (int *spinlock) { register unsigned int ret; - void *pc; - __asm__ __volatile__( - ".align 0\n" - "\tbx pc\n" - "\tnop\n" - "\t.arm\n" - "\tswp %0, %2, [%3]\n" - "\torr %1, pc, #1\n" - "\tbx %1\n" - "\t.force_thumb" - : "=r"(ret), "=r"(pc) - : "0"(1), "r"(spinlock)); - return ret; -} -#endif -#else /* __thumb__ */ -PT_EI long int testandset (int *spinlock); -PT_EI long int testandset (int *spinlock) -{ - register unsigned int ret; __asm__ __volatile__("swp %0, %1, [%2]" : "=r"(ret) : "0"(1), "r"(spinlock)); + return ret; } -#endif + /* Get some notion of the current stack. Need not be exactly the top of the stack, just something somewhere in the current frame. */ |