From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 17:49:57 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4121537B405; Fri,  4 Apr 2003 17:49:56 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F254B37B401
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 17:49:55 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6B57743F75
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 17:49:55 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h351nt0U090285
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 17:49:55 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h351ns0H090282
	for perforce@freebsd.org; Fri, 4 Apr 2003 17:49:54 -0800 (PST)
Date: Fri, 4 Apr 2003 17:49:54 -0800 (PST)
Message-Id: <200304050149.h351ns0H090282@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28104 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2003 01:49:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=28104

Change 28104 by peter@peter_daintree on 2003/04/04 17:49:16

	implement some more.  This is just about done I think.  Have to check
	the gcc manual for how to specify 64 bit regs though.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/atomic.h#6 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/include/atomic.h#6 (text+ko) ====

@@ -141,25 +141,21 @@
 static __inline int
 atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src)
 {
-#if 0
 	long res = exp;
 
 	__asm __volatile (
 	"	" __XSTRING(MPLOCKED) "	"
-	"	cmpxchgl %1,%2 ;	"
+	"	cmpxchgq %1,%2 ;	"
 	"       setz	%%al ;		"
 	"	movzbl	%%al,%0 ;	"
 	"1:				"
 	"# atomic_cmpset_int"
-	: "+a" (res)			/* 0 (result) */
+	: "+a" (res)			/* 0 (result) %rax, XXX check */
 	: "r" (src),			/* 1 */
 	  "m" (*(dst))			/* 2 */
 	: "memory");				 
 
 	return (res);
-#else
-	return (0);
-#endif
 }
 #endif /* defined(__GNUC__) */
 
@@ -392,8 +388,8 @@
 	u_long result;
 
 	__asm __volatile (
-	"	xorl	%0,%0 ;		"
-	"	xchgl	%1,%0 ;		"
+	"	xorq	%0,%0 ;		"
+	"	xchgq	%1,%0 ;		"
 	"# atomic_readandclear_int"
 	: "=&r" (result)		/* 0 (result) */
 	: "m" (*addr));			/* 1 (addr) */