From owner-p4-projects@FreeBSD.ORG  Mon Apr 28 15:59:48 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A19B837B404; Mon, 28 Apr 2003 15:59:47 -0700 (PDT)
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 532B637B401
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 15:59:47 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F207743FB1
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 15:59:46 -0700 (PDT)
	(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 h3SMxk0U069328
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 15:59:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMxk9t069322
	for perforce@freebsd.org; Mon, 28 Apr 2003 15:59:46 -0700 (PDT)
Date: Mon, 28 Apr 2003 15:59:46 -0700 (PDT)
Message-Id: <200304282259.h3SMxk9t069322@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 29988 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: Mon, 28 Apr 2003 22:59:48 -0000

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

Change 29988 by peter@peter_daintree on 2003/04/28 15:59:08

	keep these in sync

Affected files ...

.. //depot/projects/hammer/lib/libc/amd64/sys/Ovfork.S#2 integrate
.. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#2 integrate

Differences ...

==== //depot/projects/hammer/lib/libc/amd64/sys/Ovfork.S#2 (text+ko) ====

@@ -47,11 +47,11 @@
 	.weak	vfork
 	.set	vfork,__sys_vfork
 ENTRY(__sys_vfork)
-	popq	%rcx		/* my rta into ecx */
+	popq	%rsi		/* fetch return address (%rsi preserved) */
 	mov	$SYS_vfork,%rax
 	KERNCALL
 	jb	1f
-	jmp	*%rcx
+	jmp	*%rsi
 1:
 	pushq	%rcx
 	jmp     PIC_PLT(HIDENAME(cerror))

==== //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#2 (text+ko) ====

@@ -42,9 +42,20 @@
 
 #include "SYS.h"
 
-SYSCALL(pipe)
-	movq	8(%rsp),%rcx	/* XXX wrong!! %rdi!! */
-	movq	%rax,(%rcx)
-	movq	%rdx,8(%rcx)
+	.weak	_pipe
+	.set	_pipe,__sys_pipe
+	.weak	pipe
+	.set	pipe,__sys_pipe
+ENTRY(__sys_pipe)
+	pushq	%rdi
+	mov	$SYS_pipe,%rax
+	KERNCALL
+	jb	1f
+	popq	%rcx
+	movl	%eax,(%rcx)
+	movl	%edx,4(%rcx)
 	movq	$0,%rax
 	ret
+1:	
+	popq	%rdi
+	jmp	PIC_PLT(HIDENAME(cerror))