From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 02:24:14 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 CD601106564A;
	Thu,  4 Mar 2010 02:24:14 +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 BCA6C8FC16;
	Thu,  4 Mar 2010 02:24:14 +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 o242OEdI036980;
	Thu, 4 Mar 2010 02:24:14 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o242OERw036978;
	Thu, 4 Mar 2010 02:24:14 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003040224.o242OERw036978@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 4 Mar 2010 02:24:14 +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: r204682 - 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: Thu, 04 Mar 2010 02:24:14 -0000

Author: jmallett
Date: Thu Mar  4 02:24:14 2010
New Revision: 204682
URL: http://svn.freebsd.org/changeset/base/204682

Log:
  Attempt to make new ABI friendly, etc.  Now gdb panics the kernel, perhaps some
  lingering N32-related issues in kernel side of ptrace.

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	Thu Mar  4 00:47:24 2010	(r204681)
+++ user/jmallett/octeon/lib/libc/mips/sys/ptrace.S	Thu Mar  4 02:24:14 2010	(r204682)
@@ -41,32 +41,27 @@ __FBSDID("$FreeBSD$");
 	ASMSTR("$NetBSD: ptrace.S,v 1.9 2003/08/07 16:42:17 agc Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-LEAF(ptrace)
-	.frame	sp, 40, ra
-	.mask	0x80000000, -8
-#ifdef __ABICALLS__
-	.set    noreorder
-	.cpload t9
-	.set    reorder
-#endif
-	subu	sp, sp, 40
-	sw	ra,  32(sp)
-#ifdef __ABICALLS__
-	.cprestore 16
-#endif
-	la	t9, _C_LABEL(__error)	# locate address of errno
+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)
+
+	SAVE_GP(CALLFRAME_GP)
+
+	PTR_LA	t9, _C_LABEL(__error)	# locate address of errno
 	jalr	t9
-#ifdef __ABICALLS__
-	lw	gp, 16(sp)
-#endif
-	sw	zero, 0(v0)
-	lw	ra, 32(sp)
-	addu	sp, sp, 40
+
+	INT_S	zero, 0(v0)
+
+	REG_L	ra, CALLFRAME_RA(sp)
+	PTR_ADDU sp, sp, CALLFRAME_SIZ
+
 	li	v0, SYS_ptrace
 	syscall
+
 	bne	a3, zero, 1f
-	j	ra
+	PIC_RETURN()
 1:
-	la	t9, _C_LABEL(__cerror)
-	jr	t9
+	PIC_TAILCALL(__cerror)
 END(ptrace)