atomicity.h: Prevent reg loads between LL and SC instructions.

2004-03-19  Michael Eager  <eager@mvista.com>

	* config/cpu/mips/atomicity.h:  Prevent reg loads between LL and
	SC instructions.

From-SVN: r79711

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0f8d8f03675d1f323b1504779d926a89ccd4305b..fe893b043dcaebf8dc79df0e2c834ade0e5f04ac 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-19  Michael Eager  <eager@mvista.com>
+
+       * config/cpu/mips/atomicity.h:  Prevent reg loads between LL and
+       SC instructions.
+
 2004-03-19  Paolo Carlini  <pcarlini@suse.de>
 
        * testsuite/22_locale/num_get/get/char/11.cc: Remove redundant

diff --git a/libstdc++-v3/config/cpu/mips/atomicity.h b/libstdc++-v3/config/cpu/mips/atomicity.h
index 087134289de779b3bd4185b82aceb960ed75f3a9..ecfb69685947e7a73df73c317589c74c762fdef9 100644 (file)
--- a/libstdc++-v3/config/cpu/mips/atomicity.h
+++ b/libstdc++-v3/config/cpu/mips/atomicity.h
@@ -44,14 +44,15 @@ namespace __gnu_cxx
 #if _MIPS_SIM == _ABIO32
        ".set   mips2\n\t"
 #endif
-       "ll     %0,%3\n\t"
-       "addu   %1,%4,%0\n\t"
-       "sc     %1,%2\n\t"
+       "ll     %0,0(%2)\n\t"
+       "addu   %1,%3,%0\n\t"
+       "sc     %1,0(%2)\n\t"
        ".set   pop\n\t"
        "beqz   %1,1b\n\t"
        "/* End exchange & add */"
-       : "=&r"(__result), "=&r"(__tmp), "=m"(*__mem)
-       : "m" (*__mem), "r"(__val));
+       : "=&r"(__result), "=&r"(__tmp)
+       : "r"(__mem), "r"(__val)
+       :  "memory" );
     
     return __result;
   }
@@ -69,13 +70,14 @@ namespace __gnu_cxx
 #if _MIPS_SIM == _ABIO32
        ".set   mips2\n\t"
 #endif
-       "ll     %0,%2\n\t"
-       "addu   %0,%3,%0\n\t"
-       "sc     %0,%1\n\t"
+       "ll     %0,0(%1)\n\t"
+       "addu   %0,%2,%0\n\t"
+       "sc     %0,0(%1)\n\t"
        ".set   pop\n\t"
        "beqz   %0,1b\n\t"
        "/* End atomic add */"
-       : "=&r"(__result), "=m"(*__mem)
-     : "m" (*__mem), "r"(__val));
+       : "=&r"(__result)
+       : "r"(__mem), "r"(__val)
+       : "memory" );
   }
 } // namespace __gnu_cxx