From owner-svn-src-user@FreeBSD.ORG  Tue Mar 16 04:31:57 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 594E7106566B;
	Tue, 16 Mar 2010 04:31:57 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 490128FC0A;
	Tue, 16 Mar 2010 04:31:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2G4Vv1I074799;
	Tue, 16 Mar 2010 04:31:57 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2G4Vvl3074797;
	Tue, 16 Mar 2010 04:31:57 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003160431.o2G4Vvl3074797@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 16 Mar 2010 04:31:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205204 - user/jmallett/octeon/lib/libc/mips/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Mar 2010 04:31:57 -0000

Author: jmallett
Date: Tue Mar 16 04:31:57 2010
New Revision: 205204
URL: http://svn.freebsd.org/changeset/base/205204

Log:
  Get rid of some bogus REG_PROLOGUE / REG_EPILOGUE.
  
  Remove duplicate abort.
  
  Sponsored by:	Packet Forensics

Modified:
  user/jmallett/octeon/lib/libc/mips/gen/setjmp.S

Modified: user/jmallett/octeon/lib/libc/mips/gen/setjmp.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Tue Mar 16 04:31:13 2010	(r205203)
+++ user/jmallett/octeon/lib/libc/mips/gen/setjmp.S	Tue Mar 16 04:31:57 2010	(r205204)
@@ -83,7 +83,6 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
 	REG_L	ra, CALLFRAME_RA(sp)		# restore RA
 	PTR_ADDU sp, sp, SETJMP_FRAME_SIZE	# pop stack frame
 
-	REG_PROLOGUE
 	REG_LI	v0, _JB_MAGIC_SETJMP
 	REG_S	v0, (_JB_MAGIC  * SZREG)(a0)
 	REG_S	ra, (_JB_REG_RA * SZREG)(a0)
@@ -100,7 +99,6 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
 #if defined(__mips_n32) || defined(__mips_n64)
 	REG_S	gp, (_JB_REG_GP * SZREG)(a0)
 #endif
-	REG_EPILOGUE
 
 	move	v0, zero
 	jr	ra
@@ -134,7 +132,6 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra)
 	REG_L	a0, CALLFRAME_SIZ(sp)		# restore env
 	REG_L	a1, (CALLFRAME_SIZ + SZREG)(sp)	# restore return value
 
-	REG_PROLOGUE
 	REG_L	ra, (_JB_REG_RA * SZREG)(a0)
 	REG_L	s0, (_JB_REG_S0 * SZREG)(a0)
 	REG_L	s1, (_JB_REG_S1 * SZREG)(a0)
@@ -150,7 +147,6 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra)
 	REG_L	gp, (_JB_REG_GP * SZREG)(a0)
 #endif
 
-	REG_EPILOGUE
 	move	v0, a1
 	j	ra
 	nop
@@ -165,7 +161,4 @@ botch:
 	nop
 
 	PIC_TAILCALL(abort)
-	PTR_LA	t9, _C_LABEL(abort)
-	jal	t9
-	nop
 END(longjmp)