From owner-p4-projects@FreeBSD.ORG  Thu Apr 24 17:00:07 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06CD137B404; Thu, 24 Apr 2003 17:00:07 -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 AD1C437B401
	for <perforce@freebsd.org>; Thu, 24 Apr 2003 17:00:06 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4CFB243FD7
	for <perforce@freebsd.org>; Thu, 24 Apr 2003 17:00:06 -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 h3P0060U078812
	for <perforce@freebsd.org>; Thu, 24 Apr 2003 17:00:06 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3P0059O078806
	for perforce@freebsd.org; Thu, 24 Apr 2003 17:00:05 -0700 (PDT)
Date: Thu, 24 Apr 2003 17:00:05 -0700 (PDT)
Message-Id: <200304250000.h3P0059O078806@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 29653 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: Fri, 25 Apr 2003 00:00:07 -0000

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

Change 29653 by peter@peter_daintree on 2003/04/24 16:59:32

	maybe savectx will work, if we ever get to dumpsys() stage.
	At least, it isn't guaranteed to explode at this point.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#20 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#20 (text+ko) ====

@@ -240,9 +240,9 @@
  */
 ENTRY(savectx)
 	/* Fetch PCB. */
-	movq	8(%rsp),%rcx
+	movq	%rdi,%rcx
 
-	/* Save caller's return address.  Child won't execute this routine. */
+	/* Save caller's return address. */
 	movq	(%rsp),%rax
 	movq	%rax,PCB_RIP(%rcx)
 
@@ -278,21 +278,17 @@
 	je	1f
 
 	pushq	%rcx
-	movq	TD_PCB(%rax),%rax
-	leaq	PCB_SAVEFPU(%rax),%rax
 	pushq	%rax
-	pushq	%rax
+	movq	TD_PCB(%rax),%rdi
+	leaq	PCB_SAVEFPU(%rdi),%rdi
 	call	npxsave
-	addq	$8,%rsp
 	popq	%rax
 	popq	%rcx
 
-	pushq	$PCB_SAVEFPU_SIZE
-	leaq	PCB_SAVEFPU(%rcx),%rcx
-	pushq	%rcx
-	pushq	%rax
+	movq	$PCB_SAVEFPU_SIZE,%rdx	/* arg 3 */
+	leaq	PCB_SAVEFPU(%rcx),%rsi	/* arg 2 */
+	movq	%rax,%rdi		/* arg 1 */
 	call	bcopy
-	addq	$24,%rsp
 1:
 	popfq