From owner-p4-projects@FreeBSD.ORG  Sun Apr 27 18:48:17 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D144837B404; Sun, 27 Apr 2003 18:48:16 -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 6F92737B401
	for <perforce@freebsd.org>; Sun, 27 Apr 2003 18:48:16 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 18C9543FAF
	for <perforce@freebsd.org>; Sun, 27 Apr 2003 18:48:16 -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 h3S1mF0U009274
	for <perforce@freebsd.org>; Sun, 27 Apr 2003 18:48:15 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S1mFfV009269
	for perforce@freebsd.org; Sun, 27 Apr 2003 18:48:15 -0700 (PDT)
Date: Sun, 27 Apr 2003 18:48:15 -0700 (PDT)
Message-Id: <200304280148.h3S1mFfV009269@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 29912 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 01:48:18 -0000

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

Change 29912 by peter@peter_daintree on 2003/04/27 18:48:04

	as a bonus, preserve %rsi and %rdi across 'syscall'.  This means we
	dont have to use PCB_FULLCTX on return from execve() which passes
	arguments in %rdi and %rsi.  It also makes life easier for things
	like the pipe(2) wrapper in libc.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#32 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#32 (text+ko) ====

@@ -241,8 +241,10 @@
 	call	ast
 	jmp	1b
 2:	/* restore preserved registers */
+	movq	TF_RDI(%rsp),%rdi	/* bonus; preserve arg 1 */
+	movq	TF_RSI(%rsp),%rsi	/* bonus: preserve arg 2 */
+	movq	TF_RDX(%rsp),%rdx	/* return value 2 */
 	movq	TF_RAX(%rsp),%rax	/* return value 1 */
-	movq	TF_RDX(%rsp),%rdx	/* return value 2 */
 	movq	TF_RBX(%rsp),%rbx	/* C preserved */
 	movq	TF_RBP(%rsp),%rbp	/* C preserved */
 	movq	TF_R12(%rsp),%r12	/* C preserved */
@@ -251,8 +253,8 @@
 	movq	TF_R15(%rsp),%r15	/* C preserved */
 	movq	TF_RFLAGS(%rsp),%r11	/* original %rflags */
 	movq	TF_RIP(%rsp),%rcx	/* original %rip */
-	movq	TF_RSP(%rsp),%rdi	/* user stack pointer */
-	movq	%rdi,%rsp		/* original %rsp */
+	movq	TF_RSP(%rsp),%r9	/* user stack pointer */
+	movq	%r9,%rsp		/* original %rsp */
 	#swapgs
 	sysretq
 3:	/* Requested full context restore, use doreti for that */