Mon Dec 14 01:07:43 2009 UTC ()

Merge from matt-nb5-mips64.


(matt)

diff -r1.8 -r1.9 src/lib/libc/arch/mips/Makefile.inc
diff -r1.18 -r1.19 src/lib/libc/arch/mips/SYS.h
diff -r0 -r1.2 src/lib/libc/arch/mips/genassym.cf
diff -r1.29 -r1.30 src/lib/libc/arch/mips/gen/Makefile.inc
diff -r1.5 -r1.6 src/lib/libc/arch/mips/gen/_resumecontext.S
diff -r1.20 -r1.21 src/lib/libc/arch/mips/gen/_setjmp.S
diff -r1.7 -r1.8 src/lib/libc/arch/mips/gen/fabs.S
diff -r1.8 -r1.9 src/lib/libc/arch/mips/gen/ldexp.S
diff -r1.8 -r1.9 src/lib/libc/arch/mips/gen/sigsetjmp.S
diff -r1.4 -r1.5 src/lib/libc/arch/mips/gen/makecontext.c
diff -r1.10 -r1.11 src/lib/libc/arch/mips/gen/modf.S
diff -r1.17 -r1.18 src/lib/libc/arch/mips/gen/setjmp.S
diff -r1.3 -r1.4 src/lib/libc/arch/mips/gen/swapcontext.S
diff -r0 -r1.2 src/lib/libc/arch/mips/softfloat/milieu.h
diff -r0 -r1.2 src/lib/libc/arch/mips/softfloat/mips-gcc.h
diff -r0 -r1.2 src/lib/libc/arch/mips/softfloat/softfloat.h
diff -r1.4 -r1.5 src/lib/libc/arch/mips/string/Makefile.inc
diff -r1.8 -r1.9 src/lib/libc/arch/mips/string/bcmp.S
diff -r1.8 -r1.9 src/lib/libc/arch/mips/string/bzero.S
diff -r1.7 -r1.8 src/lib/libc/arch/mips/sys/__clone.S
diff -r1.2 -r1.3 src/lib/libc/arch/mips/sys/__sigtramp2.S
diff -r1.5 -r1.6 src/lib/libc/arch/mips/sys/__vfork14.S
diff -r1.5 -r1.6 src/lib/libc/arch/mips/sys/syscall.S
diff -r1.16 -r1.17 src/lib/libc/arch/mips/sys/brk.S
diff -r1.16 -r1.17 src/lib/libc/arch/mips/sys/sbrk.S
diff -r1.13 -r1.14 src/lib/libc/arch/mips/sys/cerror.S
diff -r1.9 -r1.10 src/lib/libc/arch/mips/sys/exect.S
diff -r1.9 -r1.10 src/lib/libc/arch/mips/sys/ptrace.S
diff -r1.11 -r1.12 src/lib/libc/arch/mips/sys/fork.S
diff -r1.11 -r1.12 src/lib/libc/arch/mips/sys/pipe.S
diff -r1.3 -r1.4 src/lib/libc/arch/mips/sys/getcontext.S
diff -r1.2 -r1.3 src/lib/libc/compat/arch/mips/sys/compat___semctl.S
diff -r1.2 -r1.3 src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S
diff -r1.2 -r1.3 src/lib/libc/compat/arch/mips/sys/compat_msgctl.S
diff -r1.2 -r1.3 src/lib/libc/compat/arch/mips/sys/compat_shmctl.S
diff -r1.2 -r1.3 src/lib/libc/compat/arch/mips/sys/compat_sigaction.S
diff -r1.7 -r1.8 src/lib/libc/softfloat/softfloat-for-gcc.h

--- src/lib/libc/arch/mips/Makefile.inc 2006/06/17 18:04:23	1.8
+++ src/lib/libc/arch/mips/Makefile.inc 2009/12/14 01:07:41	1.9

 @@ -1,3 +1,11 @@
-#	$NetBSD: Makefile.inc,v 1.8 2006/06/17 18:04:23 uwe Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2009/12/14 01:07:41 matt Exp $
 SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
 CPPFLAGS+= -I.
 CPPFLAGS.assym.h+=-D__LIBC12_SOURCE__
 .if ${MKSOFTFLOAT} != "no"
 .include <softfloat/Makefile.inc>
 CPPFLAGS+= -DSOFTFLOAT_NEED_FIXUNS
 .endif

--- src/lib/libc/arch/mips/SYS.h 2003/10/29 12:28:33	1.18
+++ src/lib/libc/arch/mips/SYS.h 2009/12/14 01:07:41	1.19

 @@ -1,14 +1,14 @@
-/*	$NetBSD: SYS.h,v 1.18 2003/10/29 12:28:33 pooka Exp $ */
+/*	$NetBSD: SYS.h,v 1.19 2009/12/14 01:07:41 matt Exp $ */
 /*-
  * Copyright (c) 1996 Jonathan Stone
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -68,32 +68,40 @@
 #include <sys/syscall.h>
 #include <mips/asm.h>
 /*
  * If compiling for shared libs, Emit sysV ABI PIC segment pseudo-ops.
+ *
  * i)  Emit .abicalls before .LEAF entrypoint, and .cpload/.cprestore after.
  * ii) Do interprocedure jumps indirectly via t9, with the side-effect of
  *     preserving the callee's entry address in t9.
  */
 #ifdef __ABICALLS__
 	.abicalls
-# define PIC_PROLOGUE(x,sr)	.set noreorder; .cpload sr; .set reorder
+# if defined(__mips_o32) || defined(__mips_o64)
-# define PIC_CALL(l,sr)		la sr, _C_LABEL(l); jr sr
+#  define PIC_PROLOGUE(x)	SETUP_GP
 #  define PIC_TAILCALL(l)	PTR_LA t9, _C_LABEL(l); jr t9
 #  define PIC_RETURN()		j ra
 # else
 #  define PIC_PROLOGUE(x)	SETUP_GP64(t3, x)
 #  define PIC_TAILCALL(l)	PTR_LA t9, _C_LABEL(l); RESTORE_GP64; jr t9
 #  define PIC_RETURN()		RESTORE_GP64; j ra
 # endif
 #else
-# define PIC_PROLOGUE(x,sr)
+# define PIC_PROLOGUE(x)
-# define PIC_CALL(l,sr)		j  _C_LABEL(l)
+# define PIC_TAILCALL(l)	j  _C_LABEL(l)
-#endif
+# define PIC_RETURN()
 #endif /* __ABICALLS__ */
 #ifdef __STDC__
 # define SYSTRAP(x)	li v0,SYS_ ## x; syscall;
 #else
 # define SYSTRAP(x)	li v0,SYS_/**/x; syscall;
 #endif
 /*
  * Do a syscall that cannot fail (sync, get{p,u,g,eu,eg)id)
  */
 #define RSYSCALL_NOERROR(x)						\
 @@ -114,20 +122,20 @@
 /*
  * Do a renamed or pseudo syscall (e.g., _exit()), where the entrypoint
  * and syscall name are not the same.
  */
 #define PSEUDO_NOERROR(x,y)						\
 LEAF(x);								\
 	SYSTRAP(y);							\
 	j ra;								\
 	END(x)
 #define PSEUDO(x,y)							\
 LEAF(x);								\
-	PIC_PROLOGUE(x,t9);						\
+	PIC_PROLOGUE(x);						\
 	SYSTRAP(y);							\
 	bne a3,zero,err;						\
-	j ra;								\
+	PIC_RETURN();							\
 err:									\
-	PIC_CALL(__cerror,t9);						\
+	PIC_TAILCALL(__cerror);						\
-	END(x)
+END(x)

#	$NetBSD: genassym.cf,v 1.2 2009/12/14 01:07:41 matt Exp $

#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
# by Matt Thomas <matt@3am-sfotware.com>.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#

include <sys/types.h>
include <machine/reg.h>
include <machine/regnum.h>
include <ucontext.h>
include <signal.h>
include <sys/siginfo.h>

define _OFFSETOF_UC_GREGS	offsetof(ucontext_t, uc_mcontext.__gregs[0])
define _OFFSETOF_UC_GREGS_V0	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_V0])
define _OFFSETOF_UC_GREGS_SP	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_SP])
define _OFFSETOF_UC_GREGS_EPC	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_EPC])
define _OFFSETOF_UC_LINK	offsetof(ucontext_t, uc_link)
define UCONTEXT_SIZE		sizeof(ucontext_t)

define _OFFSETOF_SC_REGS	offsetof(struct sigcontext, sc_regs[0])
define _OFFSETOF_SC_REGS_V0	offsetof(struct sigcontext, sc_regs[_R_V0])
define _OFFSETOF_SC_REGS_S0	offsetof(struct sigcontext, sc_regs[_R_S0])
define _OFFSETOF_SC_REGS_S1	offsetof(struct sigcontext, sc_regs[_R_S1])
define _OFFSETOF_SC_REGS_S2	offsetof(struct sigcontext, sc_regs[_R_S2])
define _OFFSETOF_SC_REGS_S3	offsetof(struct sigcontext, sc_regs[_R_S3])
define _OFFSETOF_SC_REGS_S4	offsetof(struct sigcontext, sc_regs[_R_S4])
define _OFFSETOF_SC_REGS_S5	offsetof(struct sigcontext, sc_regs[_R_S5])
define _OFFSETOF_SC_REGS_S6	offsetof(struct sigcontext, sc_regs[_R_S6])
define _OFFSETOF_SC_REGS_S7	offsetof(struct sigcontext, sc_regs[_R_S7])
define _OFFSETOF_SC_REGS_S8	offsetof(struct sigcontext, sc_regs[_R_S8])
define _OFFSETOF_SC_REGS_SP	offsetof(struct sigcontext, sc_regs[_R_SP])
define _OFFSETOF_SC_REGS_GP	offsetof(struct sigcontext, sc_regs[_R_GP])
define _OFFSETOF_SC_FPREGS	offsetof(struct sigcontext, sc_fpregs[0])
define _OFFSETOF_SC_FPREGS_F20	offsetof(struct sigcontext, sc_fpregs[20])
define _OFFSETOF_SC_FPREGS_F21	offsetof(struct sigcontext, sc_fpregs[21])
define _OFFSETOF_SC_FPREGS_F22	offsetof(struct sigcontext, sc_fpregs[22])
define _OFFSETOF_SC_FPREGS_F23	offsetof(struct sigcontext, sc_fpregs[23])
define _OFFSETOF_SC_FPREGS_F24	offsetof(struct sigcontext, sc_fpregs[24])
define _OFFSETOF_SC_FPREGS_F25	offsetof(struct sigcontext, sc_fpregs[25])
define _OFFSETOF_SC_FPREGS_F26	offsetof(struct sigcontext, sc_fpregs[26])
define _OFFSETOF_SC_FPREGS_F27	offsetof(struct sigcontext, sc_fpregs[27])
define _OFFSETOF_SC_FPREGS_F28	offsetof(struct sigcontext, sc_fpregs[28])
define _OFFSETOF_SC_FPREGS_F29	offsetof(struct sigcontext, sc_fpregs[29])
define _OFFSETOF_SC_FPREGS_F30	offsetof(struct sigcontext, sc_fpregs[30])
define _OFFSETOF_SC_FPREGS_F31	offsetof(struct sigcontext, sc_fpregs[31])
define _OFFSETOF_SC_FPREGS_FCSR	offsetof(struct sigcontext, sc_fpregs[32])
define _OFFSETOF_SC_PC		offsetof(struct sigcontext, sc_pc)
define _OFFSETOF_SC_MASK	offsetof(struct sigcontext, sc_mask)
define _OFFSETOF_SC_MASK13	offsetof(struct sigcontext, __sc_mask13)
define _OFFSETOF_SC_ONSTACK	offsetof(struct sigcontext, sc_onstack)
define _OFFSETOF_SC_FPUSED	offsetof(struct sigcontext, sc_fpused)

define SIGINFO_SIZE		sizeof(siginfo_t)

define STACK_T_SIZE		((sizeof(stack_t) + 2 * sizeof(register_t) - 1) & -(2 * sizeof(register_t)))
define _OFFSETOF_STACK_T_SP	offsetof(stack_t, ss_sp)
define _OFFSETOF_STACK_T_SIZE	offsetof(stack_t, ss_size)
define _OFFSETOF_STACK_T_FLAGS	offsetof(stack_t, ss_flags)

define SS_ONSTACK		SS_ONSTACK

--- src/lib/libc/arch/mips/gen/Makefile.inc 2009/12/06 07:12:17	1.29
+++ src/lib/libc/arch/mips/gen/Makefile.inc 2009/12/14 01:07:42	1.30

 @@ -1,31 +1,31 @@
