From owner-svn-src-projects@FreeBSD.ORG Sat Aug 3 00:49:51 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 CEEEE226; Sat, 3 Aug 2013 00:49:51 +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 BC9F8216D; Sat, 3 Aug 2013 00:49:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r730npUH068927; Sat, 3 Aug 2013 00:49:51 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r730npWk068925; Sat, 3 Aug 2013 00:49:51 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201308030049.r730npWk068925@svn.freebsd.org> From: Jung-uk Kim Date: Sat, 3 Aug 2013 00:49:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r253907 - 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: Sat, 03 Aug 2013 00:49:51 -0000 Author: jkim Date: Sat Aug 3 00:49:51 2013 New Revision: 253907 URL: http://svnweb.freebsd.org/changeset/base/253907 Log: Highly experimental changes to find whether the compiler was actually fixed. 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 Sat Aug 3 00:44:25 2013 (r253906) +++ projects/atomic64/sys/amd64/include/atomic.h Sat Aug 3 00:49:51 2013 (r253907) @@ -112,8 +112,8 @@ static __inline void \ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(MPLOCKED OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p) \ + : "+m" (*p) \ + : CONS (V) \ : "cc"); \ } \ \ @@ -121,8 +121,8 @@ static __inline void \ atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(MPLOCKED OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p) \ + : "+m" (*p) \ + : CONS (V) \ : "memory", "cc"); \ } \ struct __hack @@ -146,11 +146,10 @@ atomic_cmpset_int(volatile u_int *dst, u " sete %0 ; " "# atomic_cmpset_int" : "=q" (res), /* 0 */ - "=m" (*dst), /* 1 */ + "+m" (*dst), /* 1 */ "+a" (expect) /* 2 */ - : "r" (src), /* 3 */ - "m" (*dst) /* 4 */ - : "memory", "cc"); + : "r" (src) /* 3 */ + : "cc"); return (res); } @@ -166,11 +165,10 @@ atomic_cmpset_long(volatile u_long *dst, " sete %0 ; " "# atomic_cmpset_long" : "=q" (res), /* 0 */ - "=m" (*dst), /* 1 */ + "+m" (*dst), /* 1 */ "+a" (expect) /* 2 */ - : "r" (src), /* 3 */ - "m" (*dst) /* 4 */ - : "memory", "cc"); + : "r" (src) /* 3 */ + : "cc"); return (res); } @@ -187,10 +185,9 @@ atomic_fetchadd_int(volatile u_int *p, u " " MPLOCKED " " " xaddl %0, %1 ; " "# atomic_fetchadd_int" - : "+r" (v), /* 0 (result) */ - "=m" (*p) /* 1 */ - : "m" (*p) /* 2 */ - : "cc"); + : "+r" (v), /* 0 */ + "+m" (*p) /* 1 */ + : : "cc"); return (v); } @@ -206,10 +203,9 @@ atomic_fetchadd_long(volatile u_long *p, " " MPLOCKED " " " xaddq %0, %1 ; " "# atomic_fetchadd_long" - : "+r" (v), /* 0 (result) */ - "=m" (*p) /* 1 */ - : "m" (*p) /* 2 */ - : "cc"); + : "+r" (v), /* 0 */ + "+m" (*p) /* 1 */ + : : "cc"); return (v); } @@ -224,9 +220,8 @@ atomic_testandset_int(volatile u_int *p, " setc %0 ; " "# atomic_testandset_int" : "=q" (res), /* 0 */ - "=m" (*p) /* 1 */ - : "Ir" (v & 0x1f), /* 2 */ - "m" (*p) /* 3 */ + "+m" (*p) /* 1 */ + : "Ir" (v & 0x1f) /* 2 */ : "cc"); return (res); } @@ -242,9 +237,8 @@ atomic_testandset_long(volatile u_long * " setc %0 ; " "# atomic_testandset_long" : "=q" (res), /* 0 */ - "=m" (*p) /* 1 */ - : "Jr" ((u_long)(v & 0x3f)), /* 2 */ - "m" (*p) /* 3 */ + "+m" (*p) /* 1 */ + : "Jr" ((u_long)(v & 0x3f)) /* 2 */ : "cc"); return (res); } @@ -293,9 +287,8 @@ atomic_load_acq_##TYPE(volatile u_##TYPE \ __asm __volatile(MPLOCKED LOP \ : "=a" (res), /* 0 */ \ - "=m" (*p) /* 1 */ \ - : "m" (*p) /* 2 */ \ - : "memory", "cc"); \ + "+m" (*p) /* 1 */ \ + : : "cc"); \ \ return (res); \ } \ @@ -352,8 +345,7 @@ atomic_swap_int(volatile u_int *p, u_int " xchgl %1, %0 ; " "# atomic_swap_int" : "+r" (v), /* 0 */ - "=m" (*p) /* 1 */ - : "m" (*p)); + "+m" (*p)); /* 1 */ return (v); } @@ -365,8 +357,7 @@ atomic_swap_long(volatile u_long *p, u_l " xchgq %1, %0 ; " "# atomic_swap_long" : "+r" (v), /* 0 */ - "=m" (*p) /* 1 */ - : "m" (*p)); + "+m" (*p)); /* 1 */ return (v); } Modified: projects/atomic64/sys/i386/include/atomic.h ============================================================================== --- projects/atomic64/sys/i386/include/atomic.h Sat Aug 3 00:44:25 2013 (r253906) +++ projects/atomic64/sys/i386/include/atomic.h Sat Aug 3 00:49:51 2013 (r253907) @@ -109,8 +109,8 @@ static __inline void \ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(MPLOCKED OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p) \ + : "+m" (*p) \ + : CONS (V) \ : "cc"); \ } \ \ @@ -118,8 +118,8 @@ static __inline void \ atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(MPLOCKED OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p) \ + : "+m" (*p) \ + : CONS (V) \ : "memory", "cc"); \ } \ struct __hack @@ -207,12 +207,11 @@ atomic_cmpset_64_i586(volatile uint64_t " cmpxchg8b %1 ; " " sete %0" : "=q" (res), /* 0 */ - "=m" (*dst), /* 1 */ + "+m" (*dst), /* 1 */ "+A" (expect) /* 2 */ : "b" ((uint32_t)src), /* 3 */ - "c" ((uint32_t)(src >> 32)), /* 4 */ - "m" (*dst) /* 5 */ - : "memory", "cc"); + "c" ((uint32_t)(src >> 32)) /* 4 */ + : "cc"); return (res); } @@ -227,9 +226,8 @@ atomic_load_acq_64_i586(volatile uint64_ " " MPLOCKED " " " cmpxchg8b %1" : "=&A" (res), /* 0 */ - "=m" (*p) /* 1 */ - : "m" (*p) /* 2 */ - : "memory", "cc"); + "+m" (*p) /* 1 */ + : : "cc"); return (res); } @@ -244,10 +242,9 @@ atomic_store_rel_64_i586(volatile uint64 " " MPLOCKED " " " cmpxchg8b %0 ; " " jne 1b" - : "=m" (*p), /* 0 */ + : "+m" (*p), /* 0 */ "+A" (v) /* 1 */ - : "m" (*p) /* 2 */ - : "ebx", "ecx", "memory", "cc"); + : : "ebx", "ecx", "cc"); } static __inline uint64_t @@ -261,10 +258,9 @@ atomic_swap_64_i586(volatile uint64_t *p " " MPLOCKED " " " cmpxchg8b %0 ; " " jne 1b" - : "=m" (*p), /* 0 */ + : "+m" (*p), /* 0 */ "+A" (v) /* 1 */ - : "m" (*p) /* 2 */ - : "ebx", "ecx", "memory", "cc"); + : : "ebx", "ecx", "memory", "cc"); return (v); } @@ -321,10 +317,9 @@ atomic_cmpset_int(volatile u_int *dst, u " sete %0 ; " "# atomic_cmpset_int" : "=q" (res), /* 0 */ - "=m" (*dst), /* 1 */ + "+m" (*dst), /* 1 */ "+a" (expect) /* 2 */ - : "r" (src), /* 3 */ - "m" (*dst) /* 4 */ + : "r" (src) /* 3 */ : "memory", "cc"); return (res); @@ -348,9 +343,8 @@ atomic_fetchadd_int(volatile u_int *p, u " xaddl %0, %1 ; " "# atomic_fetchadd_int" : "+r" (v), /* 0 (result) */ - "=m" (*p) /* 1 */ - : "m" (*p) /* 2 */ - : "cc"); + "+m" (*p) /* 1 */ + : : "cc"); return (v); } @@ -365,9 +359,8 @@ atomic_testandset_int(volatile u_int *p, " setc %0 ; " "# atomic_testandset_int" : "=q" (res), /* 0 */ - "=m" (*p) /* 1 */ - : "Ir" (v & 0x1f), /* 2 */ - "m" (*p) /* 3 */ + "+m" (*p) /* 1 */ + : "Ir" (v & 0x1f) /* 2 */ : "cc"); return (res); } @@ -416,9 +409,8 @@ atomic_load_acq_##TYPE(volatile u_##TYPE \ __asm __volatile(MPLOCKED LOP \ : "=a" (res), /* 0 */ \ - "=m" (*p) /* 1 */ \ - : "m" (*p) /* 2 */ \ - : "memory", "cc"); \ + "+m" (*p) /* 1 */ \ + : : "cc"); \ \ return (res); \ } \ @@ -505,8 +497,7 @@ atomic_swap_int(volatile u_int *p, u_int " xchgl %1, %0 ; " "# atomic_swap_int" : "+r" (v), /* 0 */ - "=m" (*p) /* 1 */ - : "m" (*p)); + "+m" (*p)); /* 1 */ return (v); }