From owner-p4-projects@FreeBSD.ORG  Tue Feb 12 13:48:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA08816A4A5; Tue, 12 Feb 2008 13:48:31 +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 6B31816A47F
	for <perforce@FreeBSD.org>; Tue, 12 Feb 2008 13:48:31 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 513C513C4F0
	for <perforce@FreeBSD.org>; Tue, 12 Feb 2008 13:48:31 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1CDmVFZ083831
	for <perforce@FreeBSD.org>; Tue, 12 Feb 2008 13:48:31 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1CDmVkD083828
	for perforce@freebsd.org; Tue, 12 Feb 2008 13:48:31 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Tue, 12 Feb 2008 13:48:31 GMT
Message-Id: <200802121348.m1CDmVkD083828@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 135252 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, 12 Feb 2008 13:48:32 -0000

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

Change 135252 by gonzo@gonzo_jeeves on 2008/02/12 13:47:35

	o Fix _rtld_start to conform register values set in exec_setregs
	o Keep stack 8-bytes aligned

Affected files ...

.. //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/rtld_start.S#2 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/rtld_start.S#2 (text+ko) ====

@@ -38,7 +38,8 @@
 	.set	noreorder
 
 	.cpload t9
-	addu	sp, sp, -12		/* adjust stack pointer		*/
+	addu	sp, sp, -16		/* adjust stack pointer		*/
+					/*	keep it aligned		*/
 	.cprestore 0			/* -> 0(sp) for gp		*/
 					/* -> 4(sp) for atexit		*/
 					/* -> 8(sp) for obj_main	*/
@@ -57,7 +58,7 @@
 	addu	a0, a1, a0		/* &_DYNAMIC */
 
 
-	addu	a0, sp, 12		/* sp				*/
+	move	a0, s0			/* stack pointer		*/
 	addu	a1, sp, 4		/* &exit_proc			*/
 	addu	a2, sp, 8		/* &objp			*/
 	addu	sp, sp, -16		/* arguments slot		*/
@@ -65,12 +66,14 @@
 	nop
 	addu	sp, sp, 16		
 
-	lw	a0, 4(sp)		/* our atexit function		*/
-	lw	a1, 8(sp)		/* obj_main entry		*/
-	addu	sp, sp,12		/* readjust stack		*/
+	move	a0, s0			/* arguments pointer		*/
+	move	a3, s1			/* arguments pointer		*/
+	lw	a1, 4(sp)		/* our atexit function		*/
+	lw	a2, 8(sp)		/* obj_main entry		*/
+	addu	sp, sp, 16		/* readjust stack		*/
 	move	t9,v0
 	move	a2,s1			/* restore ps_strings		*/
-	jr	t9			/* _start(sp, cleanup, obj);	*/
+	jr	t9			/* _start(ap, cleanup, obj, ps_strings);	*/
 	nop
 
 END(rtld_start)