From owner-svn-src-user@FreeBSD.ORG  Tue Mar 16 04:31:13 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 91DE21065670;
	Tue, 16 Mar 2010 04:31:13 +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 80F328FC18;
	Tue, 16 Mar 2010 04:31:13 +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 o2G4VDU0074599;
	Tue, 16 Mar 2010 04:31:13 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2G4VDUx074597;
	Tue, 16 Mar 2010 04:31:13 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003160431.o2G4VDUx074597@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 16 Mar 2010 04:31:13 +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: r205203 - user/jmallett/octeon/lib/libc/mips/sys
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:13 -0000

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

Log:
  Make ptrace save/restore gp properly like cerror.
  
  Sponsored by:	Packet Forensics

Modified:
  user/jmallett/octeon/lib/libc/mips/sys/ptrace.S

Modified: user/jmallett/octeon/lib/libc/mips/sys/ptrace.S
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/sys/ptrace.S	Tue Mar 16 01:52:03 2010	(r205202)
+++ user/jmallett/octeon/lib/libc/mips/sys/ptrace.S	Tue Mar 16 04:31:13 2010	(r205203)
@@ -43,25 +43,29 @@ __FBSDID("$FreeBSD$");
 
 NESTED_NOPROFILE(ptrace, CALLFRAME_SIZ, ra)
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	PIC_PROLOGUE(ptrace)
-	PTR_SUBU sp, sp, CALLFRAME_SP
-	REG_S	ra, CALLFRAME_RA(sp)
-
+	SETUP_GP
+	PTR_SUBU	sp, sp, CALLFRAME_SIZ
+	SETUP_GP64(CALLFRAME_GP, ptrace)
 	SAVE_GP(CALLFRAME_GP)
 
-	PTR_LA	t9, _C_LABEL(__error)	# locate address of errno
-	jalr	t9
+	PTR_S		ra, CALLFRAME_RA(sp)
 
-	INT_S	zero, 0(v0)
+	PTR_LA		t9, _C_LABEL(__error)	# locate address of errno
+	jalr		t9
 
-	REG_L	ra, CALLFRAME_RA(sp)
-	PTR_ADDU sp, sp, CALLFRAME_SIZ
+	PTR_L		ra, CALLFRAME_RA(sp)
+	INT_S		zero, 0(v0)		# update errno value
 
-	li	v0, SYS_ptrace
+	li		v0, SYS_ptrace
 	syscall
 
-	bne	a3, zero, 1f
-	PIC_RETURN()
+	RESTORE_GP64
+	PTR_ADDU	sp, sp, CALLFRAME_SIZ
+
+	bne		a3, zero, 1f
+
+	j		ra
 1:
-	PIC_TAILCALL(__cerror)
+	PTR_LA		t9, __cerror
+	jalr		t9
 END(ptrace)