aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nptl/ChangeLog9
-rw-r--r--nptl/sysdeps/i386/i586/bits/atomic.h20
-rw-r--r--nptl/sysdeps/i386/i686/bits/atomic.h322
3 files changed, 30 insertions, 321 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 85ac51a32f..b341ecb759 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,14 @@
2002-12-03 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/i386/i686/bits/atomic.h: Use i486 version.
+ * sysdeps/i386/i486/bits/atomic.h: New file.
+ * sysdeps/i386/i586/bits/atomic.h: New file.
+ * sysdeps/i386/i686/pthread_spin_trylock.S: Define HAVE_CMOV and
+ include i486 version.
+ * sysdeps/i386/i486/pthread_spin_trylock.S: New file.
+ * sysdeps/i386/i586/pthread_spin_trylock.S: New file.
+ Patch by Marjin Ros <marjin@mad.scientist.com>.
+
* allocatestack.c (get_cached_stack): Don't crash if we first
found a stack with a larger size then needed.
Reported by Hui Huang <hui.huang@sun.com>.
diff --git a/nptl/sysdeps/i386/i586/bits/atomic.h b/nptl/sysdeps/i386/i586/bits/atomic.h
new file mode 100644
index 0000000000..9cb58d5f32
--- /dev/null
+++ b/nptl/sysdeps/i386/i586/bits/atomic.h
@@ -0,0 +1,20 @@
+/* Copyright (C) 2002 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. */
+
+#include "../../i486/bits/atomic.h"
diff --git a/nptl/sysdeps/i386/i686/bits/atomic.h b/nptl/sysdeps/i386/i686/bits/atomic.h
index 4389987425..9cb58d5f32 100644
--- a/nptl/sysdeps/i386/i686/bits/atomic.h
+++ b/nptl/sysdeps/i386/i686/bits/atomic.h
@@ -17,324 +17,4 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <stdint.h>
-
-
-typedef int8_t atomic8_t;
-typedef uint8_t uatomic8_t;
-typedef int_fast8_t atomic_fast8_t;
-typedef uint_fast8_t uatomic_fast8_t;
-
-typedef int16_t atomic16_t;
-typedef uint16_t uatomic16_t;
-typedef int_fast16_t atomic_fast16_t;
-typedef uint_fast16_t uatomic_fast16_t;
-
-typedef int32_t atomic32_t;
-typedef uint32_t uatomic32_t;
-typedef int_fast32_t atomic_fast32_t;
-typedef uint_fast32_t uatomic_fast32_t;
-
-typedef int64_t atomic64_t;
-typedef uint64_t uatomic64_t;
-typedef int_fast64_t atomic_fast64_t;
-typedef uint_fast64_t uatomic_fast64_t;
-
-typedef intptr_t atomicptr_t;
-typedef uintptr_t uatomicptr_t;
-typedef intmax_t atomic_max_t;
-typedef uintmax_t uatomic_max_t;
-
-
-#ifndef LOCK
-# ifdef UP
-# define LOCK /* nothing */
-# else
-# define LOCK "lock;"
-# endif
-#endif
-
-
-#define __arch_compare_and_exchange_8_acq(mem, newval, oldval) \
- ({ unsigned char ret; \
- __asm __volatile (LOCK "cmpxchgb %b2, %1; setne %0" \
- : "=a" (ret), "=m" (*mem) \
- : "q" (newval), "1" (*mem), "0" (oldval)); \
- ret; })
-
-#define __arch_compare_and_exchange_16_acq(mem, newval, oldval) \
- ({ unsigned char ret; \
- __asm __volatile (LOCK "cmpxchgw %w2, %1; setne %0" \
- : "=a" (ret), "=m" (*mem) \
- : "r" (newval), "1" (*mem), "0" (oldval)); \
- ret; })
-
-#define __arch_compare_and_exchange_32_acq(mem, newval, oldval) \
- ({ unsigned char ret; \
- __asm __volatile (LOCK "cmpxchgl %2, %1; setne %0" \
- : "=a" (ret), "=m" (*mem) \
- : "r" (newval), "1" (*mem), "0" (oldval)); \
- ret; })
-
-/* XXX We do not really need 64-bit compare-and-exchange. At least
- not in the moment. Using it would mean causing portability
- problems since not many other 32-bit architectures have support for
- such an operation. So don't define any code for now. If it is
- really going to be used the code below can be used. */
-#if 1
-# define __arch_compare_and_exchange_64_acq(mem, newval, oldval) \
- (abort (), 0)
-#else
-# ifdef __PIC__
-# define __arch_compare_and_exchange_64_acq(mem, newval, oldval) \
- ({ unsigned char ret; \
- int ignore; \
- __asm __volatile ("xchgl %3, %%ebx\n\t" \
- LOCK "cmpxchg8b %2, %1\n\t" \
- "setne %0\n\t" \
- "xchgl %3, %%ebx" \
- : "=a" (ret), "=m" (*mem), "=d" (ignore) \
- : "DS" (((unsigned long long int) (newval)) \
- & 0xffffffff), \
- "c" (((unsigned long long int) (newval)) >> 32), \
- "1" (*mem), "0" (((unsigned long long int) (oldval)) \
- & 0xffffffff), \
- "2" (((unsigned long long int) (oldval)) >> 32)); \
- ret; })
-# else
-# define __arch_compare_and_exchange_64_acq(mem, newval, oldval) \
- ({ unsigned char ret; \
- int ignore; \
- __asm __volatile (LOCK "cmpxchg8b %2, %1; setne %0" \
- : "=a" (ret), "=m" (*mem), "=d" (ignore) \
- : "b" (((unsigned long long int) (newval)) \
- & 0xffffffff), \
- "c" (((unsigned long long int) (newval)) >> 32), \
- "1" (*mem), "0" (((unsigned long long int) (oldval)) \
- & 0xffffffff), \
- "2" (((unsigned long long int) (oldval)) >> 32)); \
- ret; })
-# endif
-#endif
-
-
-#define atomic_exchange_and_add(mem, value) \
- ({ __typeof (*mem) result; \
- if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "xaddb %b0, %1" \
- : "=r" (result), "=m" (*mem) \
- : "0" (value), "1" (*mem)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "xaddw %w0, %1" \
- : "=r" (result), "=m" (*mem) \
- : "0" (value), "1" (*mem)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "xaddl %0, %1" \
- : "=r" (result), "=m" (*mem) \
- : "0" (value), "1" (*mem)); \
- else \
- { \
- __typeof (value) addval = (value); \
- __typeof (*mem) oldval; \
- __typeof (mem) memp = (mem); \
- do \
- result = (oldval = *memp) + addval; \
- while (! __arch_compare_and_exchange_64_acq (memp, result, oldval)); \
- } \
- result; })
-
-
-#define atomic_add(mem, value) \
- (void) ({ if (__builtin_constant_p (value) && (value) == 1) \
- atomic_increment (mem); \
- else if (__builtin_constant_p (value) && (value) == 1) \
- atomic_decrement (mem); \
- else if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "addb %b1, %0" \
- : "=m" (*mem) \
- : "ir" (value), "0" (*mem)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "addw %w1, %0" \
- : "=m" (*mem) \
- : "ir" (value), "0" (*mem)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "addl %1, %0" \
- : "=m" (*mem) \
- : "ir" (value), "0" (*mem)); \
- else \
- { \
- __typeof (value) addval = (value); \
- __typeof (*mem) oldval; \
- __typeof (mem) memp = (mem); \
- do \
- oldval = *memp; \
- while (! __arch_compare_and_exchange_64_acq (memp, \
- oldval + addval, \
- oldval)); \
- } \
- })
-
-
-#define atomic_add_negative(mem, value) \
- ({ unsigned char __result; \
- if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "addb %b2, %0; sets %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "iq" (value), "0" (*mem)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "addw %w2, %0; sets %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "ir" (value), "0" (*mem)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "addl %2, %0; sets %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "ir" (value), "0" (*mem)); \
- else \
- abort (); \
- __result; })
-
-
-#define atomic_add_zero(mem, value) \
- ({ unsigned char __result; \
- if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "addb %b2, %0; setz %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "ir" (value), "0" (*mem)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "addw %w2, %0; setz %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "ir" (value), "0" (*mem)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "addl %2, %0; setz %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "ir" (value), "0" (*mem)); \
- else \
- abort (); \
- __result; })
-
-
-#define atomic_increment(mem) \
- (void) ({ if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "incb %b0" \
- : "=m" (*mem) \
- : "0" (*mem)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "incw %w0" \
- : "=m" (*mem) \
- : "0" (*mem)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "incl %0" \
- : "=m" (*mem) \
- : "0" (*mem)); \
- else \
- { \
- __typeof (*mem) oldval; \
- __typeof (mem) memp = (mem); \
- do \
- oldval = *memp; \
- while (! __arch_compare_and_exchange_64_acq (memp, \
- oldval + 1, \
- oldval)); \
- } \
- })
-
-
-#define atomic_increment_and_test(mem) \
- ({ unsigned char __result; \
- if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "incb %0; sete %b1" \
- : "=m" (*mem), "=qm" (__result) \
- : "0" (*mem)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "incw %0; sete %w1" \
- : "=m" (*mem), "=qm" (__result) \
- : "0" (*mem)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "incl %0; sete %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "0" (*mem)); \
- else \
- abort (); \
- __result; })
-
-
-#define atomic_decrement(mem) \
- (void) ({ if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "decb %b0" \
- : "=m" (*mem) \
- : "0" (*mem)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "decw %w0" \
- : "=m" (*mem) \
- : "0" (*mem)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "decl %0" \
- : "=m" (*mem) \
- : "0" (*mem)); \
- else \
- { \
- __typeof (*mem) oldval; \
- __typeof (mem) memp = (mem); \
- do \
- oldval = *memp; \
- while (! __arch_compare_and_exchange_64_acq (memp, \
- oldval - 1, \
- oldval)); \
- } \
- })
-
-
-#define atomic_decrement_and_test(mem) \
- ({ unsigned char __result; \
- if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "decb %b0; sete %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "0" (*mem)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "decw %w0; sete %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "0" (*mem)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "decl %0; sete %1" \
- : "=m" (*mem), "=qm" (__result) \
- : "0" (*mem)); \
- else \
- abort (); \
- __result; })
-
-
-#define atomic_bit_set(mem, bit) \
- (void) ({ if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "orb %b2, %0" \
- : "=m" (*mem) \
- : "0" (*mem), "i" (1 << (bit))); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "orw %w2, %0" \
- : "=m" (*mem) \
- : "0" (*mem), "i" (1 << (bit))); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "orl %2, %0" \
- : "=m" (*mem) \
- : "0" (*mem), "i" (1 << (bit))); \
- else \
- abort (); \
- })
-
-
-#define atomic_bit_test_set(mem, bit) \
- ({ unsigned char __result; \
- if (sizeof (*mem) == 1) \
- __asm __volatile (LOCK "btsb %3, %1; setc %0" \
- : "=q" (__result), "=m" (*mem) \
- : "1" (*mem), "i" (bit)); \
- else if (sizeof (*mem) == 2) \
- __asm __volatile (LOCK "btsw %3, %1; setc %0" \
- : "=q" (__result), "=m" (*mem) \
- : "1" (*mem), "i" (bit)); \
- else if (sizeof (*mem) == 4) \
- __asm __volatile (LOCK "btsl %3, %1; setc %0" \
- : "=q" (__result), "=m" (*mem) \
- : "1" (*mem), "i" (bit)); \
- else \
- abort (); \
- __result; })
+#include "../../i486/bits/atomic.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 12:07:31 +0000