From owner-p4-projects@FreeBSD.ORG  Sat May 12 11:22:03 2007
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 E563616A408; Sat, 12 May 2007 11:22:02 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7DC7F16A40D
	for <perforce@FreeBSD.org>; Sat, 12 May 2007 11:22:02 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D63913C45D
	for <perforce@FreeBSD.org>; Sat, 12 May 2007 11:22:02 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4CBM2BV008617
	for <perforce@FreeBSD.org>; Sat, 12 May 2007 11:22:02 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4CBM2Lh008614
	for perforce@freebsd.org; Sat, 12 May 2007 11:22:02 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sat, 12 May 2007 11:22:02 GMT
Message-Id: <200705121122.l4CBM2Lh008614@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 119723 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: Sat, 12 May 2007 11:22:03 -0000

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

Change 119723 by rdivacky@rdivacky_witten on 2007/05/12 11:21:38

	Copy out oldval before the OPERATION loop and include the copying in of oldval to
	the (possible) loop.

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_support.s#5 edit

Differences ...

==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_support.s#5 (text+ko) ====

@@ -76,15 +76,15 @@
 	movq	$VM_MAXUSER_ADDRESS-4,%rax
 	cmpq	%rax,%rsi
 	ja	futex_fault
-	movl	(%rsi),%eax
-1:	movl	%eax,%ecx
+1:	movl	(%rsi),%eax
+	movl	%eax,(%rdx)
+	movl	%eax,%ecx
 	orl	%edi,%ecx
 #ifdef SMP
 	lock
 #endif
 	cmpxchgl %ecx,(%rsi)
 	jnz	1b
-	movl	%edi,(%rdx)
 	xorl	%eax,%eax
 	movq	%rax,PCB_ONFAULT(%r8)
 	ret
@@ -95,15 +95,15 @@
 	movq	$VM_MAXUSER_ADDRESS-4,%rax
 	cmpq	%rax,%rsi
 	ja	futex_fault
-	movl	(%rsi),%eax
-1:	movl	%eax,%ecx
+1:	movl	(%rsi),%eax
+	movl	%eax,(%rdx)
+	movl	%eax,%ecx
 	andl	%edi,%ecx
 #ifdef SMP
 	lock
 #endif
 	cmpxchgl %ecx,(%rsi)
 	jnz	1b
-	movl	%edi,(%rdx)
 	xorl	%eax,%eax
 	movq	%rax,PCB_ONFAULT(%r8)
 	ret
@@ -114,15 +114,15 @@
 	movq	$VM_MAXUSER_ADDRESS-4,%rax
 	cmpq	%rax,%rsi
 	ja	futex_fault
-	movl	(%rsi),%eax
-1:	movl	%eax,%ecx
+1:	movl	(%rsi),%eax
+	movl	%eax,(%rdx)
+	movl	%eax,%ecx
 	xorl	%edi,%ecx
 #ifdef SMP
 	lock
 #endif
 	cmpxchgl %ecx,(%rsi)
 	jnz	1b
-	movl	%edi,(%rdx)
 	xorl	%eax,%eax
 	movq	%rax,PCB_ONFAULT(%r8)
 	ret