|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r75389 - trunk/boost/smart_ptr/detail
From: pdimov_at_[hidden]
Date: 2011-11-07 12:50:32
Author: pdimov
Date: 2011-11-07 12:50:31 EST (Mon, 07 Nov 2011)
New Revision: 75389
URL: http://svn.boost.org/trac/boost/changeset/75389
Log:
Add ARM memory barriers. Refs #5372.
Text files modified:
trunk/boost/smart_ptr/detail/spinlock_gcc_arm.hpp | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
Modified: trunk/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/spinlock_gcc_arm.hpp (original)
+++ trunk/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2011-11-07 12:50:31 EST (Mon, 07 Nov 2011)
@@ -2,7 +2,7 @@
#define BOOST_SMART_PTR_DETAIL_SPINLOCK_GCC_ARM_HPP_INCLUDED
//
-// Copyright (c) 2008 Peter Dimov
+// Copyright (c) 2008, 2011 Peter Dimov
//
// Distributed under the Boost Software License, Version 1.0.
// See accompanying file LICENSE_1_0.txt or copy at
@@ -11,6 +11,20 @@
#include <boost/smart_ptr/detail/yield_k.hpp>
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
+
+# define BOOST_SP_ARM_BARRIER "dmb"
+
+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
+
+# define BOOST_SP_ARM_BARRIER "mcr p15, 0, r0, c7, c10, 5"
+
+#else
+
+# define BOOST_SP_ARM_BARRIER ""
+
+#endif
+
namespace boost
{
@@ -30,7 +44,8 @@
int r;
__asm__ __volatile__(
- "swp %0, %1, [%2]":
+ "swp %0, %1, [%2]\n\t"
+ BOOST_SP_ARM_BARRIER :
"=&r"( r ): // outputs
"r"( 1 ), "r"( &v_ ): // inputs
"memory", "cc" );
@@ -48,7 +63,7 @@
void unlock()
{
- __asm__ __volatile__( "" ::: "memory" );
+ __asm__ __volatile__( BOOST_SP_ARM_BARRIER ::: "memory" );
*const_cast< int volatile* >( &v_ ) = 0;
}
@@ -82,4 +97,6 @@
#define BOOST_DETAIL_SPINLOCK_INIT {0}
+#undef BOOST_SP_ARM_BARRIER
+
#endif // #ifndef BOOST_SMART_PTR_DETAIL_SPINLOCK_GCC_ARM_HPP_INCLUDED
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk