aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2003-03-14 05:30:31 +0000
committerAlexandre Oliva <aoliva@redhat.com>2003-03-14 05:30:31 +0000
commit1b12a2cb728fc49d2282a058c0b67b708186fb2b (patch)
treedbd3b1d9eaf9ee2652fbbe1e511ba33db5641256
parent7fb8033c1f844b6ec8bc20267153c31d99714b8f (diff)
downloadglibc-1b12a2cb728fc49d2282a058c0b67b708186fb2b.zip
glibc-1b12a2cb728fc49d2282a058c0b67b708186fb2b.tar.gz
glibc-1b12a2cb728fc49d2282a058c0b67b708186fb2b.tar.bz2
* sysdeps/mips/atomicity.h (exchange_and_add, atomic_add): Don't .set mips2 on new abi. (compare_and_swap): Likewise. Support 64-bit longs on n64.
* sysdeps/mips/atomicity.h (exchange_and_add, atomic_add): Don't .set mips2 on new abi. (compare_and_swap): Likewise. Support 64-bit longs on n64. 2003-03-14 Alexandre Oliva <aoliva@redhat.com>
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/mips/atomicity.h16
2 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a1d6b0..642c6ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2003-03-14 Alexandre Oliva <aoliva@redhat.com>
+ * sysdeps/mips/atomicity.h (exchange_and_add, atomic_add):
+ Don't .set mips2 on new abi.
+ (compare_and_swap): Likewise. Support 64-bit longs on n64.
+
+2003-03-14 Alexandre Oliva <aoliva@redhat.com>
+
* stdlib/fpioconst.h: Include gmp.h with angle brackets.
2003-03-13 Roland McGrath <roland@redhat.com>
diff --git a/sysdeps/mips/atomicity.h b/sysdeps/mips/atomicity.h
index bccacd9..5148121 100644
--- a/sysdeps/mips/atomicity.h
+++ b/sysdeps/mips/atomicity.h
@@ -1,5 +1,5 @@
/* Low-level functions for atomic operations. Mips version.
- Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003 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
@@ -32,7 +32,9 @@ exchange_and_add (volatile uint32_t *mem, int val)
("/* Inline exchange & add */\n"
"1:\n\t"
".set push\n\t"
+#if _MIPS_SIM == _MIPS_SIM_ABI32
".set mips2\n\t"
+#endif
"ll %0,%3\n\t"
"addu %1,%4,%0\n\t"
"sc %1,%2\n\t"
@@ -56,7 +58,9 @@ atomic_add (volatile uint32_t *mem, int val)
("/* Inline atomic add */\n"
"1:\n\t"
".set push\n\t"
+#if _MIPS_SIM == _MIPS_SIM_ABI32
".set mips2\n\t"
+#endif
"ll %0,%2\n\t"
"addu %0,%3,%0\n\t"
"sc %0,%1\n\t"
@@ -78,12 +82,22 @@ compare_and_swap (volatile long int *p, long int oldval, long int newval)
("/* Inline compare & swap */\n"
"1:\n\t"
".set push\n\t"
+#if _MIPS_SIM == _MIPS_SIM_ABI32
".set mips2\n\t"
+#endif
+#if defined _ABI64 && _MIPS_SIM == _ABI64
+ "lld %1,%5\n\t"
+#else
"ll %1,%5\n\t"
+#endif
"move %0,$0\n\t"
"bne %1,%3,2f\n\t"
"move %0,%4\n\t"
+#if defined _ABI64 && _MIPS_SIM == _ABI64
+ "scd %0,%2\n\t"
+#else
"sc %0,%2\n\t"
+#endif
".set pop\n\t"
"beqz %0,1b\n"
"2:\n\t"