From owner-p4-projects@FreeBSD.ORG  Tue Mar 18 13:58:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D1AB1065676; Tue, 18 Mar 2008 13:58:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3CEC51065671
	for <perforce@freebsd.org>; Tue, 18 Mar 2008 13:58:23 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 076008FC1A
	for <perforce@freebsd.org>; Tue, 18 Mar 2008 13:58:23 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2IDwMMY057195
	for <perforce@freebsd.org>; Tue, 18 Mar 2008 13:58:22 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2IDwMVc057193
	for perforce@freebsd.org; Tue, 18 Mar 2008 13:58:22 GMT
	(envelope-from rrs@cisco.com)
Date: Tue, 18 Mar 2008 13:58:22 GMT
Message-Id: <200803181358.m2IDwMVc057193@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 138006 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 18 Mar 2008 13:58:23 -0000

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

Change 138006 by rrs@rrs-mips2-jnpr on 2008/03/18 13:58:07

	This adds back the cprestores (to keep the compiler happy
	       even though we don't do any jumps) and instead sub a callframe
	       from the stack (and add on _setjmp, not needed on _longjmp
	       since we restore the old stack)

Affected files ...

.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#5 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#5 (text+ko) ====

@@ -60,6 +60,8 @@
 #ifdef __ABICALLS__ 
 	.set	noreorder
 	.cpload t9
+	subu	sp, sp, CALLFRAME_SIZ	# allocate stack frame
+	.cprestore 16
 #endif
 	li	v0, _JB_MAGIC__SETJMP
 	sw	v0, (_JB_MAGIC  * SZREG)(a0)
@@ -74,7 +76,9 @@
 	sw	s7, (_JB_REG_S7 * SZREG)(a0)
 	sw	sp, (_JB_REG_SP * SZREG)(a0)
 	sw	s8, (_JB_REG_S8 * SZREG)(a0)
-
+#ifdef __ABICALLS__
+	addu	sp, sp, CALLFRAME_SIZ	# allocate stack frame
+#endif	
 	j	ra
 	move	v0, zero
 END(_setjmp)
@@ -83,6 +87,8 @@
 #ifdef __ABICALLS__ 
 	.set	noreorder
 	.cpload t9
+	subu	sp, sp, CALLFRAME_SIZ	# allocate stack frame
+	.cprestore 16
 #endif  
 	lw	v0, (_JB_MAGIC  * SZREG)(a0)
 	lw	ra, (_JB_REG_RA * SZREG)(a0)