From owner-svn-src-projects@FreeBSD.ORG Thu Aug 1 23:20:33 2013 Return-Path: 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 44ABAD61; Thu, 1 Aug 2013 23:20:33 +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 17DF020BF; Thu, 1 Aug 2013 23:20:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r71NKWVH083701; Thu, 1 Aug 2013 23:20:32 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r71NKWlN083697; Thu, 1 Aug 2013 23:20:32 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201308012320.r71NKWlN083697@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 1 Aug 2013 23:20:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r253872 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Aug 2013 23:20:33 -0000 Author: jkim Date: Thu Aug 1 23:20:31 2013 New Revision: 253872 URL: http://svnweb.freebsd.org/changeset/base/253872 Log: Allow any register to be used for the return value. 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 Thu Aug 1 23:02:36 2013 (r253871) +++ projects/atomic64/sys/amd64/include/atomic.h Thu Aug 1 23:20:31 2013 (r253872) @@ -138,14 +138,13 @@ atomic_cmpset_int(volatile u_int *dst, u __asm __volatile( " " MPLOCKED " " - " cmpxchgl %2,%1 ; " + " cmpxchgl %3, %1 ; " " sete %0 ; " - "1: " "# atomic_cmpset_int" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (expect), /* 3 */ + : "=r" (res), /* 0 */ + "=m" (*dst), /* 1 */ + "+a" (expect) /* 2 */ + : "r" (src), /* 3 */ "m" (*dst) /* 4 */ : "memory", "cc"); @@ -159,14 +158,13 @@ atomic_cmpset_long(volatile u_long *dst, __asm __volatile( " " MPLOCKED " " - " cmpxchgq %2,%1 ; " + " cmpxchgq %3, %1 ; " " sete %0 ; " - "1: " "# atomic_cmpset_long" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (expect), /* 3 */ + : "=r" (res), /* 0 */ + "=m" (*dst), /* 1 */ + "+a" (expect) /* 2 */ + : "r" (src), /* 3 */ "m" (*dst) /* 4 */ : "memory", "cc"); Modified: projects/atomic64/sys/i386/include/atomic.h ============================================================================== --- projects/atomic64/sys/i386/include/atomic.h Thu Aug 1 23:02:36 2013 (r253871) +++ projects/atomic64/sys/i386/include/atomic.h Thu Aug 1 23:20:31 2013 (r253872) @@ -246,14 +246,13 @@ atomic_cmpset_int(volatile u_int *dst, u __asm __volatile( " " MPLOCKED " " - " cmpxchgl %2,%1 ; " - " sete %0 ; " - "1: " + " cmpxchgl %3, %1 ; " + " sete %0 ; " "# atomic_cmpset_int" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (expect), /* 3 */ + : "=r" (res), /* 0 */ + "=m" (*dst), /* 1 */ + "+a" (expect) /* 2 */ + : "r" (src), /* 3 */ "m" (*dst) /* 4 */ : "memory", "cc");