From owner-p4-projects@FreeBSD.ORG  Tue Mar 18 14:01:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ACCEB1065674; Tue, 18 Mar 2008 14:01:26 +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 6C542106564A
	for <perforce@freebsd.org>; Tue, 18 Mar 2008 14:01:26 +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 6C0818FC1E
	for <perforce@freebsd.org>; Tue, 18 Mar 2008 14:01:26 +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 m2IE1Qj3058494
	for <perforce@freebsd.org>; Tue, 18 Mar 2008 14:01:26 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2IE1QSO058492
	for perforce@freebsd.org; Tue, 18 Mar 2008 14:01:26 GMT
	(envelope-from rrs@cisco.com)
Date: Tue, 18 Mar 2008 14:01:26 GMT
Message-Id: <200803181401.m2IE1QSO058492@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 138008 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 14:01:27 -0000

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

Change 138008 by rrs@rrs-mips2-jnpr on 2008/03/18 14:01:20

	Thinking about it, we need to subtract the stack back out
	       BEFORE we save it so we save the correct value. Do this
	       all right before the return to ra.

Affected files ...

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

Differences ...

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

@@ -74,11 +74,11 @@
 	sw	s5, (_JB_REG_S5 * SZREG)(a0)
 	sw	s6, (_JB_REG_S6 * SZREG)(a0)
 	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
+	addu	sp, sp, CALLFRAME_SIZ	# un-allocate the stack frame
 #endif	
+	sw	sp, (_JB_REG_SP * SZREG)(a0)
 	j	ra
 	move	v0, zero
 END(_setjmp)