From owner-svn-src-all@FreeBSD.ORG  Sat Apr 12 19:58:31 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B370B490;
 Sat, 12 Apr 2014 19:58:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F73A190F;
 Sat, 12 Apr 2014 19:58:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CJwVNH013796;
 Sat, 12 Apr 2014 19:58:31 GMT
 (envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CJwVSJ013795;
 Sat, 12 Apr 2014 19:58:31 GMT
 (envelope-from andreast@svn.freebsd.org)
Message-Id: <201404121958.s3CJwVSJ013795@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Sat, 12 Apr 2014 19:58:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r264376 - stable/9/sys/powerpc/include
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2014 19:58:31 -0000

Author: andreast
Date: Sat Apr 12 19:58:31 2014
New Revision: 264376
URL: http://svnweb.freebsd.org/changeset/base/264376

Log:
  MFC r260610:
  Described in the man page but not implemented. Here it comes,
  atomic_swap_32/64. The latter only for powerpc64.

Modified:
  stable/9/sys/powerpc/include/atomic.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/powerpc/include/atomic.h
==============================================================================
--- stable/9/sys/powerpc/include/atomic.h	Sat Apr 12 19:57:15 2014	(r264375)
+++ stable/9/sys/powerpc/include/atomic.h	Sat Apr 12 19:58:31 2014	(r264376)
@@ -666,10 +666,47 @@ atomic_fetchadd_long(volatile u_long *p,
 	return (value);
 }
 
+static __inline u_int
+atomic_swap_32(volatile u_int *p, u_int v)
+{
+	u_int prev;
+
+	__asm __volatile(
+	"1:	lwarx	%0,0,%2\n"
+	"	stwcx.	%3,0,%2\n"
+	"	bne-	1b\n"
+	: "=&r" (prev), "+m" (*(volatile u_int *)p)
+	: "r" (p), "r" (v)
+	: "cc", "memory");
+
+	return (prev);
+}
+
+#ifdef __powerpc64__
+static __inline u_long
+atomic_swap_64(volatile u_long *p, u_long v)
+{
+	u_long prev;
+
+	__asm __volatile(
+	"1:	ldarx	%0,0,%2\n"
+	"	stdcx.	%3,0,%2\n"
+	"	bne-	1b\n"
+	: "=&r" (prev), "+m" (*(volatile u_long *)p)
+	: "r" (p), "r" (v)
+	: "cc", "memory");
+
+	return (prev);
+}
+#endif
+
 #define	atomic_fetchadd_32	atomic_fetchadd_int
+#define	atomic_swap_int		atomic_swap_32
 
 #ifdef __powerpc64__
 #define	atomic_fetchadd_64	atomic_fetchadd_long
+#define	atomic_swap_long	atomic_swap_64
+#define	atomic_swap_ptr		atomic_swap_64
 #endif
 
 #endif /* ! _MACHINE_ATOMIC_H_ */