From owner-svn-src-projects@FreeBSD.ORG  Fri Aug  2 18:32:02 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 9E1A3AA1;
 Fri,  2 Aug 2013 18:32:02 +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 8BA4F24AF;
 Fri,  2 Aug 2013 18:32:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r72IW2jE034689;
 Fri, 2 Aug 2013 18:32:02 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r72IW2pR034687;
 Fri, 2 Aug 2013 18:32:02 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201308021832.r72IW2pR034687@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 2 Aug 2013 18:32:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r253891 - in projects/atomic64/sys: amd64/include
 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, 02 Aug 2013 18:32:02 -0000

Author: jkim
Date: Fri Aug  2 18:32:01 2013
New Revision: 253891
URL: http://svnweb.freebsd.org/changeset/base/253891

Log:
  Allow an immediate for the bit number.
  
  Suggested by:

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

Modified: projects/atomic64/sys/amd64/include/atomic.h
==============================================================================
--- projects/atomic64/sys/amd64/include/atomic.h	Fri Aug  2 18:05:42 2013	(r253890)
+++ projects/atomic64/sys/amd64/include/atomic.h	Fri Aug  2 18:32:01 2013	(r253891)
@@ -225,7 +225,7 @@ atomic_testandset_int(volatile u_int *p,
 	"# atomic_testandset_int"
 	: "=r" (res),			/* 0 */
 	  "=m" (*p)			/* 1 */
-	: "r" (v),			/* 2 */
+	: "Ir" (v % 32),		/* 2 */
 	  "m" (*p)			/* 3 */
 	: "cc");
 	return (res);
@@ -243,7 +243,7 @@ atomic_testandset_long(volatile u_long *
 	"# atomic_testandset_long"
 	: "=r" (res),			/* 0 */
 	  "=m" (*p)			/* 1 */
-	: "r" ((u_long)v),		/* 2 */
+	: "Jr" ((u_long)v % 64),	/* 2 */
 	  "m" (*p)			/* 3 */
 	: "cc");
 	return (res);

Modified: projects/atomic64/sys/i386/include/atomic.h
==============================================================================
--- projects/atomic64/sys/i386/include/atomic.h	Fri Aug  2 18:05:42 2013	(r253890)
+++ projects/atomic64/sys/i386/include/atomic.h	Fri Aug  2 18:32:01 2013	(r253891)
@@ -364,9 +364,9 @@ atomic_testandset_int(volatile u_int *p,
 	"	btsl	%2, %1 ;	"
 	"	setc	%0 ;		"
 	"# atomic_testandset_int"
-	: "=r" (res),			/* 0 (result) */
+	: "=r" (res),			/* 0 */
 	  "=m" (*p)			/* 1 */
-	: "r" (v),			/* 2 */
+	: "Ir" (v % 32),		/* 2 */
 	  "m" (*p)			/* 3 */
 	: "cc");
 	return (res);