aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-05-18 09:48:05 +0000
committerUlrich Drepper <drepper@redhat.com>1999-05-18 09:48:05 +0000
commit1acf7665c7b5f1d65b322de82065c4eaec623afe (patch)
tree09312155fcdcf84d7611ee61771306e42000f83d
parent2a269cd083e6e40255952e4300178b819514cca7 (diff)
downloadglibc-1acf7665c7b5f1d65b322de82065c4eaec623afe.tar
glibc-1acf7665c7b5f1d65b322de82065c4eaec623afe.tar.gz
glibc-1acf7665c7b5f1d65b322de82065c4eaec623afe.tar.bz2
glibc-1acf7665c7b5f1d65b322de82065c4eaec623afe.zip
Update.
1999-05-18 Ulrich Drepper <drepper@cygnus.com> * sysdeps/wordsize-64/stdint.h (INTPTR_MAX): Add missing ). 1999-05-17 David S. Miller <davem@redhat.com> * sysdeps/sparc/sparc32/atomicity.h: New file. * sysdeps/sparc/sparc32/sparcv9/atomicity.h: New file. * sysdeps/sparc/sparc64/atomicity.h: New file. * sysdeps/sparc/sparc32/sparcv9/Makefile: Add -Wa,-Av9a to sysdep-CFLAGS.
-rw-r--r--ChangeLog12
-rw-r--r--linuxthreads/sysdeps/sparc/sparc64/pt-machine.h4
-rw-r--r--sysdeps/sparc/sparc32/atomicity.h98
-rw-r--r--sysdeps/sparc/sparc32/sparcv9/Makefile2
-rw-r--r--sysdeps/sparc/sparc32/sparcv9/atomicity.h82
-rw-r--r--sysdeps/sparc/sparc64/atomicity.h82
-rw-r--r--sysdeps/wordsize-64/stdint.h2
7 files changed, 278 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e58f6a64cc..69aef2ae8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-05-18 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/wordsize-64/stdint.h (INTPTR_MAX): Add missing ).
+
+1999-05-17 David S. Miller <davem@redhat.com>
+
+ * sysdeps/sparc/sparc32/atomicity.h: New file.
+ * sysdeps/sparc/sparc32/sparcv9/atomicity.h: New file.
+ * sysdeps/sparc/sparc64/atomicity.h: New file.
+ * sysdeps/sparc/sparc32/sparcv9/Makefile: Add -Wa,-Av9a to
+ sysdep-CFLAGS.
+
1999-05-18 Richard Henderson <rth@twiddle.net>
* sysdeps/alpha/memchr.S: Zap high byte of length. Reschedule.
diff --git a/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h b/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h
index 101b85516a..5560003fc8 100644
--- a/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h
+++ b/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h
@@ -63,11 +63,11 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
{
long int readval;
- __asm__ __volatile__ ("cas [%4], %2, %0"
+ __asm__ __volatile__ ("casx [%4], %2, %0"
: "=r"(readval), "=m"(*p)
: "r"(oldval), "m"(*p), "r"(p), "0"(newval));
- return readval == newval;
+ return readval == oldval;
}
/* Access to data in the thread descriptor is easy. */
diff --git a/sysdeps/sparc/sparc32/atomicity.h b/sysdeps/sparc/sparc32/atomicity.h
new file mode 100644
index 0000000000..9acf8ee1fc
--- /dev/null
+++ b/sysdeps/sparc/sparc32/atomicity.h
@@ -0,0 +1,98 @@
+/* Low-level functions for atomic operations. Sparc32 version.
+ Copyright (C) 1999 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _ATOMICITY_H
+#define _ATOMICITY_H 1
+
+#include <inttypes.h>
+
+static int
+__attribute__ ((unused))
+exchange_and_add (volatile uint32_t *mem, int val)
+{
+ static unsigned char lock;
+ int result, tmp;
+
+ __asm__ __volatile__("1: ldstub [%1], %0\n\t"
+ " cmp %0, 0\n\t"
+ " bne 1b\n\t"
+ " nop"
+ : "=&r" (tmp)
+ : "r" (&lock)
+ : "memory");
+ result = *mem;
+ *mem += val;
+ __asm__ __volatile__("stb %%g0, [%0]"
+ : /* no outputs */
+ : "r" (&lock)
+ : "memory");
+ return result;
+}
+
+static void
+__attribute__ ((unused))
+atomic_add (volatile uint32_t *mem, int val)
+{
+ static unsigned char lock;
+ int tmp;
+
+ __asm__ __volatile__("1: ldstub [%1], %0\n\t"
+ " cmp %0, 0\n\t"
+ " bne 1b\n\t"
+ " nop"
+ : "=&r" (tmp)
+ : "r" (&lock)
+ : "memory");
+ *mem += val;
+ __asm__ __volatile__("stb %%g0, [%0]"
+ : /* no outputs */
+ : "r" (&lock)
+ : "memory");
+}
+
+static int
+__attribute__ ((unused))
+compare_and_swap (volatile long int *p, long int oldval, long int newval)
+{
+ static unsigned char lock;
+ int ret, tmp;
+
+ __asm__ __volatile__("1: ldstub [%1], %0\n\t"
+ " cmp %0, 0\n\t"
+ " bne 1b\n\t"
+ " nop"
+ : "=&r" (tmp)
+ : "r" (&lock)
+ : "memory");
+ if (*p != oldval)
+ ret = 0;
+ else
+ {
+ *p = newval;
+ ret = 1;
+ }
+ __asm__ __volatile__("stb %%g0, [%0]"
+ : /* no outputs */
+ : "r" (&lock)
+ : "memory");
+
+ return ret;
+}
+
+#endif /* atomicity.h */
diff --git a/sysdeps/sparc/sparc32/sparcv9/Makefile b/sysdeps/sparc/sparc32/sparcv9/Makefile
index 1d1a6c13c0..3fef30cc6e 100644
--- a/sysdeps/sparc/sparc32/sparcv9/Makefile
+++ b/sysdeps/sparc/sparc32/sparcv9/Makefile
@@ -1,4 +1,4 @@
-sysdep-CFLAGS += -mv8 -mtune=ultrasparc
+sysdep-CFLAGS += -mv8 -mtune=ultrasparc -Wa,-Av9a
ifeq ($(subst gnulib,string,$(subdir)),string)
ASFLAGS-.o += -Wa,-Av9a
diff --git a/sysdeps/sparc/sparc32/sparcv9/atomicity.h b/sysdeps/sparc/sparc32/sparcv9/atomicity.h
new file mode 100644
index 0000000000..a8ca0cc249
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/atomicity.h
@@ -0,0 +1,82 @@
+/* Low-level functions for atomic operations. Sparc32+v9 version.
+ Copyright (C) 1999 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _ATOMICITY_H
+#define _ATOMICITY_H 1
+
+#include <inttypes.h>
+
+static inline int
+__attribute__ ((unused))
+exchange_and_add (volatile uint32_t *mem, int val)
+{
+ uint32_t tmp1, tmp2;
+
+ __asm__ __volatile__("1: lduw [%2], %0\n\t"
+ " add %0, %3, %1\n\t"
+ " cas [%2], %0, %1\n\t"
+ " sub %0, %1, %0\n\t"
+ " brnz,pn %0, 1b\n\t"
+ " nop"
+ : "=&r" (tmp1), "=&r" (tmp2)
+ : "r" (mem), "r" (val)
+ : "memory");
+ return tmp2;
+}
+
+static inline void
+__attribute__ ((unused))
+atomic_add (volatile uint32_t *mem, int val)
+{
+ uint32_t tmp1, tmp2;
+
+ __asm__ __volatile__("1: lduw [%2], %0\n\t"
+ " add %0, %3, %1\n\t"
+ " cas [%2], %0, %1\n\t"
+ " sub %0, %1, %0\n\t"
+ " brnz,pn %0, 1b\n\t"
+ " nop"
+ : "=&r" (tmp1), "=&r" (tmp2)
+ : "r" (mem), "r" (val)
+ : "memory");
+}
+
+static inline int
+__attribute__ ((unused))
+compare_and_swap (volatile long int *p, long int oldval, long int newval)
+{
+ register long int tmp, tmp2;
+
+ __asm__ __volatile__("1: lduw [%4], %0\n\t"
+ " mov %2, %1\n\t"
+ " cmp %0, %3\n\t"
+ " bne,a,pn %%xcc, 2f\n\t"
+ " mov 0, %0\n\t"
+ " cas [%4], %0, %1\n\t"
+ " sub %0, %1, %0\n\t"
+ " brnz,pn %0, 1b\n\t"
+ " mov 1, %0\n\t"
+ "2:"
+ : "=&r" (tmp), "=&r" (tmp2)
+ : "r" (newval), "r" (oldval), "r" (p)
+ : "memory");
+ return tmp;
+}
+
+#endif /* atomicity.h */
diff --git a/sysdeps/sparc/sparc64/atomicity.h b/sysdeps/sparc/sparc64/atomicity.h
new file mode 100644
index 0000000000..33cf66623e
--- /dev/null
+++ b/sysdeps/sparc/sparc64/atomicity.h
@@ -0,0 +1,82 @@
+/* Low-level functions for atomic operations. Sparc64 version.
+ Copyright (C) 1999 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _ATOMICITY_H
+#define _ATOMICITY_H 1
+
+#include <inttypes.h>
+
+static inline int
+__attribute__ ((unused))
+exchange_and_add (volatile uint32_t *mem, int val)
+{
+ uint32_t tmp1, tmp2;
+
+ __asm__ __volatile__("1: lduw [%2], %0\n\t"
+ " add %0, %3, %1\n\t"
+ " cas [%2], %0, %1\n\t"
+ " sub %0, %1, %0\n\t"
+ " brnz,pn %0, 1b\n\t"
+ " nop"
+ : "=&r" (tmp1), "=&r" (tmp2)
+ : "r" (mem), "r" (val)
+ : "memory");
+ return tmp2;
+}
+
+static inline void
+__attribute__ ((unused))
+atomic_add (volatile uint32_t *mem, int val)
+{
+ uint32_t tmp1, tmp2;
+
+ __asm__ __volatile__("1: lduw [%2], %0\n\t"
+ " add %0, %3, %1\n\t"
+ " cas [%2], %0, %1\n\t"
+ " sub %0, %1, %0\n\t"
+ " brnz,pn %0, 1b\n\t"
+ " nop"
+ : "=&r" (tmp1), "=&r" (tmp2)
+ : "r" (mem), "r" (val)
+ : "memory");
+}
+
+static inline int
+__attribute__ ((unused))
+compare_and_swap (volatile long int *p, long int oldval, long int newval)
+{
+ register long int tmp, tmp2;
+
+ __asm__ __volatile__("1: ldx [%4], %0\n\t"
+ " mov %2, %1\n\t"
+ " cmp %0, %3\n\t"
+ " bne,a,pn %%xcc, 2f\n\t"
+ " mov 0, %0\n\t"
+ " casx [%4], %0, %1\n\t"
+ " sub %0, %1, %0\n\t"
+ " brnz,pn %0, 1b\n\t"
+ " mov 1, %0\n\t"
+ "2:"
+ : "=&r" (tmp), "=&r" (tmp2)
+ : "r" (newval), "r" (oldval), "r" (p)
+ : "memory");
+ return tmp;
+}
+
+#endif /* atomicity.h */
diff --git a/sysdeps/wordsize-64/stdint.h b/sysdeps/wordsize-64/stdint.h
index 2f7cd49154..9719f49c49 100644
--- a/sysdeps/wordsize-64/stdint.h
+++ b/sysdeps/wordsize-64/stdint.h
@@ -152,7 +152,7 @@ typedef unsigned long int uintmax_t;
/* Values to test for integral types holding `void *' pointer. */
# define INTPTR_MIN (-9223372036854775807L-1)
-# define INTPTR_MAX (9223372036854775807L
+# define INTPTR_MAX (9223372036854775807L)
# define UINTPTR_MAX (18446744073709551615UL)