From owner-p4-projects@FreeBSD.ORG  Fri Sep  5 19:11:15 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D1D2A16A4C1; Fri,  5 Sep 2003 19:11:14 -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 958F416A4BF
	for <perforce@freebsd.org>; Fri,  5 Sep 2003 19:11:14 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 20CB843FF2
	for <perforce@freebsd.org>; Fri,  5 Sep 2003 19:11:14 -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 h862BD0U085717
	for <perforce@freebsd.org>; Fri, 5 Sep 2003 19:11:13 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h862BDD2085714
	for perforce@freebsd.org; Fri, 5 Sep 2003 19:11:13 -0700 (PDT)
Date: Fri, 5 Sep 2003 19:11:13 -0700 (PDT)
Message-Id: <200309060211.h862BDD2085714@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 37640 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: Sat, 06 Sep 2003 02:11:15 -0000

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

Change 37640 by peter@peter_daintree on 2003/09/05 19:10:50

	back out

Affected files ...

.. //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#6 edit
.. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#3 edit

Differences ...

==== //depot/projects/ezm3/libs/m3core/src/C/FBSD_AMD64/Csetjmp.i3#6 (text+ko) ====

@@ -14,12 +14,11 @@
   jmp_buf = ARRAY [0..11] OF long; (* actually, this is a sigjmp_buf,
                                      just in case *)
 
-  (* We use a special state for context switching due to floating point,
-     which setjmp/longjmp do not deal with. Record length = 72 longs. *)
-  fpjmp_buf = RECORD
-    int_stuff: ARRAY [0..7] OF long; (* integer registers *)
-    fp_stuff:  ARRAY [0..31] OF long_double; (* floating point fxsave *)
-  END;
+  fpjmp_buf = ARRAY [0..71] OF long; (* this is needed to hold the
+                                       fpu state, which the ordinary
+                                       versions of setjmp/longjmp 
+                                       do not save and restore *)
+
 
 <*EXTERNAL "setjmp"   *> PROCEDURE setjmp (VAR env: jmp_buf): int;
 <*EXTERNAL "longjmp"  *> PROCEDURE longjmp (VAR env: jmp_buf; val: int);

==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#3 (text+ko) ====

@@ -16,7 +16,7 @@
 
 PROCEDURE SP (READONLY s: State): ADDRESS =
   BEGIN
-    RETURN LOOPHOLE (s.int_stuff [SP_pos], ADDRESS);
+    RETURN LOOPHOLE (s [SP_pos], ADDRESS);
   END SP;
 
 (*--------------------------------------------------------- thread stacks ---*)
@@ -70,7 +70,7 @@
 
 PROCEDURE UpdateStateForNewSP (VAR s: State; offset: INTEGER) =
   BEGIN
-    INC (s.int_stuff [SP_pos], offset);
+    INC (s [SP_pos], offset);
   END UpdateStateForNewSP;
 
 PROCEDURE UpdateFrameForNewSP (<*UNUSED*> a: ADDRESS;