From owner-svn-src-projects@FreeBSD.ORG Tue Aug 20 21:47:08 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 4FA8AE4A; Tue, 20 Aug 2013 21:47:08 +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 2CF742F2B; Tue, 20 Aug 2013 21:47:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7KLl875043647; Tue, 20 Aug 2013 21:47:08 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7KLl78J043645; Tue, 20 Aug 2013 21:47:07 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201308202147.r7KLl78J043645@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 20 Aug 2013 21:47:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254584 - 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: Tue, 20 Aug 2013 21:47:08 -0000 Author: jkim Date: Tue Aug 20 21:47:07 2013 New Revision: 254584 URL: http://svnweb.freebsd.org/changeset/base/254584 Log: Revert gratuitous style changes and attempt to maintain consistent style. Requested by: bde Modified: projects/atomic64/sys/amd64/include/atomic.h projects/atomic64/sys/i386/include/atomic.h Directory Properties: projects/atomic64/sys/ (props changed) Modified: projects/atomic64/sys/amd64/include/atomic.h ============================================================================== --- projects/atomic64/sys/amd64/include/atomic.h Tue Aug 20 21:43:46 2013 (r254583) +++ projects/atomic64/sys/amd64/include/atomic.h Tue Aug 20 21:47:07 2013 (r254584) @@ -142,7 +142,7 @@ atomic_cmpset_int(volatile u_int *dst, u __asm __volatile( " " MPLOCKED " " - " cmpxchgl %3, %1 ; " + " cmpxchgl %3,%1 ; " " sete %0 ; " "# atomic_cmpset_int" : "=q" (res), /* 0 */ @@ -161,7 +161,7 @@ atomic_cmpset_long(volatile u_long *dst, __asm __volatile( " " MPLOCKED " " - " cmpxchgq %3, %1 ; " + " cmpxchgq %3,%1 ; " " sete %0 ; " "# atomic_cmpset_long" : "=q" (res), /* 0 */ @@ -183,7 +183,7 @@ atomic_fetchadd_int(volatile u_int *p, u __asm __volatile( " " MPLOCKED " " - " xaddl %0, %1 ; " + " xaddl %0,%1 ; " "# atomic_fetchadd_int" : "+r" (v), /* 0 */ "+m" (*p) /* 1 */ @@ -201,7 +201,7 @@ atomic_fetchadd_long(volatile u_long *p, __asm __volatile( " " MPLOCKED " " - " xaddq %0, %1 ; " + " xaddq %0,%1 ; " "# atomic_fetchadd_long" : "+r" (v), /* 0 */ "+m" (*p) /* 1 */ @@ -216,7 +216,7 @@ atomic_testandset_int(volatile u_int *p, __asm __volatile( " " MPLOCKED " " - " btsl %2, %1 ; " + " btsl %2,%1 ; " " setc %0 ; " "# atomic_testandset_int" : "=q" (res), /* 0 */ @@ -233,7 +233,7 @@ atomic_testandset_long(volatile u_long * __asm __volatile( " " MPLOCKED " " - " btsq %2, %1 ; " + " btsq %2,%1 ; " " setc %0 ; " "# atomic_testandset_long" : "=q" (res), /* 0 */ @@ -342,7 +342,7 @@ atomic_swap_int(volatile u_int *p, u_int { __asm __volatile( - " xchgl %1, %0 ; " + " xchgl %1,%0 ; " "# atomic_swap_int" : "+r" (v), /* 0 */ "+m" (*p)); /* 1 */ @@ -354,7 +354,7 @@ atomic_swap_long(volatile u_long *p, u_l { __asm __volatile( - " xchgq %1, %0 ; " + " xchgq %1,%0 ; " "# atomic_swap_long" : "+r" (v), /* 0 */ "+m" (*p)); /* 1 */ Modified: projects/atomic64/sys/i386/include/atomic.h ============================================================================== --- projects/atomic64/sys/i386/include/atomic.h Tue Aug 20 21:43:46 2013 (r254583) +++ projects/atomic64/sys/i386/include/atomic.h Tue Aug 20 21:47:07 2013 (r254584) @@ -152,9 +152,9 @@ atomic_cmpset_int(volatile u_int *dst, u __asm __volatile( " pushfl ; " " cli ; " - " cmpl %3, %1 ; " + " cmpl %3,%1 ; " " jne 1f ; " - " movl %2, %1 ; " + " movl %2,%1 ; " "1: " " sete %0 ; " " popfl ; " @@ -177,7 +177,7 @@ atomic_cmpset_int(volatile u_int *dst, u __asm __volatile( " " MPLOCKED " " - " cmpxchgl %3, %1 ; " + " cmpxchgl %3,%1 ; " " sete %0 ; " "# atomic_cmpset_int" : "=q" (res), /* 0 */ @@ -201,9 +201,9 @@ atomic_fetchadd_int(volatile u_int *p, u __asm __volatile( " " MPLOCKED " " - " xaddl %0, %1 ; " + " xaddl %0,%1 ; " "# atomic_fetchadd_int" - : "+r" (v), /* 0 (result) */ + : "+r" (v), /* 0 */ "+m" (*p) /* 1 */ : : "cc"); return (v); @@ -216,7 +216,7 @@ atomic_testandset_int(volatile u_int *p, __asm __volatile( " " MPLOCKED " " - " btsl %2, %1 ; " + " btsl %2,%1 ; " " setc %0 ; " "# atomic_testandset_int" : "=q" (res), /* 0 */ @@ -303,12 +303,12 @@ atomic_cmpset_64_i386(volatile uint64_t __asm __volatile( " pushfl ; " " cli ; " - " xorl %1, %%eax ; " - " xorl %2, %%edx ; " - " orl %%edx, %%eax ; " + " xorl %1,%%eax ; " + " xorl %2,%%edx ; " + " orl %%edx,%%eax ; " " jne 1f ; " - " movl %4, %1 ; " - " movl %5, %2 ; " + " movl %4,%1 ; " + " movl %5,%2 ; " "1: " " sete %3 ; " " popfl" @@ -333,8 +333,8 @@ atomic_load_acq_64_i386(volatile uint64_ __asm __volatile( " pushfl ; " " cli ; " - " movl %1, %%eax ; " - " movl %2, %%edx ; " + " movl %1,%%eax ; " + " movl %2,%%edx ; " " popfl" : "=&A" (res) /* 0 */ : "m" (*q), /* 1 */ @@ -353,8 +353,8 @@ atomic_store_rel_64_i386(volatile uint64 __asm __volatile( " pushfl ; " " cli ; " - " movl %%eax, %0 ; " - " movl %%edx, %1 ; " + " movl %%eax,%0 ; " + " movl %%edx,%1 ; " " popfl" : "=m" (*q), /* 0 */ "=m" (*(q + 1)) /* 1 */ @@ -372,10 +372,10 @@ atomic_swap_64_i386(volatile uint64_t *p __asm __volatile( " pushfl ; " " cli ; " - " movl %1, %%eax ; " - " movl %2, %%edx ; " - " movl %4, %2 ; " - " movl %3, %1 ; " + " movl %1,%%eax ; " + " movl %2,%%edx ; " + " movl %4,%2 ; " + " movl %3,%1 ; " " popfl" : "=&A" (res), /* 0 */ "+m" (*q), /* 1 */ @@ -410,8 +410,8 @@ atomic_load_acq_64_i586(volatile uint64_ uint64_t res; __asm __volatile( - " movl %%ebx, %%eax ; " - " movl %%ecx, %%edx ; " + " movl %%ebx,%%eax ; " + " movl %%ecx,%%edx ; " " " MPLOCKED " " " cmpxchg8b %1" : "=&A" (res), /* 0 */ @@ -425,8 +425,8 @@ atomic_store_rel_64_i586(volatile uint64 { __asm __volatile( - " movl %%eax, %%ebx ; " - " movl %%edx, %%ecx ; " + " movl %%eax,%%ebx ; " + " movl %%edx,%%ecx ; " "1: " " " MPLOCKED " " " cmpxchg8b %0 ; " @@ -441,8 +441,8 @@ atomic_swap_64_i586(volatile uint64_t *p { __asm __volatile( - " movl %%eax, %%ebx ; " - " movl %%edx, %%ecx ; " + " movl %%eax,%%ebx ; " + " movl %%edx,%%ecx ; " "1: " " " MPLOCKED " " " cmpxchg8b %0 ; " @@ -563,7 +563,7 @@ atomic_swap_int(volatile u_int *p, u_int { __asm __volatile( - " xchgl %1, %0 ; " + " xchgl %1,%0 ; " "# atomic_swap_int" : "+r" (v), /* 0 */ "+m" (*p)); /* 1 */