From owner-svn-src-user@FreeBSD.ORG  Mon Mar  1 05:21:35 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 D255410656A9;
	Mon,  1 Mar 2010 05:21:35 +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 A7CC38FC08;
	Mon,  1 Mar 2010 05:21:35 +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 o215LZkO002775;
	Mon, 1 Mar 2010 05:21:35 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o215LZqd002772;
	Mon, 1 Mar 2010 05:21:35 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003010521.o215LZqd002772@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 1 Mar 2010 05:21:35 +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: r204507 - in user/jmallett/octeon/sys/mips: include 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 05:21:35 -0000

Author: jmallett
Date: Mon Mar  1 05:21:35 2010
New Revision: 204507
URL: http://svn.freebsd.org/changeset/base/204507

Log:
  o) Adjust ptr and register macros for assembly wrt ABI in a way that ought to
     work better.  Need to check for places where the assembly assumes pointers
     are register width, I guess.

Modified:
  user/jmallett/octeon/sys/mips/include/asm.h
  user/jmallett/octeon/sys/mips/mips/locore.S

Modified: user/jmallett/octeon/sys/mips/include/asm.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/asm.h	Mon Mar  1 04:46:07 2010	(r204506)
+++ user/jmallett/octeon/sys/mips/include/asm.h	Mon Mar  1 05:21:35 2010	(r204507)
@@ -362,16 +362,13 @@ _C_LABEL(x):
  * ABI calls.
  */
 
-#if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32
-/* #if !defined(__mips_n64) */
+#if !defined(__mips_n32) && !defined(__mips_n64)
 #define	REG_L		lw
 #define	REG_S		sw
 #define	REG_LI		li
 #define	REG_PROLOGUE	.set push
 #define	REG_EPILOGUE	.set pop
 #define	SZREG		4
-#define	PTR_LA		la
-#define	PTR_ADDU	addu
 #else
 #define	REG_L		ld
 #define	REG_S		sd
@@ -379,9 +376,19 @@ _C_LABEL(x):
 #define	REG_PROLOGUE	.set push ; .set mips3
 #define	REG_EPILOGUE	.set pop
 #define	SZREG		8
+#endif
+
+#if !defined(__mips_n64)
+#define	PTR_LA		la
+#define	PTR_ADDU	addu
+#define	PTR_L		lw
+#define	PTR_S		sw
+#else
 #define	PTR_LA		dla
 #define	PTR_ADDU	daddu
-#endif	/* _MIPS_BSD_API */
+#define	PTR_L		ld
+#define	PTR_S		sd
+#endif
 
 #define	mfc0_macro(data, spr)						\
 	__asm __volatile ("mfc0 %0, $%1"				\

Modified: user/jmallett/octeon/sys/mips/mips/locore.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/locore.S	Mon Mar  1 04:46:07 2010	(r204506)
+++ user/jmallett/octeon/sys/mips/mips/locore.S	Mon Mar  1 05:21:35 2010	(r204507)
@@ -178,7 +178,7 @@ VECTOR(_locore, unknown)
 	nop
 
 	PTR_LA	sp, _C_LABEL(thread0)
-	REG_L	a0, TD_PCB(sp)
+	PTR_L	a0, TD_PCB(sp)
 	REG_LI	t0, ~7
 	and	a0, a0, t0
 	subu    sp, a0, START_FRAME