From owner-p4-projects@FreeBSD.ORG  Mon May  8 00:36:08 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5892416A41B; Mon,  8 May 2006 00:36:08 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 1A2B216A418
	for <perforce@freebsd.org>; Mon,  8 May 2006 00:36:08 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 313C543D49
	for <perforce@freebsd.org>; Mon,  8 May 2006 00:36:05 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k480a5wm039546
	for <perforce@freebsd.org>; Mon, 8 May 2006 00:36:05 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k480a5fx039540
	for perforce@freebsd.org; Mon, 8 May 2006 00:36:05 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 8 May 2006 00:36:05 GMT
Message-Id: <200605080036.k480a5fx039540@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96810 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 08 May 2006 00:36:08 -0000

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

Change 96810 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/08 00:35:29

	don't use lduw to avoid stomping on bit 31
	use membars when setting active

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#21 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#21 (text+ko) ====

@@ -40,22 +40,28 @@
 
 #define	PCB_REG	%g6
 
+#define	MEMBAR_PRE	membar	#LoadStore|#StoreStore
+#define MEMBAR_POST	membar	#LoadLoad
+
 #define ATOMIC_CLEAR_INT_BIT(addr, old, bit, new, label) \
-	lduw	[addr], old	; \
+	MEMBAR_PRE		; \
+	ld	[addr], old	; \
 label:	andn	old, bit, new	; \
 	cas	[addr], old, new ; \
 	cmp	old, new	; \
-	bne,pn	%icc, label ## b ; \
-	  mov	new, old
-
+	bne,a,pn	%icc, label ## b ; \
+	  ld	[addr], old	; \
+	MEMBAR_POST
+	
 #define ATOMIC_SET_INT_BIT(addr, old, bit, new, label) \
-	lduw	[addr], old	; \
+	MEMBAR_PRE		; \
+	ld	[addr], old	; \
 label:	or	old, bit, new	; \
 	cas	[addr], old, new ; \
 	cmp	old, new	; \
-	bne,pn	%icc, label ## b ; \
-	  mov	new, old
-	
+	bne,a,pn	%icc, label ## b ; \
+	  ld	[addr], old	; \
+	MEMBAR_POST	
 /*
  * void cpu_throw(struct thread *old, struct thread *new)
  */