-#	$NetBSD: Makefile.inc,v 1.29 2009/12/06 07:12:17 uebayasi Exp $
+#	$NetBSD: Makefile.inc,v 1.30 2009/12/14 01:07:42 matt Exp $
 SRCS+=	fabs.S ldexp.S modf.S
 # Common ieee754 constants and functions
 SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
 SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
 SRCS+=	isinff_ieee754.c isinfd_ieee754.c
 SRCS+=	isnanf_ieee754.c isnand_ieee754.c
 SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
 SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
 SRCS+=	nanf.c
 SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
 	fpsetround.c fpsetsticky.c
 SRCS+=	setjmp.S longjmp.c
 SRCS+=	_setjmp.S
 SRCS+=	sigsetjmp.S
-SRCS+=	byte_swap_2.S byte_swap_4.S bswap64.c
+SRCS+=	byte_swap_2.S byte_swap_4.S byte_swap_8.S
 SRCS+=	makecontext.c resumecontext.c _resumecontext.S swapcontext.S _lwp.c
 # mips abi builtin extensions (used by GCC for lexical-closure trampoline)
 SRCS+=	cacheflush.c
 LSRCS.mips.gen=	Lint__setjmp.c Lint_bswap16.c Lint_bswap32.c Lint_swapcontext.c
 LSRCS+=		${LSRCS.mips.gen}
 DPSRCS+=	${LSRCS.mips.gen}
 CLEANFILES+=	${LSRCS.mips.gen}

--- src/lib/libc/arch/mips/gen/_resumecontext.S 2008/04/28 20:22:56	1.5
+++ src/lib/libc/arch/mips/gen/_resumecontext.S 2009/12/14 01:07:42	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: _resumecontext.S,v 1.5 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: _resumecontext.S,v 1.6 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wayne Knowles.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,29 +19,44 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <machine/asm.h>
 #include "SYS.h"
-#include <machine/mcontext.h>
+#include "assym.h"
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	ASMSTR("$NetBSD: _resumecontext.S,v 1.5 2008/04/28 20:22:56 martin Exp $")
+	RCSID("$NetBSD: _resumecontext.S,v 1.6 2009/12/14 01:07:42 matt Exp $")
 #endif /* SYSLIBC_SCCS && !lint */
 	.set	reorder
 	.hidden	_C_LABEL(__resumecontext)
 LEAF_NOPROFILE(__resumecontext)
-	PIC_PROLOGUE(_resumecontext, ra)
+	/*
 	 * We get here not by a call through $t9 but thru $ra after the
-	la	t9, _C_LABEL(_resumecontext)
+	 * function passed to makecontext returns.
-	jr	t9
+	 */
-	 nop
+	PTR_SUBU	sp, sp, UCONTEXT_SIZE		# get space for ucontext
 	move		a0, sp				# arg0 for getcontext
 	PTR_S		zero, _OFFSETOF_UC_LINK(a0)	# make sure uc_link is 0
 	SYSTRAP(getcontext)				# get context
 	PTR_L		a0, _OFFSETOF_UC_LINK(a0)	# linked context?
 	beq		a0, zero, 1f			#   nope, exit process
 	nop
 	SYSTRAP(setcontext)				#   yes, become it.
 	/* NOTREACHED (in theory) */
 	li		a0, -1				# failure,
 :
 	SYSTRAP(exit)					# all hope is lost.
 	/* NOTREACHED */
 END(__resumecontext)

--- src/lib/libc/arch/mips/gen/_setjmp.S 2005/10/07 17:16:40	1.20
+++ src/lib/libc/arch/mips/gen/_setjmp.S 2009/12/14 01:07:42	1.21

 @@ -1,14 +1,14 @@
-/*	$NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $	*/
+/*	$NetBSD: _setjmp.S,v 1.21 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -28,124 +28,161 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <machine/cdefs.h>
 #include <mips/regnum.h>
 #include <mips/asm.h>
 #include <machine/setjmp.h>
 #include <machine/signal.h>		/* XXX */
-#if defined(LIBC_SCCS) && !defined(lint)
+#include "assym.h"
 	ASMSTR("from: @(#)_setjmp.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $")
 #endif /* LIBC_SCCS and not lint */
-#ifdef __ABICALLS__
+#include "SYS.h"
 	.abicalls
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)_setjmp.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: _setjmp.S,v 1.21 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*
  * C library -- _setjmp, _longjmp
+ *
  *	_longjmp(a,v)
  * will generate a "return(v)" from
  * the last call to
  *	_setjmp(a)
  * by restoring registers from the stack,
  * The previous signal state is NOT restored.
  */
 	.set	noreorder
 LEAF(_setjmp)
 #ifdef __ABICALLS__
 	#.set noreorder
 	.cpload t9
 	#.set reorder
 #endif
 	REG_PROLOGUE
 	REG_LI	v0, 0xACEDBADE			# sigcontext magic number
