From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 16 00:14:52 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 ESMTP id CC7E852B;
 Fri, 16 Aug 2013 00:14:52 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B9633220A;
 Fri, 16 Aug 2013 00:14:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7G0EqIG085587;
 Fri, 16 Aug 2013 00:14:52 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7G0EqHb085586;
 Fri, 16 Aug 2013 00:14:52 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201308160014.r7G0EqHb085586@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 16 Aug 2013 00:14:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r254393 - projects/atomic64/sys/i386/include
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Aug 2013 00:14:52 -0000

Author: jkim
Date: Fri Aug 16 00:14:52 2013
New Revision: 254393
URL: http://svnweb.freebsd.org/changeset/base/254393

Log:
  Restore atomic_cmpset_int() for CPU_DISABLE_CMPXCHG case as well.

Modified:
  projects/atomic64/sys/i386/include/atomic.h

Modified: projects/atomic64/sys/i386/include/atomic.h
==============================================================================
--- projects/atomic64/sys/i386/include/atomic.h	Fri Aug 16 00:04:58 2013	(r254392)
+++ projects/atomic64/sys/i386/include/atomic.h	Fri Aug 16 00:14:52 2013	(r254393)
@@ -147,16 +147,24 @@ struct __hack
 static __inline int
 atomic_cmpset_int(volatile u_int *dst, u_int expect, u_int src)
 {
-	int res;
-	register_t lock;
+	u_char res;
+
+	__asm __volatile(
+	"	pushfl ;		"
+	"	cli ;			"
+	"	cmpl	%3, %1 ;	"
+	"	jne	1f ;		"
+	"	movl	%2, %1 ;	"
+	"1:				"
+	"       sete	%0 ;		"
+	"	popfl ;			"
+	"# atomic_cmpset_int"
+	: "=q" (res),			/* 0 */
+	  "+m" (*dst)			/* 1 */
+	: "r" (src),			/* 2 */
+	  "r" (expect)			/* 3 */
+	: "memory");
 
-	res = 0;
-	ATOMIC_LOCK_I386(lock);
-	if (*dst == expect) {
-		*dst = src;
-		res = 1;
-	}
-	ATOMIC_UNLOCK_I386(lock);
 	return (res);
 }