From owner-p4-projects@FreeBSD.ORG  Wed Apr 18 11:02:30 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D04316A408; Wed, 18 Apr 2007 11:02:30 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 58BC816A402
	for <perforce@FreeBSD.org>; Wed, 18 Apr 2007 11:02:30 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A63F13C4AD
	for <perforce@FreeBSD.org>; Wed, 18 Apr 2007 11:02:30 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3IB2UdP010488
	for <perforce@FreeBSD.org>; Wed, 18 Apr 2007 11:02:30 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IB2UeO010485
	for perforce@freebsd.org; Wed, 18 Apr 2007 11:02:30 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 18 Apr 2007 11:02:30 GMT
Message-Id: <200704181102.l3IB2UeO010485@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 118354 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: Wed, 18 Apr 2007 11:02:30 -0000

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

Change 118354 by gonzo@gonzo_jeeves on 2007/04/18 11:02:28

	o Rollback latest change and add comment why this is
	    the right thing (tm).

Affected files ...

.. //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#6 edit

Differences ...

==== //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#6 (text+ko) ====

@@ -55,15 +55,29 @@
 	.cpload	t9
 	.set	reorder
 #endif
-	lw	v1, _C_LABEL(__curbrk)
+	addu	sp, sp, -4
+	sw	s0, 0(sp)		# Preserve s0 value in stack
+					# it should be the same on return
+					# We can't use v1 as temporary
+					# register since syscall uses it
+					# to return 64-bit values
+	lw	s0, _C_LABEL(__curbrk)
 	li	v0, SYS_break
-	addu	a0, a0, v1		# compute current break
+	addu	a0, a0, s0		# compute current break
+
 	syscall
+
 	bne	a3, zero, 1f
-	move	v0, v1			# return old val of curbrk from above
+	nop
+	move	v0, s0			# return old val of curbrk from above
+	lw	s0, 0(sp)
+	addu	sp, sp, 4
 	sw	a0, _C_LABEL(__curbrk)	# save current val of curbrk from above
 	j	ra
+
 1:
+	lw	s0, 0(sp)
+	addu	sp, sp, 4
 	la	t9, _C_LABEL(__cerror)
 	jr	t9
 END(__sys_sbrk)