From owner-p4-projects@FreeBSD.ORG  Fri Sep  5 15:23:13 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E19CE16A4C0; Fri,  5 Sep 2003 15:23:12 -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 8A88816A4C1
	for <perforce@freebsd.org>; Fri,  5 Sep 2003 15:23:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0A10043FB1
	for <perforce@freebsd.org>; Fri,  5 Sep 2003 15:23:12 -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 h85MNB0U065745
	for <perforce@freebsd.org>; Fri, 5 Sep 2003 15:23:11 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85MNB0Q065740
	for perforce@freebsd.org; Fri, 5 Sep 2003 15:23:11 -0700 (PDT)
Date: Fri, 5 Sep 2003 15:23:11 -0700 (PDT)
Message-Id: <200309052223.h85MNB0Q065740@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 37607 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, 05 Sep 2003 22:23:13 -0000

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

Change 37607 by peter@peter_hammer on 2003/09/05 15:22:27

	checkpoint the fp save/restore stuff. this isn't enough because m3 doesn't
	know how to align it to 16 bytes and copies it around.  

Affected files ...

.. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/_fpsetjmp.s#2 edit

Differences ...

==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/_fpsetjmp.s#2 (text+ko) ====

@@ -68,7 +68,9 @@
 	movq	%r13,40(%rax)	/* 5; r13 */
 	movq	%r14,48(%rax)	/* 6; r14 */
 	movq	%r15,56(%rax)	/* 7; r15 */
-	fxsave	64(%rax)	/* 8 - 71; fp state */
+	addq	$(64+15),%rax
+	andq	$(~15),%rax
+	fxsave	(%rax)	/* 8:10 - 71:73; fp state */
 	xorq	%rax,%rax
 	ret
 
@@ -89,7 +91,10 @@
 	movq	40(%rdx),%r13
 	movq	48(%rdx),%r14
 	movq	56(%rdx),%r15
-	fxrstor	64(%rdx)
+	addq	$(64+15),%rdx
+	andq	$(~15),%rdx
+	movl	$0xffbf,0x1c(%rdx)
+	fxrstor	(%rdx)
 	testq	%rax,%rax
 	jnz	1f
 	incq	%rax