From owner-svn-src-user@FreeBSD.ORG  Tue Mar 23 00:31:56 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 BDA56106566C;
	Tue, 23 Mar 2010 00:31:56 +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 7755C8FC22;
	Tue, 23 Mar 2010 00:31:56 +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 o2N0VuYg086662;
	Tue, 23 Mar 2010 00:31:56 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2N0VuJa086660;
	Tue, 23 Mar 2010 00:31:56 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003230031.o2N0VuJa086660@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 23 Mar 2010 00:31:56 +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: r205494 - 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, 23 Mar 2010 00:31:56 -0000

Author: jmallett
Date: Tue Mar 23 00:31:56 2010
New Revision: 205494
URL: http://svn.freebsd.org/changeset/base/205494

Log:
  o) Load the address of cerror into t9 before restoring the gp and sp.  We waste
     the load in the case of no error in exchange for not duplicating the gp and
     sp restore code.
  o) Don't overwrite ra when calling cerror -- jr not jalr.
  
  This makes truss work.
  
  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	Mon Mar 22 23:33:40 2010	(r205493)
+++ user/jmallett/octeon/lib/libc/mips/sys/ptrace.S	Tue Mar 23 00:31:56 2010	(r205494)
@@ -59,13 +59,13 @@ NESTED_NOPROFILE(ptrace, CALLFRAME_SIZ, 
 	li		v0, SYS_ptrace
 	syscall
 
+	# Load __cerror's address using our gp, then restore it.
+	PTR_LA		t9, __cerror
 	RESTORE_GP64
 	PTR_ADDU	sp, sp, CALLFRAME_SIZ
 
 	bne		a3, zero, 1f
 
 	j		ra
-1:
-	PTR_LA		t9, __cerror
-	jalr		t9
+1:	j		t9
 END(ptrace)