This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Use atomic builtins (powerpc, alpha)
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Wed, 25 May 2005 11:30:48 +0200
- Subject: [v3] Use atomic builtins (powerpc, alpha)
Hi,
tested on ia64/powerpc64/alphaev67-linux, committed to mainline.
Paolo.
/////////////////
2005-05-25 Paolo Carlini <pcarlini@suse.de>
* config/cpu/alpha/atomicity.h: Use the builtins for
atomic memory operations.
* config/cpu/powerpc/atomicity.h: Likewise.
* config/cpu/ia64/atomicity.h: Do not include ia64intrin.h.
diff -urN libstdc++-v3-orig/config/cpu/alpha/atomicity.h libstdc++-v3/config/cpu/alpha/atomicity.h
--- libstdc++-v3-orig/config/cpu/alpha/atomicity.h 2004-02-27 01:49:46.000000000 +0100
+++ libstdc++-v3/config/cpu/alpha/atomicity.h 2005-05-23 23:28:41.000000000 +0200
@@ -1,6 +1,7 @@
// Low-level functions for atomic operations: Alpha version -*- C++ -*-
-// Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -29,47 +30,16 @@
#include <bits/atomicity.h>
-/* @@@ With gas we can play nice .subsection games to get the
- non-predicted branch pointing forward. But Digital assemblers
- don't understand those directives. This isn't a terribly
- important issue, so just ignore it. */
-
namespace __gnu_cxx
{
_Atomic_word
__attribute__ ((__unused__))
__exchange_and_add(volatile _Atomic_word* __mem, int __val)
- {
- register int __result, __tmp;
-
- __asm__ __volatile__ (
- "\n$Lxadd_%=:\n\t"
- "ldl_l %0,%3\n\t"
- "addl %0,%4,%1\n\t"
- "stl_c %1,%2\n\t"
- "beq %1,$Lxadd_%=\n\t"
- "mb"
- : "=&r"(__result), "=&r"(__tmp), "=m"(*__mem)
- : "m" (*__mem), "r"(__val));
-
- return __result;
- }
+ { return __sync_fetch_and_add(__mem, __val); }
void
__attribute__ ((__unused__))
__atomic_add(volatile _Atomic_word* __mem, int __val)
- {
- register _Atomic_word __result;
-
- __asm__ __volatile__ (
- "\n$Ladd_%=:\n\t"
- "ldl_l %0,%2\n\t"
- "addl %0,%3,%0\n\t"
- "stl_c %0,%1\n\t"
- "beq %0,$Ladd_%=\n\t"
- "mb"
- : "=&r"(__result), "=m"(*__mem)
- : "m" (*__mem), "r"(__val));
- }
+ { __sync_fetch_and_add(__mem, __val); }
} // namespace __gnu_cxx
diff -urN libstdc++-v3-orig/config/cpu/ia64/atomicity.h libstdc++-v3/config/cpu/ia64/atomicity.h
--- libstdc++-v3-orig/config/cpu/ia64/atomicity.h 2004-02-27 01:49:47.000000000 +0100
+++ libstdc++-v3/config/cpu/ia64/atomicity.h 2005-05-23 23:29:00.000000000 +0200
@@ -1,6 +1,7 @@
// Low-level functions for atomic operations: IA64 version -*- C++ -*-
-// Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -28,7 +29,6 @@
// the GNU General Public License.
#include <bits/atomicity.h>
-#include <ia64intrin.h>
namespace __gnu_cxx
{
diff -urN libstdc++-v3-orig/config/cpu/powerpc/atomicity.h libstdc++-v3/config/cpu/powerpc/atomicity.h
--- libstdc++-v3-orig/config/cpu/powerpc/atomicity.h 2004-02-27 01:49:48.000000000 +0100
+++ libstdc++-v3/config/cpu/powerpc/atomicity.h 2005-05-23 20:23:07.000000000 +0200
@@ -1,6 +1,7 @@
// Low-level functions for atomic operations: PowerPC version -*- C++ -*-
-// Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -29,48 +30,15 @@
#include <bits/atomicity.h>
-#ifdef __PPC405__
-#define _STWCX "sync \n\tstwcx. "
-#else
-#define _STWCX "stwcx. "
-#endif
-
namespace __gnu_cxx
{
_Atomic_word
__attribute__ ((__unused__))
__exchange_and_add(volatile _Atomic_word* __mem, int __val)
- {
- _Atomic_word __tmp, __res;
- __asm__ __volatile__ (
- "/* Inline exchange & add */\n"
- "0:\t"
- "lwarx %0,0,%3 \n\t"
- "add%I4 %1,%0,%4 \n\t"
- _STWCX " %1,0,%3 \n\t"
- "bne- 0b \n\t"
- "/* End exchange & add */"
- : "=&b"(__res), "=&r"(__tmp), "=m" (*__mem)
- : "r" (__mem), "Ir"(__val), "m" (*__mem)
- : "cr0");
- return __res;
- }
+ { return __sync_fetch_and_add(__mem, __val); }
void
__attribute__ ((__unused__))
__atomic_add(volatile _Atomic_word* __mem, int __val)
- {
- _Atomic_word __tmp;
- __asm__ __volatile__ (
- "/* Inline atomic add */\n"
- "0:\t"
- "lwarx %0,0,%2 \n\t"
- "add%I3 %0,%0,%3 \n\t"
- _STWCX " %0,0,%2 \n\t"
- "bne- 0b \n\t"
- "/* End atomic add */"
- : "=&b"(__tmp), "=m" (*__mem)
- : "r" (__mem), "Ir"(__val), "m" (*__mem)
- : "cr0");
- }
+ { __sync_fetch_and_add(__mem, __val); }
} // namespace __gnu_cxx