-	REG_S	ra, (2 * 4)(a0)			# sc_pc = return address
+	REG_S	ra, _OFFSETOF_SC_PC(a0)		# sc_pc = return address
-	REG_S	v0, (_OFFSETOF_SC_REGS)(a0)	#   saved in sc_regs[0]
+	REG_S	v0, _OFFSETOF_SC_REGS(a0)	#   saved in sc_regs[0]
-	REG_S	s0, (_R_S0 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	a1, _OFFSETOF_SC_REGS_V0(a0)	# save return value
-	REG_S	s1, (_R_S1 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	s0, _OFFSETOF_SC_REGS_S0(a0)
-	REG_S	s2, (_R_S2 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	s1, _OFFSETOF_SC_REGS_S1(a0)
-	REG_S	s3, (_R_S3 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	s2, _OFFSETOF_SC_REGS_S2(a0)
-	REG_S	s4, (_R_S4 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	s3, _OFFSETOF_SC_REGS_S3(a0)
-	REG_S	s5, (_R_S5 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	s4, _OFFSETOF_SC_REGS_S4(a0)
-	REG_S	s6, (_R_S6 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	s5, _OFFSETOF_SC_REGS_S5(a0)
-	REG_S	s7, (_R_S7 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	s6, _OFFSETOF_SC_REGS_S6(a0)
-	REG_S	sp, (_R_SP * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	s7, _OFFSETOF_SC_REGS_S7(a0)
-	REG_S	s8, (_R_S8 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_S	sp, _OFFSETOF_SC_REGS_SP(a0)
 	REG_S	s8, _OFFSETOF_SC_REGS_S8(a0)
 #if defined(__mips_n32) || defined(__mips_n64)
 	REG_S	gp, _OFFSETOF_SC_REGS_GP(a0)	# newabi gp is callee-saved
 #endif
 	cfc1	v0, $31				# too bad cant check if FP used
-	swc1	$f20, (20 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	/*
-	swc1	$f21, (21 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	 * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved.
-	swc1	$f22, (22 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	 * In N64, FP registers F23 .. F31 are callee-saved.
-	swc1	$f23, (23 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	 * In O32, FP registers F20 .. F23 are callee-saved.
-	swc1	$f24, (24 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	 */
-	swc1	$f25, (25 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#ifndef SOFTFLOAT_FOR_GCC
-	swc1	$f26, (26 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#if defined(__mips_n64) || defined(__mips_n32)
-	swc1	$f27, (27 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f30, _OFFSETOF_SC_FPREGS_F30(a0)
-	swc1	$f28, (28 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f28, _OFFSETOF_SC_FPREGS_F28(a0)
-	swc1	$f29, (29 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f26, _OFFSETOF_SC_FPREGS_F26(a0)
-	swc1	$f30, (30 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f24, _OFFSETOF_SC_FPREGS_F24(a0)
-	swc1	$f31, (31 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#endif
-	sw	v0, (32 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64)
 	FP_S	$f22, _OFFSETOF_SC_FPREGS_F22(a0)
 	FP_S	$f20, _OFFSETOF_SC_FPREGS_F20(a0)
 #endif
 #if defined(__mips_o32) || defined(__mips_o64)
 	FP_S	$f21, _OFFSETOF_SC_FPREGS_F21(a0)
 	FP_S	$f23, _OFFSETOF_SC_FPREGS_F23(a0)
 #endif
 #if defined(__mips_n64)
 	FP_S	$f25, _OFFSETOF_SC_FPREGS_F25(a0)
 	FP_S	$f27, _OFFSETOF_SC_FPREGS_F27(a0)
 	FP_S	$f29, _OFFSETOF_SC_FPREGS_F29(a0)
 	FP_S	$f31, _OFFSETOF_SC_FPREGS_F31(a0)
 #endif
 #endif	/* SOFTFLOAT_FOR_GCC */
 	INT_S	v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
 	REG_EPILOGUE
 	j	ra
 	move	v0, zero
 END(_setjmp)
 LEAF(_longjmp)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(_longjmp)
-	.set    noreorder
+	PTR_SUBU	sp, sp, CALLFRAME_SIZ
-	.cpload t9
+	SAVE_GP(CALLFRAME_GP)
 	.set    reorder
 	subu	sp, sp, 32
 	.cprestore 16
 	.set    noreorder
 #endif
 	REG_PROLOGUE
-	REG_L	v0, (_OFFSETOF_SC_REGS)(a0)	# get magic number
+	REG_L		v0, _OFFSETOF_SC_REGS(a0)	# get magic number
-	REG_L	ra, (2 * 4)(a0)
+	REG_L		ra, _OFFSETOF_SC_PC(a0)
-	REG_LI	t0, 0xACEDBADE
+	REG_LI		t0, 0xACEDBADE
-	bne	v0, t0, botch		# jump if error
+	bne		v0, t0, botch		# jump if error
-	addu	sp, sp, 32			# does not matter, sanity
+	PTR_ADDU	sp, sp, CALLFRAME_SIZ	# does not matter, sanity
-	REG_L	s0, (_R_S0 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		s0, _OFFSETOF_SC_REGS_S0(a0)
-	REG_L	s1, (_R_S1 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		s1, _OFFSETOF_SC_REGS_S1(a0)
-	REG_L	s2, (_R_S2 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		s2, _OFFSETOF_SC_REGS_S2(a0)
-	REG_L	s3, (_R_S3 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		s3, _OFFSETOF_SC_REGS_S3(a0)
-	REG_L	s4, (_R_S4 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		s4, _OFFSETOF_SC_REGS_S4(a0)
-	REG_L	s5, (_R_S5 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		s5, _OFFSETOF_SC_REGS_S5(a0)
-	REG_L	s6, (_R_S6 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		s6, _OFFSETOF_SC_REGS_S6(a0)
-	REG_L	s7, (_R_S7 * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		s7, _OFFSETOF_SC_REGS_S7(a0)
-	lw	v0, (32 * 4 + _OFFSETOF_SC_FPREGS)(a0)	# get fpu status
+#if defined(__mips_n32) || defined(__mips_n64)
-	REG_L	sp, (_R_SP * SZREG + _OFFSETOF_SC_REGS)(a0)
+	REG_L		gp, _OFFSETOF_SC_REGS_GP(a0)
-	REG_L	s8, (_R_S8 * SZREG + _OFFSETOF_SC_REGS)(a0)
+#endif
-	ctc1	v0, $31
+	# get fpu status
-	lwc1	$f20, (20 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	INT_L		v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
-	lwc1	$f21, (21 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	REG_L		sp, _OFFSETOF_SC_REGS_SP(a0)
-	lwc1	$f22, (22 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	REG_L		s8, _OFFSETOF_SC_REGS_S8(a0)
-	lwc1	$f23, (23 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	ctc1		v0, $31
-	lwc1	$f24, (24 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	/*
-	lwc1	$f25, (25 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	 * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved.
-	lwc1	$f26, (26 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	 * In N64, FP registers F23 .. F31 are callee-saved.
-	lwc1	$f27, (27 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	 * In O32, FP registers F20 .. F23 are callee-saved.
-	lwc1	$f28, (28 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	 */
-	lwc1	$f29, (29 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#ifndef SOFTFLOAT_FOR_GCC
-	lwc1	$f30, (30 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#if defined(__mips_n64) || defined(__mips_n32)
-	lwc1	$f31, (31 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_L	$f30, _OFFSETOF_SC_FPREGS_F30(a0)
 	FP_L	$f28, _OFFSETOF_SC_FPREGS_F28(a0)
 	FP_L	$f26, _OFFSETOF_SC_FPREGS_F26(a0)
 	FP_L	$f24, _OFFSETOF_SC_FPREGS_F24(a0)
 #endif
 #if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64)
 	FP_L	$f22, _OFFSETOF_SC_FPREGS_F22(a0)
 	FP_L	$f20, _OFFSETOF_SC_FPREGS_F20(a0)
 #endif
 #if defined(__mips_o32) || defined(__mips_o64)
 	FP_L	$f21, _OFFSETOF_SC_FPREGS_F21(a0)
 	FP_L	$f23, _OFFSETOF_SC_FPREGS_F23(a0)
 #endif
 #if defined(__mips_n64)
 	FP_L	$f25, _OFFSETOF_SC_FPREGS_F25(a0)
 	FP_L	$f27, _OFFSETOF_SC_FPREGS_F27(a0)
 	FP_L	$f29, _OFFSETOF_SC_FPREGS_F29(a0)
 	FP_L	$f31, _OFFSETOF_SC_FPREGS_F31(a0)
 #endif
 #endif	/* SOFTFLOAT_FOR_GCC */
 	j	ra
 	move	v0, a1
 	REG_EPILOGUE
 	REG_L	v0, _OFFSETOF_SC_REGS_V0(a0)
 	j	ra
 	nop
 botch:
 	/*
 	 * We know we aren't returning so we don't care about restoring
 	 * our caller's GP.
 	 */
 	jal	_C_LABEL(longjmperror)
 	nop
-	jal	_C_LABEL(abort)
+	PIC_TAILCALL(abort)
 	nop
 END(_longjmp)

--- src/lib/libc/arch/mips/gen/fabs.S 2003/08/07 16:42:15	1.7
+++ src/lib/libc/arch/mips/gen/fabs.S 2009/12/14 01:07:42	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $	*/
+/*	$NetBSD: fabs.S,v 1.8 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,33 +25,33 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <mips/asm.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)fabs.s	8.1 (Berkeley) 2/16/94")
+#if 0
-	ASMSTR("$NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $")
+	RCSID("from: @(#)fabs.s	8.1 (Berkeley) 2/16/94")
 #else
 	RCSID("$NetBSD: fabs.S,v 1.8 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #ifdef __ABICALLS__
 	.abicalls
 #endif
 	.set	noreorder
 /*
  * fabs(x)
  *	double x;
+ *
  * Return absolute value of x.
  */
 LEAF(fabs)
 	j	ra
 	abs.d	$f0, $f12		# compute absolute value of x
 END(fabs)

--- src/lib/libc/arch/mips/gen/ldexp.S 2003/08/07 16:42:15	1.8
+++ src/lib/libc/arch/mips/gen/ldexp.S 2009/12/14 01:07:42	1.9

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $	*/
+/*	$NetBSD: ldexp.S,v 1.9 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,33 +25,32 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <mips/asm.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)ldexp.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $")
+	RCSID("from: @(#)ldexp.s	8.1 (Berkeley) 6/4/93")
-#endif /* LIBC_SCCS and not lint */
+#else
 	RCSID("$NetBSD: ldexp.S,v 1.9 2009/12/14 01:07:42 matt Exp $")
 #ifdef __ABICALLS__
 	.abicalls
 #endif
 #endif /* LIBC_SCCS and not lint */
 #define DEXP_INF	0x7ff
 #define DEXP_BIAS	1023
 #define DEXP_MIN	-1022
 #define DEXP_MAX	1023
 #define DFRAC_BITS	52
 #define DIMPL_ONE	0x00100000
 #define DLEAD_ZEROS	31 - 20
 #define STICKYBIT	1
 #define GUARDBIT	0x80000000
 #define DSIGNAL_NAN	0x00040000
 #define DQUIET_NAN0	0x0007ffff
 #define DQUIET_NAN1	0xffffffff

--- src/lib/libc/arch/mips/gen/sigsetjmp.S 2005/09/17 11:49:39	1.8
+++ src/lib/libc/arch/mips/gen/sigsetjmp.S 2009/12/14 01:07:42	1.9

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $	*/
+/*	$NetBSD: sigsetjmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993, 1995,
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Havard Eidnes.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,62 +27,53 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/syscall.h>
 #include <mips/regnum.h>
 #include <mips/asm.h>
 #include <machine/setjmp.h>
-#if defined(LIBC_SCCS) && !defined(lint)
+#include "assym.h"
-	ASMSTR("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
+#include "SYS.h"
 	ASMSTR("$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $")
 #endif /* LIBC_SCCS and not lint */
-#ifdef __ABICALLS__
+#if defined(LIBC_SCCS) && !defined(lint)
-	.abicalls
+#if 0
 	RCSID("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: sigsetjmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*
  * C library -- sigsetjmp, siglongjmp
+ *
  *	siglongjmp(a,v)
  * will generate a "return(v)" from
  * the last call to
  *	sigsetjmp(a, savemask)
  * by restoring registers from the stack,
  * and dependent on savemask restores the
  * signal mask.
  */
 LEAF(__sigsetjmp14)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(__sigsetjmp14)
-	.set	noreorder
+	REG_S	a1, _JBLEN*SZREG(a0)		# save "savemask"
 	.cpload	t9
 	.set	reorder
 #endif
 	sw	a1, (_JBLEN*4)(a0)		# save "savemask"
 	bne	a1, 0x0, 1f			# do saving of signal mask?
-	la	t9, _setjmp
+	PIC_TAILCALL(_setjmp)
 	jr t9
-:	la	t9, __setjmp14
+:	PIC_TAILCALL(__setjmp14)
 	jr t9
 END(__sigsetjmp14)
 LEAF(__siglongjmp14)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(__siglongjmp14)
-	.set	noreorder
+	REG_L	t0, _JBLEN*SZREG(a0)		# get "savemask"
 	.cpload	t9
 	.set	reorder
 #endif
 	lw	t0, (_JBLEN * 4)(a0)		# get "savemask"
 	bne	t0, 0x0, 1f			# restore signal mask?
-	la	t9, _longjmp
+	PIC_TAILCALL(_longjmp)
 	jr	t9
-:	la	t9, __longjmp14
+:	PIC_TAILCALL(__longjmp14)
 	jr	t9
 END(__siglongjmp14)

--- src/lib/libc/arch/mips/gen/makecontext.c 2008/04/28 20:22:56	1.4
+++ src/lib/libc/arch/mips/gen/makecontext.c 2009/12/14 01:07:42	1.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Klaus Klein.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,58 +21,75 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:56 martin Exp $");
+__RCSID("$NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $");
 #endif
 #include <inttypes.h>
 #include <stddef.h>
 #include <ucontext.h>
 #include "extern.h"
 #include <stdarg.h>
 void
 makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+{
 	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	uintptr_t *sp;
+	__greg_t *sp;
 	int i;
 	va_list ap;
 	void __resumecontext(void);
 	/* LINTED uintptr_t is safe */
-	sp  = (uintptr_t *)
+	sp  = (__greg_t *)
 	    ((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
 	/* LINTED uintptr_t is safe */
 #if defined(__mips_o32) || defined(__mips_o64)
 	sp -= (argc >= 4 ? argc : 4);	/* Make room for >=4 arguments. */
-	sp  = (uintptr_t *)
+	sp  = (__greg_t *)
 	      ((uintptr_t)sp & ~0x7);	/* Align on double-word boundary. */
 #elif defined(__mips_n32) || defined(__mips_n64)
 	sp -= (argc > 8 ? argc - 8 : 0); /* Make room for > 8 arguments. */
 	sp  = (__greg_t *)
 	      ((uintptr_t)sp & ~0xf);	/* Align on quad-word boundary. */
 #endif
-	gr[_REG_SP]  = (__greg_t)sp;
+	gr[_REG_SP]  = (intptr_t)sp;
-	gr[_REG_RA]  = (__greg_t)__resumecontext;
+	gr[_REG_RA]  = (intptr_t)__resumecontext;
-	gr[_REG_T9]  = (__greg_t)func;	/* required for .abicalls */
+	gr[_REG_T9]  = (intptr_t)func;		/* required for .abicalls */
-	gr[_REG_EPC] = (__greg_t)func;
+	gr[_REG_EPC] = (intptr_t)func;
 	/* Construct argument list. */
 	va_start(ap, argc);
 #if defined(__mips_o32) || defined(__mips_o64)
 	/* Up to the first four arguments are passed in $a0-3. */
 	for (i = 0; i < argc && i < 4; i++)
-		/* LINTED uintptr_t is safe */
+		/* LINTED __greg_t is safe */
-		gr[_REG_A0 + i] = va_arg(ap, uintptr_t);
+		gr[_REG_A0 + i] = va_arg(ap, __greg_t);
 	/* Pass remaining arguments on the stack above the $a0-3 gap. */
 	sp += i;
 #endif
 #if defined(__mips_n32) || defined(__mips_n64)
 	/* Up to the first 8 arguments are passed in $a0-7. */
 	for (i = 0; i < argc && i < 8; i++)
 		/* LINTED __greg_t is safe */
 		gr[_REG_A0 + i] = va_arg(ap, __greg_t);
 	/* Pass remaining arguments on the stack above the $a0-3 gap. */
 #endif
 	/* Pass remaining arguments on the stack above the $a0-3 gap. */
-	for (sp += 4; i < argc; i++)
+	for (; i < argc; i++)
 		/* LINTED uintptr_t is safe */
-		*sp++ = va_arg(ap, uintptr_t);
+		*sp++ = va_arg(ap, __greg_t);
 	va_end(ap);
+}

--- src/lib/libc/arch/mips/gen/modf.S 2003/08/07 16:42:15	1.10
+++ src/lib/libc/arch/mips/gen/modf.S 2009/12/14 01:07:42	1.11

 @@ -1,14 +1,14 @@
-/*	$NetBSD: modf.S,v 1.10 2003/08/07 16:42:15 agc Exp $	*/
+/*	$NetBSD: modf.S,v 1.11 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,45 +25,39 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <mips/asm.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)modf.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: modf.S,v 1.10 2003/08/07 16:42:15 agc Exp $")
+	RCSID("from: @(#)modf.s	8.1 (Berkeley) 6/4/93")
-#endif /* LIBC_SCCS and not lint */
+#else
 	RCSID("$NetBSD: modf.S,v 1.11 2009/12/14 01:07:42 matt Exp $")
 #ifdef __ABICALLS__
 	.abicalls
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*
  * double modf(val, iptr)
  *	double val, *iptr;
  * returns: xxx and n (in *iptr) where val == n.xxx
  */
 LEAF(modf)
 #ifdef __ABICALLS__
 	.set	noreorder
 	.cpload	t9
 	.set	reorder
 #endif
 	cfc1	t0, $31			# get the control register
 	li.d	$f2, 4503599627370496e0 # f2 <- 2^52
 	or	t1, t0, 0x3		# set rounding mode to round to zero
 	xor	t1, t1, 0x2		#  (i.e., 01)
 	ctc1	t1, $31
 	mov.d	$f0, $f12		# f0 <- f12
 	abs.d	$f4, $f12		# f4 <- |f12|
 	c.olt.d $f4, $f2		# f4 ? < f2
 	bc1f	1f			# leave f0 alone if Nan, infinity
 					# or >=2^52
 	c.eq.d	$f12,$f4		# was f12 positive ?

--- src/lib/libc/arch/mips/gen/setjmp.S 2005/09/17 11:49:39	1.17
+++ src/lib/libc/arch/mips/gen/setjmp.S 2009/12/14 01:07:42	1.18

 @@ -1,14 +1,14 @@
-/*	$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $	*/
+/*	$NetBSD: setjmp.S,v 1.18 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,114 +22,125 @@
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <machine/cdefs.h>
 #include <sys/syscall.h>
 #include <mips/regnum.h>
 #include <mips/asm.h>
 #include <machine/signal.h>
 #include <machine/setjmp.h>
-#if defined(LIBC_SCCS) && !defined(lint)
+#include "assym.h"
 	ASMSTR("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $")
 #endif /* LIBC_SCCS and not lint */
-#ifdef __ABICALLS__
+#if defined(LIBC_SCCS) && !defined(lint)
-	.abicalls
+#if 0
 	RCSID("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: setjmp.S,v 1.18 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*
  * C library -- setjmp, longjmp
+ *
  *	longjmp(a,v)
  * will generate a "return(v)" from
  * the last call to
  *	setjmp(a)
  * by restoring registers from the stack,
  * and a struct sigcontext, see <signal.h>
  */
-#define SETJMP_FRAME_SIZE	(CALLFRAME_SIZ + 12)
+#define SETJMP_FRAME_SIZE	(CALLFRAME_SIZ + STACK_T_SIZE)
 NON_LEAF(__setjmp14, SETJMP_FRAME_SIZE, ra)
-	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
+	.mask	0x80010000, (CALLFRAME_RA - CALLFRAME_SIZ)
-#ifdef __ABICALLS__
+	SETUP_GP
-	.set	noreorder
+	PTR_SUBU	sp, sp, SETJMP_FRAME_SIZE	# allocate stack frame
-	.cpload	t9
+	SAVE_GP(CALLFRAME_GP)
-	.set	reorder
+	SETUP_GP64(CALLFRAME_GP, __setjmp14)
 #endif
-	subu	sp, sp, SETJMP_FRAME_SIZE	# allocate stack frame
+	REG_S		ra, CALLFRAME_RA(sp)		# save RA
-#ifdef __ABICALLS__
+	REG_S		s0, CALLFRAME_S0(sp)		# save S0
-	.cprestore 16
+	move		s0, a0				# save sigcontext
 #endif
 	sw	ra, CALLFRAME_RA(sp)		# save RA
 	sw	a0, SETJMP_FRAME_SIZE(sp)	# squirrel away sc
 	/* Get the signal mask. */
-	addu	a2, a0, _OFFSETOF_SC_MASK	# &sc.sc_mask
+	PTR_ADDU	a2, a0, _OFFSETOF_SC_MASK	# &sc.sc_mask
-	move	a1, zero
+	move		a1, zero
-	jal	_C_LABEL(__sigprocmask14)	# get current signal mask
+	jal		_C_LABEL(__sigprocmask14)	# get current signal mask
 	move	a0, zero			# (in delay slot)
 	/* Get the signal stack. */
-	move	a0, zero
+	move		a0, zero
-	addu	a1, sp, CALLFRAME_SIZ	# pointer to struct sigaltstack
+	PTR_ADDU	a1, sp, CALLFRAME_SIZ		# pointer to stack_t
-	jal	_C_LABEL(__sigaltstack14)
+	jal		_C_LABEL(__sigaltstack14)
 	move		a0, s0				# restore jmpbuf
 	INT_L		v1, CALLFRAME_SIZ+_OFFSETOF_STACK_T_FLAGS(sp)
 							# get old ss_onstack
 	and		v1, v1, SS_ONSTACK		# extract onstack flag
 	INT_S		v1, _OFFSETOF_SC_ONSTACK(a0)	# save it in sc_onstack
 	REG_L		s0, CALLFRAME_S0(sp)		# restore S0
 	REG_L		ra, CALLFRAME_RA(sp)		# restore RA
 	blt		v0, zero, botch		# check for sigaltstack() error
 	nop
-	lw	v1, CALLFRAME_SIZ+8(sp)	# get old ss_onstack
+	/*
-	lw	a0, SETJMP_FRAME_SIZE(sp)	# restore sc pointer
+	 * We know we won't need this routine's GP anymore.
-	and	v1, v1, 1			# extract onstack flag
+	 */
-	sw	v1, 0(a0)			# save it in sc_onstack
+	RESTORE_GP64
 	PTR_ADDU	sp, sp, SETJMP_FRAME_SIZE	# pop stack frame
 	lw	ra, CALLFRAME_RA(sp)		# restore RA
 	addu	sp, sp, SETJMP_FRAME_SIZE	# pop stack frame
 	blt	v0, zero, botch			# check for sigaltstack() error
 	REG_PROLOGUE
-	REG_S	ra, (2 * 4)(a0)			# sc_pc = return address
+	REG_S	ra, _OFFSETOF_SC_PC(a0)		# sc_pc = return address
 	REG_LI	v0, 0xACEDBADE			# sigcontext magic number
-	REG_S	v0, (_OFFSETOF_SC_REGS + _R_ZERO * SZREG)(a0) #   saved in sc_regs[0]
+	REG_S	v0, _OFFSETOF_SC_REGS(a0)	#   saved in sc_regs[0]
-	REG_S	s0, (_OFFSETOF_SC_REGS + _R_S0 * SZREG)(a0)
+	REG_S	s0, _OFFSETOF_SC_REGS_S0(a0)
-	REG_S	s1, (_OFFSETOF_SC_REGS + _R_S1 * SZREG)(a0)
+	REG_S	s1, _OFFSETOF_SC_REGS_S1(a0)
-	REG_S	s2, (_OFFSETOF_SC_REGS + _R_S2 * SZREG)(a0)
+	REG_S	s2, _OFFSETOF_SC_REGS_S2(a0)
-	REG_S	s3, (_OFFSETOF_SC_REGS + _R_S3 * SZREG)(a0)
+	REG_S	s3, _OFFSETOF_SC_REGS_S3(a0)
-	REG_S	s4, (_OFFSETOF_SC_REGS + _R_S4 * SZREG)(a0)
+	REG_S	s4, _OFFSETOF_SC_REGS_S4(a0)
-	REG_S	s5, (_OFFSETOF_SC_REGS + _R_S5 * SZREG)(a0)
+	REG_S	s5, _OFFSETOF_SC_REGS_S5(a0)
-	REG_S	s6, (_OFFSETOF_SC_REGS + _R_S6 * SZREG)(a0)
+	REG_S	s6, _OFFSETOF_SC_REGS_S6(a0)
-	REG_S	s7, (_OFFSETOF_SC_REGS + _R_S7 * SZREG)(a0)
+	REG_S	s7, _OFFSETOF_SC_REGS_S7(a0)
-	REG_S	gp, (_OFFSETOF_SC_REGS + _R_GP * SZREG)(a0)
+	REG_S	gp, _OFFSETOF_SC_REGS_GP(a0)
-	REG_S	sp, (_OFFSETOF_SC_REGS + _R_SP * SZREG)(a0)
+	REG_S	sp, _OFFSETOF_SC_REGS_SP(a0)
-	REG_S	s8, (_OFFSETOF_SC_REGS + _R_S8 * SZREG)(a0)
+	REG_S	s8, _OFFSETOF_SC_REGS_S8(a0)
 	li	v0, 1				# be nice if we could tell
-	sw	v0, (_OFFSETOF_SC_REGS + 34 * SZREG)(a0)	# sc_fpused = 1
+	INT_S	v0, _OFFSETOF_SC_FPUSED(a0)	# sc_fpused = 1
 	cfc1	v0, $31
-	swc1	$f20, (20 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	INT_S	v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
-	swc1	$f21, (21 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#ifndef SOFTFLOAT_FOR_GCC
-	swc1	$f22, (22 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32)
-	swc1	$f23, (23 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f20, _OFFSETOF_SC_FPREGS_F20(a0)
-	swc1	$f24, (24 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f22, _OFFSETOF_SC_FPREGS_F22(a0)
-	swc1	$f25, (25 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#endif
-	swc1	$f26, (26 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#if defined(__mips_o32) || defined(__mips_o64)
-	swc1	$f27, (27 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f21, _OFFSETOF_SC_FPREGS_F21(a0)
-	swc1	$f28, (28 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f23, _OFFSETOF_SC_FPREGS_F23(a0)
-	swc1	$f29, (29 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#endif
-	swc1	$f30, (30 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+#if defined(__mips_n32) || defined(__mips_n64)
-	swc1	$f31, (31 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f24, _OFFSETOF_SC_FPREGS_F24(a0)
-	sw	v0, (32 * 4 + _OFFSETOF_SC_FPREGS)(a0)
+	FP_S	$f26, _OFFSETOF_SC_FPREGS_F26(a0)
-	move	v0, zero
+	FP_S	$f28, _OFFSETOF_SC_FPREGS_F28(a0)
-	j	ra
+	FP_S	$f30, _OFFSETOF_SC_FPREGS_F30(a0)
 #endif
 #if defined(__mips_n64)
 	FP_S	$f25, _OFFSETOF_SC_FPREGS_F25(a0)
 	FP_S	$f27, _OFFSETOF_SC_FPREGS_F27(a0)
 	FP_S	$f29, _OFFSETOF_SC_FPREGS_F29(a0)
 	FP_S	$f31, _OFFSETOF_SC_FPREGS_F31(a0)
 #endif
 #endif	/* SOFTFLOAT_FOR_GCC */
 	REG_EPILOGUE
 	j	ra
 	move	v0, zero
 botch:
 	jal	_C_LABEL(abort)
 END(__setjmp14)

--- src/lib/libc/arch/mips/gen/swapcontext.S 2008/04/28 20:22:56	1.3
+++ src/lib/libc/arch/mips/gen/swapcontext.S 2009/12/14 01:07:42	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: swapcontext.S,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: swapcontext.S,v 1.4 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Klaus Klein.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,50 +20,48 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "SYS.h"
-#include <machine/mcontext.h>
+#include "assym.h"
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	ASMSTR("$NetBSD: swapcontext.S,v 1.3 2008/04/28 20:22:56 martin Exp $")
+	RCSID("$NetBSD: swapcontext.S,v 1.4 2009/12/14 01:07:42 matt Exp $")
 #endif /* SYSLIBC_SCCS && !lint */
 #ifdef __ABICALLS__
 	.abicalls
 #endif
 	.set	reorder
 NESTED(swapcontext, CALLFRAME_SIZ, ra)
 	.mask	0x80000030, (CALLFRAME_RA - CALLFRAME_SIZ)
-	subu	sp, sp, CALLFRAME_SIZ
+	PTR_SUBU	sp, sp, CALLFRAME_SIZ
-	sw	ra, CALLFRAME_RA(sp)	# save ra
+	PTR_S		ra, CALLFRAME_RA(sp)	# save ra
-	sw	a0, 0(sp)		# stash away oucp
+	PTR_S		a0, 0(sp)		# stash away oucp
-	sw	a1, 4(sp)		# stash away ucp
+	PTR_S		a1, SZREG(sp)		# stash away ucp
 	SYSTRAP(getcontext)
-	lw	ra, CALLFRAME_RA(sp)
+	PTR_L		ra, CALLFRAME_RA(sp)
-	bne	a3, zero, 1f
+	bne		a3, zero, 1f
-	lw	v1, 0(sp)		# load oucp again for adjustment
+	PTR_L		v1, 0(sp)		# load oucp again for adjustment
-	lw	a0, 4(sp)		# load ucp
+	PTR_L		a0, SZREG(sp)		# load ucp
-	addiu	v0, sp, CALLFRAME_SIZ
+	PTR_ADDIU	v0, sp, CALLFRAME_SIZ
 	REG_PROLOGUE
-	REG_S	zero, (_OFFSETOF_UC_GREGS + _REG_V0 * SZREG)(v1)
+	REG_S		zero, _OFFSETOF_UC_GREGS_V0(v1)
-	REG_S	ra, (_OFFSETOF_UC_GREGS + _REG_EPC * SZREG)(v1)
+	REG_S		ra, _OFFSETOF_UC_GREGS_EPC(v1)
-	REG_S	v0, (_OFFSETOF_UC_GREGS + _REG_SP * SZREG)(v1)
+	REG_S		v0, _OFFSETOF_UC_GREGS_SP(v1)
 	REG_EPILOGUE
 	SYSTRAP(setcontext)
 	/* NOTREACHED */
 :
-	addiu	sp, sp, CALLFRAME_SIZ
+	PTR_ADDU	sp, sp, CALLFRAME_SIZ
-	la	t9, _C_LABEL(__cerror)
+	SETUP_GPX(t0);
-	jr	t9
+	SETUP_GP64(t3,swapcontext);
 	PIC_TAILCALL(__cerror)
 END(swapcontext)

/* $NetBSD: milieu.h,v 1.2 2009/12/14 01:07:42 matt Exp $ */

/*
===============================================================================

This C header file is part of the SoftFloat IEC/IEEE Floating-point
Arithmetic Package, Release 2a.

Written by John R. Hauser.  This work was made possible in part by the
International Computer Science Institute, located at Suite 600, 1947 Center
Street, Berkeley, California 94704.  Funding was partially provided by the
National Science Foundation under grant MIP-9311980.  The original version
of this code was written as part of a project to build a fixed-point vector
processor in collaboration with the University of California at Berkeley,
overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
arithmetic/SoftFloat.html'.

THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.

Derivative works are acceptable, even for commercial purposes, so long as
(1) they include prominent notice that the work is derivative, and (2) they
include prominent notice akin to these four paragraphs for those parts of
this code that are retained.

===============================================================================
*/

/*
-------------------------------------------------------------------------------
Include common integer types and flags.
-------------------------------------------------------------------------------
*/
#include "mips-gcc.h"

/*
-------------------------------------------------------------------------------
Symbolic Boolean literals.
-------------------------------------------------------------------------------
*/
enum {
    FALSE = 0,
    TRUE  = 1
};

/* $NetBSD: mips-gcc.h,v 1.2 2009/12/14 01:07:42 matt Exp $ */

/*
-------------------------------------------------------------------------------
One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
-------------------------------------------------------------------------------
*/
#ifdef __MIPSEB__
#define BIGENDIAN
#else
#define LITTLEENDIAN
#endif

/*
-------------------------------------------------------------------------------
The macro `BITS64' can be defined to indicate that 64-bit integer types are
supported by the compiler.
-------------------------------------------------------------------------------
*/
#define BITS64

/*
-------------------------------------------------------------------------------
Each of the following `typedef's defines the most convenient type that holds
integers of at least as many bits as specified.  For example, `uint8' should
be the most convenient type that can hold unsigned integers of as many as
8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
to the same as `int'.
-------------------------------------------------------------------------------
*/
typedef int flag;
typedef int uint8;
typedef int int8;
typedef int uint16;
typedef int int16;
typedef unsigned int uint32;
typedef signed int int32;
#ifdef BITS64
typedef unsigned long long int uint64;
typedef signed long long int int64;
#endif

/*
-------------------------------------------------------------------------------
Each of the following `typedef's defines a type that holds integers
of _exactly_ the number of bits specified.  For instance, for most
implementation of C, `bits16' and `sbits16' should be `typedef'ed to
`unsigned short int' and `signed short int' (or `short int'), respectively.
-------------------------------------------------------------------------------
*/
typedef unsigned char bits8;
typedef signed char sbits8;
typedef unsigned short int bits16;
typedef signed short int sbits16;
typedef unsigned int bits32;
typedef signed int sbits32;
#ifdef BITS64
typedef unsigned long long int bits64;
typedef signed long long int sbits64;
#endif

#ifdef BITS64
/*
-------------------------------------------------------------------------------
The `LIT64' macro takes as its argument a textual integer literal and
if necessary ``marks'' the literal as having a 64-bit integer type.
For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
appended with the letters `LL' standing for `long long', which is `gcc's
name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
defined as the identity macro:  `#define LIT64( a ) a'.
-------------------------------------------------------------------------------
*/
#define LIT64( a ) a##LL
#endif

/*
-------------------------------------------------------------------------------
The macro `INLINE' can be used before functions that should be inlined.  If
a compiler does not support explicit inlining, this macro should be defined
to be `static'.
-------------------------------------------------------------------------------
*/
#define INLINE static inline

/*
-------------------------------------------------------------------------------
The ARM FPA is odd in that it stores doubles high-order word first, no matter
what the endianness of the CPU.  VFP is sane.
-------------------------------------------------------------------------------
*/
#if defined(SOFTFLOAT_FOR_GCC)
#define FLOAT64_DEMANGLE(a)	(a)
#define FLOAT64_MANGLE(a)	(a)
#endif

/*	$NetBSD: softfloat.h,v 1.2 2009/12/14 01:07:42 matt Exp $	*/

/* This is a derivative work. */

/*
===============================================================================

This C header file is part of the SoftFloat IEC/IEEE Floating-point
Arithmetic Package, Release 2a.

Written by John R. Hauser.  This work was made possible in part by the
International Computer Science Institute, located at Suite 600, 1947 Center
Street, Berkeley, California 94704.  Funding was partially provided by the
National Science Foundation under grant MIP-9311980.  The original version
of this code was written as part of a project to build a fixed-point vector
processor in collaboration with the University of California at Berkeley,
overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
arithmetic/SoftFloat.html'.

THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.

Derivative works are acceptable, even for commercial purposes, so long as
(1) they include prominent notice that the work is derivative, and (2) they
include prominent notice akin to these four paragraphs for those parts of
this code that are retained.

===============================================================================
*/

/*
-------------------------------------------------------------------------------
The macro `FLOATX80' must be defined to enable the extended double-precision
floating-point format `floatx80'.  If this macro is not defined, the
`floatx80' type will not be defined, and none of the functions that either
input or output the `floatx80' type will be defined.  The same applies to
the `FLOAT128' macro and the quadruple-precision format `float128'.
-------------------------------------------------------------------------------
*/
/* #define FLOATX80 */
/* #define FLOAT128 */

#include <machine/ieeefp.h>

/*
-------------------------------------------------------------------------------
Software IEC/IEEE floating-point types.
-------------------------------------------------------------------------------
*/
typedef unsigned int float32;
typedef unsigned long long float64;
#ifdef FLOATX80
typedef struct {
    unsigned short high;
    unsigned long long low;
} floatx80;
#endif
#ifdef FLOAT128
typedef struct {
    unsigned long long high, low;
} float128;
#endif

/*
-------------------------------------------------------------------------------
Software IEC/IEEE floating-point underflow tininess-detection mode.
-------------------------------------------------------------------------------
*/
#ifndef SOFTFLOAT_FOR_GCC
extern int float_detect_tininess;
#endif
enum {
    float_tininess_after_rounding  = 0,
    float_tininess_before_rounding = 1
};

/*
-------------------------------------------------------------------------------
Software IEC/IEEE floating-point rounding mode.
-------------------------------------------------------------------------------
*/
extern fp_rnd float_rounding_mode;
enum {
    float_round_nearest_even = FP_RN,
    float_round_to_zero      = FP_RZ,
    float_round_down         = FP_RM,
    float_round_up           = FP_RP
};

/*
-------------------------------------------------------------------------------
Software IEC/IEEE floating-point exception flags.
-------------------------------------------------------------------------------
*/
extern fp_except float_exception_flags;
extern fp_except float_exception_mask;
enum {
    float_flag_inexact   = FP_X_IMP,
    float_flag_underflow = FP_X_UFL,
    float_flag_overflow  = FP_X_OFL,
    float_flag_divbyzero = FP_X_DZ,
    float_flag_invalid   = FP_X_INV
};

/*
-------------------------------------------------------------------------------
Routine to raise any or all of the software IEC/IEEE floating-point
exception flags.
-------------------------------------------------------------------------------
*/
void float_raise( fp_except );

/*
-------------------------------------------------------------------------------
Software IEC/IEEE integer-to-floating-point conversion routines.
-------------------------------------------------------------------------------
*/
float32 int32_to_float32( int );
float64 int32_to_float64( int );
#ifdef FLOATX80
floatx80 int32_to_floatx80( int );
#endif
#ifdef FLOAT128
float128 int32_to_float128( int );
#endif
#ifndef SOFTFLOAT_FOR_GCC /* __floatdi?f is in libgcc2.c */
float32 int64_to_float32( long long );
float64 int64_to_float64( long long );
#ifdef FLOATX80
floatx80 int64_to_floatx80( long long );
#endif
#ifdef FLOAT128
float128 int64_to_float128( long long );
#endif
#endif

/*
-------------------------------------------------------------------------------
Software IEC/IEEE single-precision conversion routines.
-------------------------------------------------------------------------------
*/
int float32_to_int32( float32 );
int float32_to_int32_round_to_zero( float32 );
#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
unsigned int float32_to_uint32_round_to_zero( float32 );
#endif
#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
long long float32_to_int64( float32 );
long long float32_to_int64_round_to_zero( float32 );
#endif
float64 float32_to_float64( float32 );
#ifdef FLOATX80
floatx80 float32_to_floatx80( float32 );
#endif
#ifdef FLOAT128
float128 float32_to_float128( float32 );
#endif

/*
-------------------------------------------------------------------------------
Software IEC/IEEE single-precision operations.
-------------------------------------------------------------------------------
*/
float32 float32_round_to_int( float32 );
float32 float32_add( float32, float32 );
float32 float32_sub( float32, float32 );
float32 float32_mul( float32, float32 );
float32 float32_div( float32, float32 );
float32 float32_rem( float32, float32 );
float32 float32_sqrt( float32 );
int float32_eq( float32, float32 );
int float32_le( float32, float32 );
int float32_lt( float32, float32 );
int float32_eq_signaling( float32, float32 );
int float32_le_quiet( float32, float32 );
int float32_lt_quiet( float32, float32 );
#ifndef SOFTFLOAT_FOR_GCC
int float32_is_signaling_nan( float32 );
#endif

/*
-------------------------------------------------------------------------------
Software IEC/IEEE double-precision conversion routines.
-------------------------------------------------------------------------------
*/
int float64_to_int32( float64 );
int float64_to_int32_round_to_zero( float64 );
#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
unsigned int float64_to_uint32_round_to_zero( float64 );
#endif
#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
long long float64_to_int64( float64 );
long long float64_to_int64_round_to_zero( float64 );
#endif
float32 float64_to_float32( float64 );
#ifdef FLOATX80
floatx80 float64_to_floatx80( float64 );
#endif
#ifdef FLOAT128
float128 float64_to_float128( float64 );
#endif

/*
-------------------------------------------------------------------------------
Software IEC/IEEE double-precision operations.
-------------------------------------------------------------------------------
*/
float64 float64_round_to_int( float64 );
float64 float64_add( float64, float64 );
float64 float64_sub( float64, float64 );
float64 float64_mul( float64, float64 );
float64 float64_div( float64, float64 );
float64 float64_rem( float64, float64 );
float64 float64_sqrt( float64 );
int float64_eq( float64, float64 );
int float64_le( float64, float64 );
int float64_lt( float64, float64 );
int float64_eq_signaling( float64, float64 );
int float64_le_quiet( float64, float64 );
int float64_lt_quiet( float64, float64 );
#ifndef SOFTFLOAT_FOR_GCC
int float64_is_signaling_nan( float64 );
#endif

#ifdef FLOATX80

/*
-------------------------------------------------------------------------------
Software IEC/IEEE extended double-precision conversion routines.
-------------------------------------------------------------------------------
*/
int floatx80_to_int32( floatx80 );
int floatx80_to_int32_round_to_zero( floatx80 );
long long floatx80_to_int64( floatx80 );
long long floatx80_to_int64_round_to_zero( floatx80 );
float32 floatx80_to_float32( floatx80 );
float64 floatx80_to_float64( floatx80 );
#ifdef FLOAT128
float128 floatx80_to_float128( floatx80 );
#endif

/*
-------------------------------------------------------------------------------
Software IEC/IEEE extended double-precision rounding precision.  Valid
values are 32, 64, and 80.
-------------------------------------------------------------------------------
*/
extern int floatx80_rounding_precision;

/*
-------------------------------------------------------------------------------
Software IEC/IEEE extended double-precision operations.
-------------------------------------------------------------------------------
*/
floatx80 floatx80_round_to_int( floatx80 );
floatx80 floatx80_add( floatx80, floatx80 );
floatx80 floatx80_sub( floatx80, floatx80 );
floatx80 floatx80_mul( floatx80, floatx80 );
floatx80 floatx80_div( floatx80, floatx80 );
floatx80 floatx80_rem( floatx80, floatx80 );
floatx80 floatx80_sqrt( floatx80 );
int floatx80_eq( floatx80, floatx80 );
int floatx80_le( floatx80, floatx80 );
int floatx80_lt( floatx80, floatx80 );
int floatx80_eq_signaling( floatx80, floatx80 );
int floatx80_le_quiet( floatx80, floatx80 );
int floatx80_lt_quiet( floatx80, floatx80 );
int floatx80_is_signaling_nan( floatx80 );

#endif

#ifdef FLOAT128

/*
-------------------------------------------------------------------------------
Software IEC/IEEE quadruple-precision conversion routines.
-------------------------------------------------------------------------------
*/
int float128_to_int32( float128 );
int float128_to_int32_round_to_zero( float128 );
#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
unsigned int float128_to_uint32_round_to_zero( float64 );
#endif
long long float128_to_int64( float128 );
long long float128_to_int64_round_to_zero( float128 );
#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
unsigned long long float128_to_uint64_round_to_zero( float128 );
#endif
float32 float128_to_float32( float128 );
float64 float128_to_float64( float128 );
#ifdef FLOATX80
floatx80 float128_to_floatx80( float128 );
#endif

/*
-------------------------------------------------------------------------------
Software IEC/IEEE quadruple-precision operations.
-------------------------------------------------------------------------------
*/
float128 float128_round_to_int( float128 );
float128 float128_add( float128, float128 );
float128 float128_sub( float128, float128 );
float128 float128_mul( float128, float128 );
float128 float128_div( float128, float128 );
float128 float128_rem( float128, float128 );
float128 float128_sqrt( float128 );
int float128_eq( float128, float128 );
int float128_le( float128, float128 );
int float128_lt( float128, float128 );
int float128_eq_signaling( float128, float128 );
int float128_le_quiet( float128, float128 );
int float128_lt_quiet( float128, float128 );
int float128_is_signaling_nan( float128 );

#endif

--- src/lib/libc/arch/mips/string/Makefile.inc 2009/07/30 20:57:16	1.4
+++ src/lib/libc/arch/mips/string/Makefile.inc 2009/12/14 01:07:42	1.5

 @@ -1,6 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:16 dsl Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2009/12/14 01:07:42 matt Exp $
-SRCS+=	bcmp.S bcopy.S bzero.S  ffs.S \
+SRCS+=	bcmp.S bcopy.S bzero.S \
 	ffs.S \
 	memcpy.S memmove.S \
 	strchr.S strrchr.S \
-	strcmp.S strlen.S \
+	strcmp.S strlen.S

--- src/lib/libc/arch/mips/string/bcmp.S 2003/08/07 16:42:16	1.8
+++ src/lib/libc/arch/mips/string/bcmp.S 2009/12/14 01:07:42	1.9

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcmp.S,v 1.8 2003/08/07 16:42:16 agc Exp $	*/
+/*	$NetBSD: bcmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,99 +27,98 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <mips/asm.h>
 #define _LOCORE		/* XXX not really, just assembly-code source */
 #include <machine/endian.h>	/* LWLO/LWHI, SWLO/SWHI */
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)bcmp.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: bcmp.S,v 1.8 2003/08/07 16:42:16 agc Exp $")
+	RCSID("from: @(#)bcmp.s	8.1 (Berkeley) 6/4/93")
-#endif /* LIBC_SCCS and not lint */
+#else
 	RCSID("$NetBSD: bcmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $")
 #ifdef __ABICALLS__
 	.abicalls
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* bcmp(s1, s2, n) */
 LEAF(bcmp)
 	.set	noreorder
-	blt	a2, 16, small		# is it worth any trouble?
+	blt		a2, 16, small	# is it worth any trouble?
-	xor	v0, a0, a1		# compare low two bits of addresses
+	xor		v0, a0, a1	# compare low two bits of addresses
-	and	v0, v0, 3
+	and		v0, v0, 3
-	subu	a3, zero, a1		# compute # bytes to word align address
+	PTR_SUBU	a3, zero, a1	# compute # bytes to word align address
-	bne	v0, zero, unaligned	# not possible to align addresses
+	bne		v0, zero, unaligned # not possible to align addresses
-	and	a3, a3, 3
+	and		a3, a3, 3
-	beq	a3, zero, 1f
+	beq		a3, zero, 1f
-	subu	a2, a2, a3		# subtract from remaining count
+	PTR_SUBU	a2, a2, a3	# subtract from remaining count
-	move	v0, v1			# init v0,v1 so unmodified bytes match
+	move		v0, v1		# init v0,v1 so unmodified bytes match
-	LWHI	v0, 0(a0)		# read 1, 2, or 3 bytes
+	LWHI		v0, 0(a0)	# read 1, 2, or 3 bytes
-	LWHI	v1, 0(a1)
+	LWHI		v1, 0(a1)
-	addu	a1, a1, a3
+	PTR_ADDU	a1, a1, a3
-	bne	v0, v1, nomatch
+	bne		v0, v1, nomatch
-	addu	a0, a0, a3
+	PTR_ADDU	a0, a0, a3
 :
-	and	a3, a2, ~3		# compute number of whole words left
+	and		a3, a2, ~3	# compute number of whole words left
-	subu	a2, a2, a3		#   which has to be >= (16-3) & ~3
+	PTR_SUBU	a2, a2, a3	#   which has to be >= (16-3) & ~3
-	addu	a3, a3, a0		# compute ending address
+	PTR_ADDU	a3, a3, a0	# compute ending address
 :
-	lw	v0, 0(a0)		# compare words
+	lw		v0, 0(a0)	# compare words
-	lw	v1, 0(a1)
+	lw		v1, 0(a1)
-	addu	a0, a0, 4
+	PTR_ADDU	a0, a0, 4
-	bne	v0, v1, nomatch
+	bne		v0, v1, nomatch
-	addu	a1, a1, 4
+	PTR_ADDU	a1, a1, 4
-	bne	a0, a3, 2b
+	bne		a0, a3, 2b
 	nop
-	b	small			# finish remainder
+	b		small		# finish remainder
 	nop
 unaligned:
-	beq	a3, zero, 2f
+	beq		a3, zero, 2f
-	subu	a2, a2, a3		# subtract from remaining count
+	PTR_SUBU	a2, a2, a3	# subtract from remaining count
-	addu	a3, a3, a0		# compute ending address
+	PTR_ADDU	a3, a3, a0	# compute ending address
 :
-	lbu	v0, 0(a0)		# compare bytes until a1 word aligned
+	lbu		v0, 0(a0)	# compare bytes until a1 word aligned
-	lbu	v1, 0(a1)
+	lbu		v1, 0(a1)
-	addu	a0, a0, 1
+	PTR_ADDU	a0, a0, 1
-	bne	v0, v1, nomatch
+	bne		v0, v1, nomatch
-	addu	a1, a1, 1
+	PTR_ADDU	a1, a1, 1
-	bne	a0, a3, 1b
+	bne		a0, a3, 1b
 	nop
 :
-	and	a3, a2, ~3		# compute number of whole words left
+	and		a3, a2, ~3	# compute number of whole words left
-	subu	a2, a2, a3		#   which has to be >= (16-3) & ~3
+	PTR_SUBU	a2, a2, a3	#   which has to be >= (16-3) & ~3
-	addu	a3, a3, a0		# compute ending address
+	PTR_ADDU	a3, a3, a0	# compute ending address
 :
-	LWHI	v0, 0(a0)		# compare words a0 unaligned, a1 aligned
+	LWHI		v0, 0(a0)	# compare words a0 unaligned, a1 aligned
-	LWLO	v0, 3(a0)
+	LWLO		v0, 3(a0)
-	lw	v1, 0(a1)
+	lw		v1, 0(a1)
-	addu	a0, a0, 4
+	PTR_ADDU	a0, a0, 4
-	bne	v0, v1, nomatch
+	bne		v0, v1, nomatch
-	addu	a1, a1, 4
+	PTR_ADDU	a1, a1, 4
-	bne	a0, a3, 3b
+	bne		a0, a3, 3b
 	nop
 small:
-	ble	a2, zero, match
+	ble		a2, zero, match
-	addu	a3, a2, a0		# compute ending address
+	PTR_ADDU	a3, a2, a0		# compute ending address
 :
-	lbu	v0, 0(a0)
+	lbu		v0, 0(a0)
-	lbu	v1, 0(a1)
+	lbu		v1, 0(a1)
-	addu	a0, a0, 1
+	PTR_ADDU	a0, a0, 1
-	bne	v0, v1, nomatch
+	bne		v0, v1, nomatch
-	addu	a1, a1, 1
+	PTR_ADDU	a1, a1, 1
-	bne	a0, a3, 1b
+	bne		a0, a3, 1b
 	nop
 match:
-	j	ra
+	j		ra
-	move	v0, zero
+	move		v0, zero
 nomatch:
-	j	ra
+	j		ra
-	li	v0, 1
+	li		v0, 1
 	.set	reorder
 END(bcmp)

--- src/lib/libc/arch/mips/string/bzero.S 2003/08/07 16:42:16	1.8
+++ src/lib/libc/arch/mips/string/bzero.S 2009/12/14 01:07:42	1.9

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bzero.S,v 1.8 2003/08/07 16:42:16 agc Exp $	*/
+/*	$NetBSD: bzero.S,v 1.9 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,56 +25,73 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <mips/asm.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)bzero.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: bzero.S,v 1.8 2003/08/07 16:42:16 agc Exp $")
+	RCSID("from: @(#)bzero.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: bzero.S,v 1.9 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #define _LOCORE		/* XXX not really, just assembly-code source */
 #include <machine/endian.h>
 #ifdef __ABICALLS__
 	.abicalls
 #endif
 /* bzero(s1, n) */
 LEAF(bzero)
 	.set	noreorder
-	blt	a1, 12, smallclr	# small amount to clear?
+	blt		a1, 3*SZREG, smallclr # small amount to clear?
-	subu	a3, zero, a0		# compute # bytes to word align address
+	PTR_SUBU	a3, zero, a0	# compute # bytes to word align address
-	and	a3, a3, 3
+	and		a3, a3, SZREG-1
-	beq	a3, zero, 1f		# skip if word aligned
+	beq		a3, zero, 1f	# skip if word aligned
-	subu	a1, a1, a3		# subtract from remaining count
+#if SZREG == 4
-	SWHI	zero, 0(a0)		# clear 1, 2, or 3 bytes to align
+	PTR_SUBU	a1, a1, a3	# subtract from remaining count
-	addu	a0, a0, a3
+	SWHI		zero, 0(a0)	# clear 1, 2, or 3 bytes to align
 	PTR_ADDU	a0, a0, a3
 #endif
 #if SZREG == 8
 	PTR_SUBU	a1, a1, a3	# subtract from remaining count
 	PTR_ADDU	a0, a0, a3	# align dst to next word
 	sll		a3, a3, 3	# bits to bytes
 	li		a2, -1		# make a mask
 #if _BYTE_ORDER == _BIG_ENDIAN
 	REG_SRLV	a2, a2, a3	# we want to keep the MSB bytes
 #endif
 #if _BYTE_ORDER == _LITTLE_ENDIAN
 	REG_SLLV	a2, a2, a3	# we want to keep the LSB bytes
 #endif
 	nor		a2, zero, a2	# complement the mask
 	REL_L		v0, -SZREG(a0)	# load the word to partially clear
 	and		v0, v0, a2	# clear the bytes
 	REG_S		v0, -SZREG(a0)	# store it back
 #endif
 :
-	and	v0, a1, 3		# compute number of words left
+	and		v0, a1, SZREG-1	# compute number of words left
-	subu	a3, a1, v0
+	PTR_SUBU	a3, a1, v0
-	move	a1, v0
+	move		a1, v0
-	addu	a3, a3, a0		# compute ending address
+	PTR_ADDU	a3, a3, a0	# compute ending address
 :
-	addu	a0, a0, 4		# clear words
+	PTR_ADDU	a0, a0, SZREG	# clear words
-	bne	a0, a3, 2b		#   unrolling loop doesnt help
+	bne		a0, a3, 2b	#  unrolling loop doesnt help
-	sw	zero, -4(a0)		#   since we are limited by memory speed
+	REG_S		zero, -SZREG(a0) # since we are limited by memory speed
 smallclr:
-	ble	a1, zero, 2f
+	ble		a1, zero, 2f
-	addu	a3, a1, a0		# compute ending address
+	PTR_ADDU	a3, a1, a0	# compute ending address
 :
-	addu	a0, a0, 1		# clear bytes
+	PTR_ADDU	a0, a0, 1	# clear bytes
-	bne	a0, a3, 1b
+	bne		a0, a3, 1b
-	sb	zero, -1(a0)
+	sb		zero, -1(a0)
 :
-	j	ra
+	j		ra
 	nop
 END(bzero)

--- src/lib/libc/arch/mips/sys/__clone.S 2008/04/28 20:22:56	1.7
+++ src/lib/libc/arch/mips/sys/__clone.S 2009/12/14 01:07:42	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: __clone.S,v 1.7 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: __clone.S,v 1.8 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,79 +23,81 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/errno.h>
 #include "SYS.h"
 #if defined(SYSLIBC_SCCS) && !defined(lint)
 	RCSID("$NetBSD: __clone.S,v 1.8 2009/12/14 01:07:42 matt Exp $");
 #endif /* SYSLIBC_SCCS and not lint */
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(clone, __clone)
 #endif
 /*
  * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
  */
 LEAF(__clone)
-	PIC_PROLOGUE(__clone, t9)
+	PIC_PROLOGUE(__clone)
 	/*
 	 * Sanity checks: func and stack may not be NULL.
 	 */
-	li	v0, EINVAL
+	li		v0, EINVAL
-	beq	a0, zero, 8f
+	beq		a0, zero, 8f
-	beq	a1, zero, 8f
+	beq		a1, zero, 8f
 	/*
 	 * We need to be able to get at the func and arg arguments
 	 * in the child.  Luckily, we have a convenient place to
 	 * do this: the child's stack.
 	 */
-	subu	a1, a1, (2 * SZREG)
+	PTR_SUBU	a1, a1, CALLFRAME_SIZ
-	REG_S	a0, 0(a1)
+	REG_S		a0, 0(a1)
-	REG_S	a3, SZREG(a1)
+	REG_S		a3, SZREG(a1)
 	/*
 	 * The system call expects (flags, stack).
 	 */
-	move	a0, a2
+	move		a0, a2
 	SYSTRAP(__clone)
-	bne	a3, zero, 8f
+	bne		a3, zero, 8f
-	bne	v1, zero, 9f	# v1 (rv[1]) == 0, parent, child pid in v0
+	bne		v1, zero, 9f	# v1 (rv[1]) == 0, parent, child pid in v0
-	j	ra		# parent return
+	PIC_RETURN()			# parent return
-:	PIC_CALL(__cerror, t9)
+:	PIC_TAILCALL(__cerror)
 	/* NOTREACHED */
 :	/*
-	 * Child: Fetch the function and argument from the new stack,
+	 * Child: Fetch the function and argument from the new stack and create
-	 * and create a frame so that the child can be safely called.
+	 a frame so that the child can be safely called.
+	 *
 	 * There are already register slots on the stack from above.
-	 * We take 4 register slots more.  The lower 4 accommodate o32
+	 * They already include the o32 argument save area.  The
-	 * argument save area.  The next higher is used to save GP (if
+	 * highest is unused.  a1 should equal sp now.
 	 * ABICALLS).  The highest is unused.
 	 */
 	REG_L	t9, 0(sp)
 	REG_L	a0, SZREG(sp)
 	subu	sp, sp, (4 * SZREG)
-#ifdef __ABICALLS__
+	REG_L		t9, 0(sp)
-	.cprestore (4 * SZREG)
+	REG_L		a0, SZREG(sp)
 #endif
 	REG_S		zero, CALLFRAME_RA(sp)	/* make sure stack frame ends */
 	/* Call the clone's entry point. */
-	jal	t9
+	SAVE_GP(CALLFRAME_GP)
 	jal		t9
-	/* Pass the return value to _exit(). */
+	/* Pass the return value to _exit. */
-	move	a0, v0
+	move		a0, v0
-	PIC_CALL(_exit, t9)
+	PIC_TAILCALL(_exit)
 	/* NOTREACHED */
 END(__clone)

--- src/lib/libc/arch/mips/sys/__sigtramp2.S 2008/04/28 20:22:56	1.2
+++ src/lib/libc/arch/mips/sys/__sigtramp2.S 2009/12/14 01:07:42	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: __sigtramp2.S,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: __sigtramp2.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,29 +20,35 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "SYS.h"
 #include "assym.h"
 #if defined(SYSLIBC_SCCS) && !defined(lint)
 	RCSID("$NetBSD: __sigtramp2.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 /*
  * The MIPS signal trampoline is invoked only to return from
  * the signal; the kernel calls the signal handler directly.
+ *
  * On entry, stack looks like:
+ *
- *	sp		->	siginfo_t structure
+ *	sp			->	siginfo_t structure
- *	sp + 128	->	ucontext_t structure
+ *	sp + SIGINFO_SIZE	->	ucontext_t structure
  */
 LEAF_NOPROFILE(__sigtramp_siginfo_2)
-	addu	a0, sp, 128		/* address of ucontext */
+	PTR_ADDU	a0, sp, SIGINFO_SIZE	/* address of ucontext */
-	SYSTRAP(setcontext)		/* and do setcontext */
+	SYSTRAP(setcontext)			/* and do setcontext */
-	move	a0, v0			/* exit with errno */
+	move		a0, v0			/* exit with errno */
-	SYSTRAP(exit)			/* if sigreturn fails */
+	SYSTRAP(exit)				/* if sigreturn fails */
 END(__sigtramp_siginfo_2)

--- src/lib/libc/arch/mips/sys/__vfork14.S 2003/08/07 16:42:17	1.5
+++ src/lib/libc/arch/mips/sys/__vfork14.S 2009/12/14 01:07:42	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: __vfork14.S,v 1.5 2003/08/07 16:42:17 agc Exp $	*/
+/*	$NetBSD: __vfork14.S,v 1.6 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,41 +25,39 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)Ovfork.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: __vfork14.S,v 1.5 2003/08/07 16:42:17 agc Exp $")
+	RCSID("from: @(#)Ovfork.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: __vfork14.S,v 1.6 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*
  * pid = vfork();
+ *
  * v1 == 0 in parent process, v1 == 1 in child process.
  * v0 == pid of child in parent, v0 == pid of parent in child.
  */
 LEAF(__vfork14)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(__vfork14)
 	.set	noreorder
 	.cpload	t9
 	.set	reorder
 #endif
 	li	v0, SYS___vfork14	# system call number for vfork
 	syscall
 	beq	a3, zero, 1f		# jump if no errors
-	la	t9, __cerror
+	PIC_TAILCALL(__cerror)
 	jr	t9
 :
 	beq	v1, zero, 2f		# parent process ?
 	move	v0, zero		# return zero in child
 :
-	j	ra
+	PIC_RETURN()
 END(__vfork14)

--- src/lib/libc/arch/mips/sys/syscall.S 2003/08/07 16:42:18	1.5
+++ src/lib/libc/arch/mips/sys/syscall.S 2009/12/14 01:07:42	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: syscall.S,v 1.5 2003/08/07 16:42:18 agc Exp $	*/
+/*	$NetBSD: syscall.S,v 1.6 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,18 +25,21 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)syscall.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: syscall.S,v 1.5 2003/08/07 16:42:18 agc Exp $")
+	RCSID("from: @(#)syscall.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: syscall.S,v 1.6 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 RSYSCALL(syscall)

--- src/lib/libc/arch/mips/sys/brk.S 2003/08/07 16:42:17	1.16
+++ src/lib/libc/arch/mips/sys/brk.S 2009/12/14 01:07:42	1.17

 @@ -1,14 +1,14 @@
-/*	$NetBSD: brk.S,v 1.16 2003/08/07 16:42:17 agc Exp $	*/
+/*	$NetBSD: brk.S,v 1.17 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,50 +25,49 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)brk.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: brk.S,v 1.16 2003/08/07 16:42:17 agc Exp $")
+	RCSID("from: @(#)brk.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: brk.S,v 1.17 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 	.globl	_C_LABEL(__minbrk)
 	.globl	_C_LABEL(__curbrk)
 	.globl	_C_LABEL(_end)
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(brk, _brk)
 #endif
 	.data
 _C_LABEL(__minbrk):
-	.word	_C_LABEL(_end)
+	PTR_WORD	_C_LABEL(_end)
 	.text
 LEAF(_brk)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(_brk)
-	.set	noreorder
+	PTR_LA		t0, _C_LABEL(__minbrk)
-	.cpload	t9
+	PTR_L		v0, 0(t0)
-	.set	reorder
+	bgeu		a0, v0, 1f
-#endif
+	move		a0, v0		# dont allow break < minbrk
 	lw	v0, _C_LABEL(__minbrk)
 	bgeu	a0, v0, 1f
 	move	a0, v0		# dont allow break < minbrk
 :
-	li	v0, SYS_break
+	li		v0, SYS_break
 	syscall
-	bne	a3, zero, 2f
+	bne		a3, zero, 2f
-	sw	a0, _C_LABEL(__curbrk)
+	PTR_S		a0, 0(t0)
-	move	v0, zero
+	move		v0, zero
-	j	ra
+	PIC_RETURN()
 :
-	la	t9, _C_LABEL(__cerror)
+	PIC_TAILCALL(__cerror)
 	jr	t9
 END(_brk)

--- src/lib/libc/arch/mips/sys/sbrk.S 2005/04/22 06:58:01	1.16
+++ src/lib/libc/arch/mips/sys/sbrk.S 2009/12/14 01:07:42	1.17

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sbrk.S,v 1.16 2005/04/22 06:58:01 simonb Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.17 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,47 +25,45 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)sbrk.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: sbrk.S,v 1.16 2005/04/22 06:58:01 simonb Exp $")
+	RCSID("from: @(#)sbrk.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: sbrk.S,v 1.17 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 	.globl	_C_LABEL(__curbrk)
 	.globl	_C_LABEL(_end)
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(sbrk, _sbrk)
 #endif
 	.data
 _C_LABEL(__curbrk):
-	.word	_C_LABEL(_end)
+	PTR_WORD	_C_LABEL(_end)
 	.text
 LEAF(_sbrk)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(_sbrk)
-	.set	noreorder
+	PTR_LA		t0, _C_LABEL(__curbrk)
-	.cpload	t9
+	PTR_L		v1, 0(t0)
-	.set	reorder
+	PTR_ADDU	a0, a0, v1	# compute current break
-#endif
+	SYSTRAP(break)
-	lw	v1, _C_LABEL(__curbrk)
+	bne		a3, zero, 1f
-	li	v0, SYS_break
+	move		v0, v1		# return old val of curbrk from above
-	addu	a0, a0, v1		# compute current break
+	PTR_S		a0, 0(t0)	# save current val of curbrk from above
-	syscall
+	PIC_RETURN()
 	bne	a3, zero, 1f
 	move	v0, v1			# return old val of curbrk from above
 	sw	a0, _C_LABEL(__curbrk)	# save current val of curbrk from above
 	j	ra
 :
-	la	t9, _C_LABEL(__cerror)
+	PIC_TAILCALL(__cerror)
 	jr	t9
 END(_sbrk)

--- src/lib/libc/arch/mips/sys/cerror.S 2003/08/07 16:42:17	1.13
+++ src/lib/libc/arch/mips/sys/cerror.S 2009/12/14 01:07:42	1.14

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cerror.S,v 1.13 2003/08/07 16:42:17 agc Exp $	*/
+/*	$NetBSD: cerror.S,v 1.14 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,50 +25,52 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)cerror.s	8.1 (Berkeley) 6/16/93")
+#if 0
-	ASMSTR("$NetBSD: cerror.S,v 1.13 2003/08/07 16:42:17 agc Exp $")
+	RCSID("from: @(#)cerror.s	8.1 (Berkeley) 6/16/93")
 #else
 	RCSID("$NetBSD: cerror.S,v 1.14 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #ifdef _REENTRANT
 	.globl	_C_LABEL(__errno)
 NESTED_NOPROFILE(__cerror, CALLFRAME_SIZ, ra)
 	PIC_PROLOGUE(__cerror, t9)
 	subu	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	sw	ra, CALLFRAME_RA(sp)
+	PIC_PROLOGUE(__cerror)
-	sw	v0, 12(sp)		# save errno value
+	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	PTR_S		ra, CALLFRAME_RA(sp)
-	la	t9, _C_LABEL(__errno)	# locate address of errno
+	INT_S		v0, CALLFRAME_S0(sp)	# save errno value
 	jalr	t9
 	SAVE_GP(CALLFRAME_GP)
 	lw	t0, 12(sp)
-	lw	ra, CALLFRAME_RA(sp)
+	PTR_LA		t9, _C_LABEL(__errno)	# locate address of errno
-	sw	t0, 0(v0)		# update errno value
+	jalr		t9
 	addiu	sp, sp, CALLFRAME_SIZ
-	li	v0, -1
+	INT_L		t0, CALLFRAME_S0(sp)
-	li	v1, -1
+	PTR_L		ra, CALLFRAME_RA(sp)
-	j	ra
+	INT_S		t0, 0(v0)		# update errno value
 	PTR_ADDU	sp, sp, CALLFRAME_SIZ
 	li		v0, -1
 	li		v1, -1
 	PIC_RETURN()
 END(__cerror)
 #else
 	.globl	_C_LABEL(errno)
 LEAF_NOPROFILE(__cerror)
-	.set	noreorder
+	PIC_PROLOGUE(__cerror)
-#ifdef __ABICALLS__
+	INT_S		v0, _C_LABEL(errno)
-	.cpload t9
+	li		v0, -1
-#endif
+	li		v1, -1
-	sw	v0, _C_LABEL(errno)
+	PIC_RETURN()
 	li	v0, -1
 	j	ra
 	li	v1, -1
 END(__cerror)
 #endif /* _REENTRANT */

--- src/lib/libc/arch/mips/sys/Attic/exect.S 2003/08/07 16:42:17	1.9
+++ src/lib/libc/arch/mips/sys/Attic/exect.S 2009/12/14 01:07:42	1.10

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exect.S,v 1.9 2003/08/07 16:42:17 agc Exp $	*/
+/*	$NetBSD: exect.S,v 1.10 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -24,31 +24,29 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)exect.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: exect.S,v 1.9 2003/08/07 16:42:17 agc Exp $")
+	RCSID("from: @(#)exect.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: exect.S,v 1.10 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 LEAF(exect)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(exect)
 	.set    noreorder
 	.cpload t9
 	.set    reorder
 #endif
 	li	v0, SYS_execve
 	syscall
 	bne	a3, zero, 1f
-	j	ra
+	PIC_RETURN()
 :
-	la      t9, _C_LABEL(__cerror)
+	PIC_TAILCALL(__cerror)
 	jr      t9
 END(exect)

--- src/lib/libc/arch/mips/sys/ptrace.S 2003/08/07 16:42:17	1.9
+++ src/lib/libc/arch/mips/sys/ptrace.S 2009/12/14 01:07:42	1.10

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptrace.S,v 1.9 2003/08/07 16:42:17 agc Exp $	*/
+/*	$NetBSD: ptrace.S,v 1.10 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,32 +25,30 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)ptrace.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: ptrace.S,v 1.9 2003/08/07 16:42:17 agc Exp $")
+	RCSID("from: @(#)ptrace.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: ptrace.S,v 1.10 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 LEAF(ptrace)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(ptrace)
-	.set    noreorder
+	INT_S	zero, _C_LABEL(errno)	/* BOGUS */
 	.cpload t9
-	.set    reorder
+	SYSTRAP(ptrace)
 #endif
 	sw	zero, _C_LABEL(errno)
 	li	v0, SYS_ptrace
 	syscall
 	bne	a3, zero, 1f
-	j	ra
+	PIC_RETURN()
 :
-	la	t9, _C_LABEL(__cerror)
+	PIC_TAILCALL(__cerror)
 	jr	t9
 END(ptrace)

--- src/lib/libc/arch/mips/sys/fork.S 2003/08/07 16:42:17	1.11
+++ src/lib/libc/arch/mips/sys/fork.S 2009/12/14 01:07:42	1.12

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fork.S,v 1.11 2003/08/07 16:42:17 agc Exp $	*/
+/*	$NetBSD: fork.S,v 1.12 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,34 +25,32 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)fork.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: fork.S,v 1.11 2003/08/07 16:42:17 agc Exp $")
+	RCSID("from: @(#)fork.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: fork.S,v 1.12 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 LEAF(__fork)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(__fork)
 	.set    noreorder
-	.cpload t9
+	SYSTRAP(fork)		# pid = fork()
 	.set    reorder
 #endif
 	li	v0, SYS_fork	# pid = fork()
 	syscall
 	bne	a3, zero, 2f
 	beq	v1, zero, 1f	# v1 == 0 in parent, 1 in child
 	move	v0, zero
 :
-	j	ra
+	PIC_RETURN()
 :
-	la	t9, _C_LABEL(__cerror)
+	PIC_TAILCALL(__cerror)
 	jr	t9
 END(__fork)

--- src/lib/libc/arch/mips/sys/pipe.S 2005/04/22 06:58:01	1.11
+++ src/lib/libc/arch/mips/sys/pipe.S 2009/12/14 01:07:42	1.12

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pipe.S,v 1.11 2005/04/22 06:58:01 simonb Exp $	*/
+/*	$NetBSD: pipe.S,v 1.12 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,38 +25,37 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)pipe.s	8.1 (Berkeley) 6/4/93")
+#if 0
-	ASMSTR("$NetBSD: pipe.S,v 1.11 2005/04/22 06:58:01 simonb Exp $")
+	RCSID("from: @(#)pipe.s	8.1 (Berkeley) 6/4/93")
 #else
 	RCSID("$NetBSD: pipe.S,v 1.12 2009/12/14 01:07:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(pipe, _pipe)
 #endif
 LEAF(_pipe)
-#ifdef __ABICALLS__
+	PIC_PROLOGUE(_pipe);
 	.set    noreorder
-	.cpload t9
+	SYSTRAP(pipe)	# pipe(fildes) int fildes[2];
 	.set    reorder
 #endif
 	li	v0, SYS_pipe	# pipe(fildes) int fildes[2];
 	syscall
 	bne	a3, zero, 1f
-	sw	v0, 0(a0)	# store the two file descriptors
+	INT_S	v0, 0(a0)	# store the two file descriptors
-	sw	v1, 4(a0)
+	INT_S	v1, 4(a0)
 	move	v0, zero
-	j	ra
+	PIC_RETURN()
 :
-	la	t9, _C_LABEL(__cerror)
+	PIC_TAILCALL(__cerror)
 	jr	t9
 END(_pipe)

--- src/lib/libc/arch/mips/sys/getcontext.S 2008/04/28 20:22:56	1.3
+++ src/lib/libc/arch/mips/sys/getcontext.S 2009/12/14 01:07:42	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: getcontext.S,v 1.4 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Klaus Klein.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,35 +20,37 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "SYS.h"
 #include "assym.h"
 #include <machine/mcontext.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	ASMSTR("$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:56 martin Exp $")
+	RCSID("$NetBSD: getcontext.S,v 1.4 2009/12/14 01:07:42 matt Exp $")
 #endif /* SYSLIBC_SCCS && !lint */
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(getcontext, _getcontext)
 #endif
 	.set reorder
 LEAF(_getcontext)
 	PIC_PROLOGUE(_getcontext)
 	SYSTRAP(getcontext)
-	bne	a3, zero, 1f
+	bne		a3, zero, 1f
 	REG_PROLOGUE
-	REG_S	zero, (_OFFSETOF_UC_GREGS + _REG_V0 * SZREG)(a0)
+	REG_S		zero, (_OFFSETOF_UC_GREGS + _REG_V0 * SZREG)(a0)
-	REG_S	ra, (_OFFSETOF_UC_GREGS + _REG_EPC * SZREG)(a0)
+	REG_S		ra, (_OFFSETOF_UC_GREGS + _REG_EPC * SZREG)(a0)
 	REG_EPILOGUE
-	j	ra
+	PIC_RETURN()
 :
-	PIC_CALL(__cerror, t9)
+	PIC_TAILCALL(__cerror)
 END(_getcontext)

--- src/lib/libc/compat/arch/mips/sys/compat___semctl.S 2008/04/28 20:22:58	1.2
+++ src/lib/libc/compat/arch/mips/sys/compat___semctl.S 2009/12/14 01:07:42	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
+/*	$NetBSD: compat___semctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -22,14 +22,18 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
 	RCSID("$NetBSD: compat___semctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 PSEUDO(__semctl,compat_14___semctl)

--- src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S 2008/04/28 20:22:58	1.2
+++ src/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S 2009/12/14 01:07:42	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
+/*	$NetBSD: compat___sigtramp1.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,26 +21,30 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
 	RCSID("$NetBSD: compat___sigtramp1.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 /*
  * The MIPS signal trampoline is invoked only to return from
  * the signal; the kernel calls the signal handler directly.
+ *
  * On entry, stack looks like:
+ *
  *	sp->	sigcontext structure
  */
 LEAF_NOPROFILE(__sigtramp_sigcontext_1)
 	move	a0, sp			/* address of sigcontext */
 	SYSTRAP(compat_16___sigreturn14) /* and do sigreturn */
 	move	a0, v0			/* exit with errno */
 	SYSTRAP(exit)			/* if sigreturn fails */

--- src/lib/libc/compat/arch/mips/sys/compat_msgctl.S 2008/04/28 20:22:58	1.2
+++ src/lib/libc/compat/arch/mips/sys/compat_msgctl.S 2009/12/14 01:07:42	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
+/*	$NetBSD: compat_msgctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -22,17 +22,21 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
 	RCSID("$NetBSD: compat_msgctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 WARN_REFERENCES(msgctl, \
     "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
 PSEUDO(msgctl,compat_14_msgctl)

--- src/lib/libc/compat/arch/mips/sys/compat_shmctl.S 2008/04/28 20:22:58	1.2
+++ src/lib/libc/compat/arch/mips/sys/compat_shmctl.S 2009/12/14 01:07:42	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
+/*	$NetBSD: compat_shmctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -22,17 +22,21 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
 	RCSID("$NetBSD: compat_shmctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 WARN_REFERENCES(shmctl, \
     "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
 PSEUDO(shmctl,compat_14_shmctl)

--- src/lib/libc/compat/arch/mips/sys/compat_sigaction.S 2008/04/28 20:22:58	1.2
+++ src/lib/libc/compat/arch/mips/sys/compat_sigaction.S 2009/12/14 01:07:42	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
+/*	$NetBSD: compat_sigaction.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -22,17 +22,21 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "SYS.h"
 #if defined(LIBC_SCCS) && !defined(lint)
 	RCSID("$NetBSD: compat_sigaction.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 WARN_REFERENCES(sigaction, \
     "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
 PSEUDO(sigaction,compat_13_sigaction13)

--- src/lib/libc/softfloat/softfloat-for-gcc.h 2004/09/26 21:13:27	1.7
+++ src/lib/libc/softfloat/softfloat-for-gcc.h 2009/12/14 01:07:42	1.8

 @@ -1,58 +1,169 @@
-/* $NetBSD: softfloat-for-gcc.h,v 1.7 2004/09/26 21:13:27 jmmv Exp $ */
+/* $NetBSD: softfloat-for-gcc.h,v 1.8 2009/12/14 01:07:42 matt Exp $ */
 /*
  * Move private identifiers with external linkage into implementation
  * namespace.  -- Klaus Klein <kleink@NetBSD.org>, May 5, 1999
  */
 #define float_exception_flags	_softfloat_float_exception_flags
 #define float_exception_mask	_softfloat_float_exception_mask
 #define float_rounding_mode	_softfloat_float_rounding_mode
 #define float_raise		_softfloat_float_raise
 /* The following batch are called by GCC through wrappers */
 #define float32_eq		_softfloat_float32_eq
 #define float32_le		_softfloat_float32_le
 #define float32_lt		_softfloat_float32_lt
 #define float64_eq		_softfloat_float64_eq
 #define float64_le		_softfloat_float64_le
 #define float64_lt		_softfloat_float64_lt
 #define float128_eq		_softfloat_float128_eq
 #define float128_le		_softfloat_float128_le
 #define float128_lt		_softfloat_float128_lt
 /*
  * Macros to define functions with the GCC expected names
  */
 #define float32_add			__addsf3
 #define float64_add			__adddf3
 #define floatx80_add			__addxf3
 #define float128_add			__addtf3
 #define float32_sub			__subsf3
 #define float64_sub			__subdf3
 #define floatx80_sub			__subxf3
 #define float128_sub			__subtf3
 #define float32_mul			__mulsf3
 #define float64_mul			__muldf3
 #define floatx80_mul			__mulxf3
 #define float128_mul			__multf3
 #define float32_div			__divsf3
 #define float64_div			__divdf3
 #define floatx80_div			__divxf3
 #define float128_div			__divtf3
 #if 0
 #define float32_neg			__negsf2
 #define float64_neg			__negdf2
 #define floatx80_neg			__negxf2
 #define float128_neg			__negtf2
 #endif
 #define int32_to_float32		__floatsisf
 #define int32_to_float64		__floatsidf
 #define int32_to_floatx80		__floatsixf
 #define int32_to_float128		__floatsitf
 #define int64_to_float32		__floatdisf
 #define int64_to_float64		__floatdidf
 #define int64_to_floatx80		__floatdixf
 #define int64_to_float128		__floatditf
 #define int128_to_float32		__floattisf
 #define int128_to_float64		__floattidf
 #define int128_to_floatx80		__floattixf
 #define int128_to_float128		__floattitf
 #define uint32_to_float32		__floatunsisf
 #define uint32_to_float64		__floatunsidf
 #define uint32_to_floatx80		__floatunsixf
 #define uint32_to_float128		__floatunsitf
 #define uint64_to_float32		__floatundisf
 #define uint64_to_float64		__floatundidf
 #define uint64_to_floatx80		__floatundixf
 #define uint64_to_float128		__floatunditf
 #define uint128_to_float32		__floatuntisf
 #define uint128_to_float64		__floatuntidf
 #define uint128_to_floatx80		__floatuntixf
 #define uint128_to_float128		__floatuntitf
 #define float32_to_int32_round_to_zero	__fixsfsi
 #define float64_to_int32_round_to_zero	__fixdfsi
 #define floatx80_to_int32_round_to_zero __fixxfsi
 #define float128_to_int32_round_to_zero __fixtfsi
 #define float32_to_int64_round_to_zero	__fixsfdi
 #define float64_to_int64_round_to_zero	__fixdfdi
-#define floatx80_to_int64_round_to_zero __fixxfdi
+#define floatx80_to_int64_round_to_zero	__fixxfdi
 #define float128_to_int64_round_to_zero	__fixtfdi
 #define float32_to_int128_round_to_zero __fixsfti
 #define float64_to_int128_round_to_zero __fixdfti
 #define floatx80_to_int128_round_to_zero __fixxfti
 #define float128_to_int128_round_to_zero __fixtfti
 #define float32_to_uint32_round_to_zero	__fixunssfsi
 #define float64_to_uint32_round_to_zero	__fixunsdfsi
 #define floatx80_to_uint32_round_to_zero	__fixunsxfsi
 #define float128_to_uint32_round_to_zero	__fixunstfsi
 #define float32_to_uint64_round_to_zero	__fixunssfdi
 #define float64_to_uint64_round_to_zero	__fixunsdfdi
 #define floatx80_to_uint64_round_to_zero	__fixunsxfdi
 #define float128_to_uint64_round_to_zero	__fixunstfdi
 #define float32_to_uint128_round_to_zero	__fixunssfti
 #define float64_to_uint128_round_to_zero	__fixunsdfti
 #define floatx80_to_uint128_round_to_zero	__fixunsxfti
 #define float128_to_uint128_round_to_zero	__fixunstfti
 #define float32_to_float64		__extendsfdf2
 #define float64_to_floatx80		__extenddfxf2
 #define float32_to_floatx80		__extendsfxf2
-#define float64_to_float32		__truncdfsf2
+#define float32_to_float128		__extendsftf2
 #define float64_to_floatx80		__extenddfxf2
 #define float64_to_float128		__extenddftf2
 #define float128_to_float64		__trunctfdf2
 #define floatx80_to_float64		__truncxfdf2
 #define float128_to_float32		__trunctfsf2
 #define floatx80_to_float32		__truncxfsf2
 #define float64_to_float32		__truncdfsf2
-#define floatx80_lt			__ltxf2
+#if 0
 #define float32_cmp			__cmpsf2
 #define float32_unord			__unordsf2
 #define float32_eq			__eqsf2
 #define float32_ne			__nesf2
 #define float32_ge			__gesf2
 #define float32_lt			__ltsf2
 #define float32_le			__lesf2
 #define float32_gt			__gtsf2
 #endif
 #if 0
 #define float64_cmp			__cmpdf2
 #define float64_unord			__unorddf2
 #define float64_eq			__eqdf2
 #define float64_ne			__nedf2
 #define float64_ge			__gedf2
 #define float64_lt			__ltdf2
 #define float64_le			__ledf2
 #define float64_gt			__gtdf2
 #endif
 /* XXX not in libgcc */
 #if 1
 #define floatx80_cmp			__cmpxf2
 #define floatx80_unord			__unordxf2
 #define floatx80_eq			__eqxf2
 #define floatx80_ne			__nexf2
 #define floatx80_ge			__gexf2
 #define floatx80_lt			__ltxf2
 #define floatx80_le			__lexf2
 #define floatx80_gt			__gtxf2
 #endif
 #if 0
 #define float128_cmp			__cmptf2
 #define float128_unord			__unordtf2
 #define float128_eq			__eqtf2
 #define float128_ne			__netf2
 #define float128_ge			__getf2
 #define float128_lt			__lttf2
 #define float128_le			__letf2
 #define float128_gt			__gttf2
 #endif