From owner-svn-src-user@FreeBSD.ORG  Mon Mar  1 19:12:40 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 7B8FE106567C;
	Mon,  1 Mar 2010 19:12:40 +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 6C1198FC22;
	Mon,  1 Mar 2010 19:12:40 +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 o21JCeer091387;
	Mon, 1 Mar 2010 19:12:40 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21JCe68091385;
	Mon, 1 Mar 2010 19:12:40 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003011912.o21JCe68091385@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 1 Mar 2010 19:12:40 +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: r204527 - user/jmallett/octeon/lib/libc/mips
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: Mon, 01 Mar 2010 19:12:40 -0000

Author: jmallett
Date: Mon Mar  1 19:12:40 2010
New Revision: 204527
URL: http://svn.freebsd.org/changeset/base/204527

Log:
  Add n32 and n64 style PIC prologues, etc.
  
  Submitted by:	imp

Modified:
  user/jmallett/octeon/lib/libc/mips/SYS.h

Modified: user/jmallett/octeon/lib/libc/mips/SYS.h
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/SYS.h	Mon Mar  1 18:58:18 2010	(r204526)
+++ user/jmallett/octeon/lib/libc/mips/SYS.h	Mon Mar  1 19:12:40 2010	(r204527)
@@ -79,10 +79,19 @@
  */
 #ifdef __ABICALLS__
 	.abicalls
-# define PIC_PROLOGUE(x,sr)	.set noreorder; .cpload sr; .set reorder
+#if defined (__mips_n64) || defined(__mips_n32)
+# define PIC_PROLOGUE(x,sr)     subu sp,sp,8; sd gp, 0(sp); .cpsetup $25, $24, ## x;
+# define PIC_RESTORE            ld  gp, 0(sp); addu sp,sp,8;
+# define PIC_CALL(l,sr)		la sr, _C_LABEL(l); ld  gp, 0(sp); addu sp,sp,8; jr sr
+#else
+# define PIC_PROLOGUE(x,sr)	.set noreorder; .cpload sr; .set reorder 
+# define PIC_RESTORE            
 # define PIC_CALL(l,sr)		la sr, _C_LABEL(l); jr sr
+#endif
+
 #else
 # define PIC_PROLOGUE(x,sr)
+# define PIC_RESTORE
 # define PIC_CALL(l,sr)		j  _C_LABEL(l)
 #endif
 
@@ -123,6 +132,8 @@ LEAF(__sys_ ## x);							\
 	PIC_PROLOGUE(x,t9);						\
 	SYSTRAP(x);							\
 	bne a3,zero,err;						\
+	nop;								\
+	PIC_RESTORE;							\
 	j ra;								\
 err:									\
 	PIC_CALL(__cerror,t9);						\