 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic_add.S,v 1.4 2008/05/25 15:56:11 chs Exp $	*/
+/*	$NetBSD: atomic_add.S,v 1.5 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 2007 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.
 @@ -25,41 +25,41 @@
  * 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 "atomic_op_asm.h"
 	.text
 	.align	2
 ENTRY(_atomic_add_32)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-	movl	%sp@(8), %d0
+	movl	8(%sp), %d0
 	addl	%d0, %a0@
 	rts
 ATOMIC_OP_ALIAS(atomic_add_32,_atomic_add_32)
 ATOMIC_OP_ALIAS(atomic_add_int,_atomic_add_32)
 STRONG_ALIAS(_atomic_add_int,_atomic_add_32)
 ATOMIC_OP_ALIAS(atomic_add_long,_atomic_add_32)
 STRONG_ALIAS(_atomic_add_long,_atomic_add_32)
 ATOMIC_OP_ALIAS(atomic_add_ptr,_atomic_add_32)
 STRONG_ALIAS(_atomic_add_ptr,_atomic_add_32)
 ENTRY(_atomic_add_32_nv)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-:	movl	%a0@, %d0
+:	movl	(%a0), %d0
 	movl	%d0, %d1
-	addl	%sp@(8), %d0
+	addl	8(%sp), %d0
 	casl	%d1, %d0, %a0@
 	bne	1b
 	movl	%d0, %a0	/* pointers return also in %a0 */
 	rts
 ATOMIC_OP_ALIAS(atomic_add_32_nv,_atomic_add_32_nv)
 ATOMIC_OP_ALIAS(atomic_add_int_nv,_atomic_add_32_nv)
 STRONG_ALIAS(_atomic_add_int_nv,_atomic_add_32_nv)
 ATOMIC_OP_ALIAS(atomic_add_long_nv,_atomic_add_32_nv)
 STRONG_ALIAS(_atomic_add_long_nv,_atomic_add_32_nv)
 ATOMIC_OP_ALIAS(atomic_add_ptr_nv,_atomic_add_32_nv)
 STRONG_ALIAS(_atomic_add_ptr_nv,_atomic_add_32_nv)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic_dec.S,v 1.4 2008/05/25 15:56:11 chs Exp $	*/
+/*	$NetBSD: atomic_dec.S,v 1.5 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 2007 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.
 @@ -24,40 +24,40 @@
  * 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 "atomic_op_asm.h"
 	.text
 ENTRY(_atomic_dec_32)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
 	subql	#1, %a0@
 	rts
 ATOMIC_OP_ALIAS(atomic_dec_32,_atomic_dec_32)
 ATOMIC_OP_ALIAS(atomic_dec_uint,_atomic_dec_32)
 STRONG_ALIAS(_atomic_dec_uint,_atomic_dec_32)
 ATOMIC_OP_ALIAS(atomic_dec_ulong,_atomic_dec_32)
 STRONG_ALIAS(_atomic_dec_ulong,_atomic_dec_32)
 ATOMIC_OP_ALIAS(atomic_dec_ptr,_atomic_dec_32)
 STRONG_ALIAS(_atomic_dec_ptr,_atomic_dec_32)
 ENTRY(_atomic_dec_32_nv)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-:	movl	%a0@, %d0
+:	movl	(%a0), %d0
 	movl	%d0, %d1
 	subql	#1, %d0
 	casl	%d1, %d0, %a0@
 	bne	1b
 	movl	%d0, %a0	/* pointers return also in %a0 */
 	rts
 ATOMIC_OP_ALIAS(atomic_dec_32_nv,_atomic_dec_32_nv)
 ATOMIC_OP_ALIAS(atomic_dec_uint_nv,_atomic_dec_32_nv)
 STRONG_ALIAS(_atomic_dec_uint_nv,_atomic_dec_32_nv)
 ATOMIC_OP_ALIAS(atomic_dec_ulong_nv,_atomic_dec_32_nv)
 STRONG_ALIAS(_atomic_dec_ulong_nv,_atomic_dec_32_nv)
 ATOMIC_OP_ALIAS(atomic_dec_ptr_nv,_atomic_dec_32_nv)
 STRONG_ALIAS(_atomic_dec_ptr_nv,_atomic_dec_32_nv)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic_inc.S,v 1.4 2008/05/25 15:56:11 chs Exp $	*/
+/*	$NetBSD: atomic_inc.S,v 1.5 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 2007 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.
 @@ -24,40 +24,40 @@
  * 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 "atomic_op_asm.h"
 	.text
 ENTRY(_atomic_inc_32)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
 	addql	#1, %a0@
 	rts
 ATOMIC_OP_ALIAS(atomic_inc_32,_atomic_inc_32)
 ATOMIC_OP_ALIAS(atomic_inc_uint,_atomic_inc_32)
 STRONG_ALIAS(_atomic_inc_uint,_atomic_inc_32)
 ATOMIC_OP_ALIAS(atomic_inc_ulong,_atomic_inc_32)
 STRONG_ALIAS(_atomic_inc_ulong,_atomic_inc_32)
 ATOMIC_OP_ALIAS(atomic_inc_ptr,_atomic_inc_32)
 STRONG_ALIAS(_atomic_inc_ptr,_atomic_inc_32)
 ENTRY(_atomic_inc_32_nv)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-:	movl	%a0@, %d0
+:	movl	(%a0), %d0
 	movl	%d0, %d1
 	addql	#1, %d0
 	casl	%d1, %d0, %a0@
 	bne	1b
 	movl	%d0, %a0	/* pointers return also in %a0 */
 	rts
 ATOMIC_OP_ALIAS(atomic_inc_32_nv,_atomic_inc_32_nv)
 ATOMIC_OP_ALIAS(atomic_inc_uint_nv,_atomic_inc_32_nv)
 STRONG_ALIAS(_atomic_inc_uint_nv,_atomic_inc_32_nv)
 ATOMIC_OP_ALIAS(atomic_inc_ulong_nv,_atomic_inc_32_nv)
 STRONG_ALIAS(_atomic_inc_ulong_nv,_atomic_inc_32_nv)
 ATOMIC_OP_ALIAS(atomic_inc_ptr_nv,_atomic_inc_32_nv)
 STRONG_ALIAS(_atomic_inc_ptr_nv,_atomic_inc_32_nv)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic_swap.S,v 1.4 2008/05/25 15:56:11 chs Exp $	*/
+/*	$NetBSD: atomic_swap.S,v 1.5 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 2007 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.
 @@ -24,28 +24,28 @@
  * 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 "atomic_op_asm.h"
 	.text
 ENTRY(_atomic_swap_32)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-:	movl	%a0@, %d0
+:	movl	(%a0), %d0
-	movl	%sp@(8), %d1
+	movl	8(%sp), %d1
 	casl	%d0, %d1, %a0@
 	bne	1b
 	/* %d0 now contains the old value */
 	movl	%d0, %a0	/* pointers return also in %a0 */
 	rts
 ATOMIC_OP_ALIAS(atomic_swap_32,_atomic_swap_32)
 ATOMIC_OP_ALIAS(atomic_swap_uint,_atomic_swap_32)
 STRONG_ALIAS(_atomic_swap_uint,_atomic_swap_32)
 ATOMIC_OP_ALIAS(atomic_swap_ulong,_atomic_swap_32)
 STRONG_ALIAS(_atomic_swap_ulong,_atomic_swap_32)
 ATOMIC_OP_ALIAS(atomic_swap_ptr,_atomic_swap_32)
 STRONG_ALIAS(_atomic_swap_ptr,_atomic_swap_32)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic_and.S,v 1.6 2008/05/25 15:56:11 chs Exp $	*/
+/*	$NetBSD: atomic_and.S,v 1.7 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 2007 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.
 @@ -24,40 +24,40 @@
  * 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 "atomic_op_asm.h"
 	.text
 ENTRY(_atomic_and_32)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-	movl	%sp@(8), %d0
+	movl	8(%sp), %d0
 	andl	%d0, %a0@
 	rts
 ATOMIC_OP_ALIAS(atomic_and_32,_atomic_and_32)
 ATOMIC_OP_ALIAS(atomic_and_uint,_atomic_and_32)
 STRONG_ALIAS(_atomic_and_uint,_atomic_and_32)
 ATOMIC_OP_ALIAS(atomic_and_ulong,_atomic_and_32)
 STRONG_ALIAS(_atomic_and_ulong,_atomic_and_32)
 ATOMIC_OP_ALIAS(atomic_and_ptr,_atomic_and_32)
 STRONG_ALIAS(_atomic_and_ptr,_atomic_and_32)
 ENTRY(_atomic_and_32_nv)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-:	movl	%a0@, %d0
+:	movl	(%a0), %d0
 	movl	%d0, %d1
-	andl	%sp@(8), %d0
+	andl	8(%sp), %d0
 	casl	%d1, %d0, %a0@
 	bne	1b
 	rts
 ATOMIC_OP_ALIAS(atomic_and_32_nv,_atomic_and_32_nv)
 ATOMIC_OP_ALIAS(atomic_and_uint_nv,_atomic_and_32_nv)
 STRONG_ALIAS(_atomic_and_uint_nv,_atomic_and_32_nv)
 ATOMIC_OP_ALIAS(atomic_and_ulong_nv,_atomic_and_32_nv)
 STRONG_ALIAS(_atomic_and_ulong_nv,_atomic_and_32_nv)
 ATOMIC_OP_ALIAS(atomic_and_ptr_nv,_atomic_and_32_nv)
 STRONG_ALIAS(_atomic_and_ptr_nv,_atomic_and_32_nv)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic_or.S,v 1.6 2008/05/25 15:56:11 chs Exp $	*/
+/*	$NetBSD: atomic_or.S,v 1.7 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 2007 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.
 @@ -24,40 +24,40 @@
  * 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 "atomic_op_asm.h"
 	.text
 ENTRY(_atomic_or_32)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-	movl	%sp@(8), %d0
+	movl	8(%sp), %d0
 	orl	%d0, %a0@
 	rts
 ATOMIC_OP_ALIAS(atomic_or_32,_atomic_or_32)
 ATOMIC_OP_ALIAS(atomic_or_uint,_atomic_or_32)
 STRONG_ALIAS(_atomic_or_uint,_atomic_or_32)
 ATOMIC_OP_ALIAS(atomic_or_ulong,_atomic_or_32)
 STRONG_ALIAS(_atomic_or_ulong,_atomic_or_32)
 ATOMIC_OP_ALIAS(atomic_or_ptr,_atomic_or_32)
 STRONG_ALIAS(_atomic_or_ptr,_atomic_or_32)
 ENTRY(_atomic_or_32_nv)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-:	movl	%a0@, %d0
+:	movl	(%a0), %d0
 	movl	%d0, %d1
-	orl	%sp@(8), %d0
+	orl	8(%sp), %d0
 	casl	%d1, %d0, %a0@
 	bne	1b
 	rts
 ATOMIC_OP_ALIAS(atomic_or_32_nv,_atomic_or_32_nv)
 ATOMIC_OP_ALIAS(atomic_or_uint_nv,_atomic_or_32_nv)
 STRONG_ALIAS(_atomic_or_uint_nv,_atomic_or_32_nv)
 ATOMIC_OP_ALIAS(atomic_or_ulong_nv,_atomic_or_32_nv)
 STRONG_ALIAS(_atomic_or_ulong_nv,_atomic_or_32_nv)
 ATOMIC_OP_ALIAS(atomic_or_ptr_nv,_atomic_or_32_nv)
 STRONG_ALIAS(_atomic_or_ptr_nv,_atomic_or_32_nv)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic_cas.S,v 1.5 2008/05/25 15:56:11 chs Exp $	*/
+/*	$NetBSD: atomic_cas.S,v 1.6 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 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.
 @@ -24,29 +24,29 @@
  * 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 "atomic_op_asm.h"
 	.text
 ENTRY(_atomic_cas_32)
-	movl	%sp@(4), %a0
+	movl	4(%sp), %a0
-	movl	%sp@(8), %d0
+	movl	8(%sp), %d0
-	movl	%sp@(12), %d1
+	movl	12(%sp), %d1
 	casl	%d0, %d1, %a0@
 	/* %d0 now contains the old value */
 	movl	%d0, %a0	/* pointers return also in %a0 */
 	rts
 ATOMIC_OP_ALIAS(atomic_cas_32,_atomic_cas_32)
 ATOMIC_OP_ALIAS(atomic_cas_uint,_atomic_cas_32)
 STRONG_ALIAS(_atomic_cas_uint,_atomic_cas_32)
 ATOMIC_OP_ALIAS(atomic_cas_ulong,_atomic_cas_32)
 STRONG_ALIAS(_atomic_cas_ulong,_atomic_cas_32)
 ATOMIC_OP_ALIAS(atomic_cas_ptr,_atomic_cas_32)
 STRONG_ALIAS(_atomic_cas_ptr,_atomic_cas_32)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atomic_cas_68000.S,v 1.3 2008/05/25 15:56:11 chs Exp $	*/
+/*	$NetBSD: atomic_cas_68000.S,v 1.4 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Steve C. Woodford.
+ *
  * 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,23 +27,23 @@
  * 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/ras.h>
 #include "atomic_op_asm.h"
 	.text
 ENTRY(_atomic_cas_up)
 	.hidden	_C_LABEL(_atomic_cas_up)
-	movl	%sp@(4), %a0		/* Fetch ptr */
+	movl	4(%sp), %a0		/* Fetch ptr */
 RAS_START_ASM_HIDDEN(_atomic_cas)
-	movl	%a0@, %d0		/* d0 = *ptr */
+	movl	(%a0), %d0		/* d0 = *ptr */
-	cmpl	%sp@(8), %d0		/* Same as old? */
+	cmpl	8(%sp), %d0		/* Same as old? */
 	jne	1f			/* Nope */
-	movl	%sp@(12), %a0@		/* *ptr = new */
+	movl	12(%sp), (%a0)		/* *ptr = new */
 RAS_END_ASM_HIDDEN(_atomic_cas)
 :	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bswap16.S,v 1.2 2007/09/19 20:31:34 he Exp $	*/
+/*	$NetBSD: bswap16.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*
  * Copyright (C) 1996 Scott Reynolds.  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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -23,16 +23,16 @@
  * 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>
 #if defined(_KERNEL) || defined(_STANDALONE)
 _ENTRY(_C_LABEL(bswap16))
 #else /* defined(_KERNEL) || defined(_STANDALONE) */
 _ENTRY(_C_LABEL(__bswap16))
 #endif /* defined(_KERNEL) || defined(_STANDALONE) */
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
 	rolw	#8,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bswap32.S,v 1.2 2007/09/19 20:31:34 he Exp $	*/
+/*	$NetBSD: bswap32.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*
  * Copyright (C) 1996 Scott Reynolds.  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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -23,18 +23,18 @@
  * 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>
 #if defined(_KERNEL) || defined(_STANDALONE)
 _ENTRY(_C_LABEL(bswap32))
 #else /* defined(_KERNEL) || defined(_STANDALONE) */
 _ENTRY(_C_LABEL(__bswap32))
 #endif /* defined(_KERNEL) || defined(_STANDALONE) */
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
 	rolw	#8,%d0
 	swap	%d0
 	rolw	#8,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: divsi3.S,v 1.2 2006/01/05 22:33:34 he Exp $	*/
+/*	$NetBSD: divsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,39 +29,39 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)divsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: divsi3.S,v 1.2 2006/01/05 22:33:34 he Exp $")
+	RCSID("$NetBSD: divsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* int / int */
 ENTRY(__divsi3)
 #ifndef __mc68010__
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
-	divsl	%sp@(8),%d0
+	divsl	8(%sp),%d0
 	rts
 #else
 | NB: this requires that __udivsi3 preserve %a0:
-	movel	%sp@(4), %d1	| load the dividend
+	movel	4(%sp), %d1	| load the dividend
 	bpl	1f
-	negl	%sp@(4)		| store abs(dividend)
+	negl	4(%sp)		| store abs(dividend)
-:	movel	%sp@(8), %d0	| load the divisor
+:	movel	8(%sp), %d0	| load the divisor
 	bpl	2f
-	negl	%sp@(8)		| store abs(divisor)
+	negl	8(%sp)		| store abs(divisor)
 :	eorl	%d1, %d0
 	bpl	3f		| branch if sgn(divisor) == sgn(dividend)
-	movel	%sp@+, %a0	| pop return address
+	movel	(%sp)+, %a0	| pop return address
-	pea	%pc@(Lret)	| push our return address
+	pea	(Lret,%pc)	| push our return address
 :	jmp	_C_LABEL(__udivsi3)
 Lret:	negl	%d0		| negate quotient
-	jmp	%a0@
+	jmp	(%a0)
 #endif /* __mc68010__ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mulsi3.S,v 1.2 2006/01/05 22:33:34 he Exp $	*/
+/*	$NetBSD: mulsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,40 +29,40 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)mulsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: mulsi3.S,v 1.2 2006/01/05 22:33:34 he Exp $")
+	RCSID("$NetBSD: mulsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* int * int */
 ENTRY(__mulsi3)
 #ifndef __mc68010__
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
-	mulsl	%sp@(8),%d0
+	mulsl	8(%sp),%d0
 #else
 | NB: this requires that __udivsi3 preserve %a0 and return
 | the modulus in %d1:
-	movew	%sp@(6), %d0
+	movew	6(%sp), %d0
 	movel	%d0, %a0	| save B
-	muluw	%sp@(8), %d0	| %d0 holds B * C
+	muluw	8(%sp), %d0	| %d0 holds B * C
-	movew	%sp@(10), %d1
+	movew	10(%sp), %d1
 	movel	%d1, %a1	| save D
-	muluw	%sp@(4), %d1	| %d1 holds A * D
+	muluw	4(%sp), %d1	| %d1 holds A * D
 	addw	%d1, %d0	| %d0 holds (B * C) + (A * D)
 	swap	%d0
 	clrw	%d0		| %d0 holds ((B * C) + (A * D)) << 16
 	exg	%a0, %d0	| restore B
 	movel	%a1, %d1	| restore D
 	muluw	%d1, %d0	| %d0 holds B * D
 	addl	%a0, %d0	| final result
 #endif /* __mc68010__ */
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: udivsi3.S,v 1.2 2006/01/05 22:33:34 he Exp $	*/
+/*	$NetBSD: udivsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,40 +29,40 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)udivsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: udivsi3.S,v 1.2 2006/01/05 22:33:34 he Exp $")
+	RCSID("$NetBSD: udivsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* unsigned / unsigned */
 ENTRY(__udivsi3)
 #ifndef __mc68010__
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
-	divul	%sp@(8),%d0
+	divul	8(%sp),%d0
 	rts
 #else
-	movel	%d2, %sp@-	| save %d2
+	movel	%d2, -(%sp)	| save %d2
-	movel	%sp@(12), %d0	| load divisor
+	movel	12(%sp), %d0	| load divisor
-	movel	%sp@(8), %d1	| load dividend
+	movel	8(%sp), %d1	| load dividend
 | first, we divide the divisor and dividend by two until
 | the divisor fits into 16 bits:
 :	cmpil	#0x10000, %d0
 	bcs	2f
 	lsrl	#1, %d0
 	lsrl	#1, %d1
 	bra	1b
 :
 | now we can do the divide.  to avoid overflow, we have to
 | do the divide in two parts, high and low, and add the
 | results together:
 @@ -90,37 +90,37 @@ ENTRY(__udivsi3)
 | quotient.  however, it might be one too big.
+|
 | to adjust this quotient, we multiply it by the original
 | divisor and subtract the result from the original dividend.
 | if the result is nonnegative, our guessed quotient was
 | correct, and the subtraction result is our remainder.
 | if the result is negative, our guessed quotient was one
 | too big, and the subtraction result plus the original
 | divisor is our remainder.
+|
 | as in mulsi3, we have to do the multiply in stages to avoid
 | overflow:
-	movel	%sp@(12), %d2	| load divisor
+	movel	12(%sp), %d2	| load divisor
 	swap	%d2
 	movel	%d0, %d1
 	muluw	%d2, %d1	| high(divisor) * low(guess)
 	moveal	%d1, %a1	| save high(divisor) * low(guess)
 	swap	%d2
 	movel	%d0, %d1
 	swap	%d1
 	muluw	%d2, %d1	| low(divisor) * high(guess)
 	addl	%a1, %d1
 	swap	%d1
 	clrw	%d1		| %d1 = finished high multiply result
 	moveal	%d2, %a1	| save original divisor
 	muluw	%d0, %d2	| low(guess) * low(divisor)
 	addl	%d1, %d2	| %d2 = guess * divisor
-	movel	%sp@(8), %d1	| load original dividend
+	movel	8(%sp), %d1	| load original dividend
 	subl	%d2, %d1	| subtract
 	bcc	3f
 	subql	#1, %d0		| adjust quotient
 	addl	%a1, %d1	| adjust remainder
-:	movel	%sp@+, %d2	| restore %d2
+:	movel	(%sp)+, %d2	| restore %d2
 	rts
 #endif /* __mc68010__ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: umodsi3.S,v 1.2 2006/01/05 22:33:34 he Exp $	*/
+/*	$NetBSD: umodsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,31 +29,31 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)umodsi3.s	5.1 (Berkeley) 6/7/90")(
 #else
-	RCSID("$NetBSD: umodsi3.S,v 1.2 2006/01/05 22:33:34 he Exp $")
+	RCSID("$NetBSD: umodsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* unsigned % unsigned */
 ENTRY(__umodsi3)
 #ifndef __mc68010__
-	movel	%sp@(4),%d1
+	movel	4(%sp),%d1
-	divull	%sp@(8),%d0:%d1
+	divull	8(%sp),%d0:%d1
 	rts
 #else
 | NB: this requires that __udivsi3 preserve the %a0
 | register, and that it returns the modulus in %d1:
-	movel	%sp@+, %a0	| pop the return address
+	movel	(%sp)+, %a0	| pop the return address
 	jsr	_C_LABEL(__udivsi3)
 	movel	%d1, %d0	| move the modulus into %d0
-	jmp	%a0@		| return
+	jmp	(%a0)		| return
 #endif /* __mc68010__ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bswap64.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: bswap64.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*
  * Copyright (C) 1996 Scott Reynolds.  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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -19,22 +19,22 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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>
 ENTRY(bswap64)
-	movl	%sp@(4),%d1
+	movl	4(%sp),%d1
-	movl	%sp@(8),%d0
+	movl	8(%sp),%d0
 	rolw	#8,%d1
 	rolw	#8,%d0
 	swap	%d1
 	swap	%d0
 	rolw	#8,%d0
 	rolw	#8,%d1
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: modsi3.S,v 1.3 2006/01/13 16:07:59 christos Exp $	*/
+/*	$NetBSD: modsi3.S,v 1.4 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,40 +29,40 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)modsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: modsi3.S,v 1.3 2006/01/13 16:07:59 christos Exp $")
+	RCSID("$NetBSD: modsi3.S,v 1.4 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* int % int */
 ENTRY(__modsi3)
 #ifndef __mc68010__
-	movel	%sp@(4),%d1
+	movel	4(%sp),%d1
-	divsll	%sp@(8),%d0:%d1
+	divsll	8(%sp),%d0:%d1
 	rts
 #else
 | NB: this requires that __udivsi3 preserve %a0 and return
 | the modulus in %d1:
-	movel	%sp@+, %a0	| pop return address
+	movel	(%sp)+, %a0	| pop return address
-	movel	%sp@(4), %d1	| load the divisor
+	movel	4(%sp), %d1	| load the divisor
 	bpl	1f
-	negl	%sp@(4)		| store abs(divisor)
+	negl	4(%sp)		| store abs(divisor)
-:	movel	%sp@, %d0	| load the dividend
+:	movel	(%sp), %d0	| load the dividend
-	pea	%pc@(Lret)	| push our return address
+	pea	(Lret,%pc)	| push our return address
 	bpl	2f
-	negl	%sp@(4)		| store abs(dividend)
+	negl	4(%sp)		| store abs(dividend)
-	subql	#2, %sp@	| adjust return address
+	subql	#2, (%sp)	| adjust return address
 :	jmp	_C_LABEL(__udivsi3)
 	negl	%d1		| negate modulus
 Lret:	movl	%d1, %d0	| move modulus into %d0
-	jmp	%a0@
+	jmp	(%a0)
 #endif /* __mc68010__ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: htonl.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: htonl.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,22 +29,22 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)htonl.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: htonl.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: htonl.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* netorder = htonl(hostorder) */
 ENTRY(htonl)
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: htons.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: htons.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,23 +29,23 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)htons.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: htons.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: htons.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* hostorder = htons(netorder) */
 ENTRY(htons)
 	clrl	%d0
-	movw	%sp@(6),%d0
+	movw	6(%sp),%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntohl.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: ntohl.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,22 +29,22 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)ntohl.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: ntohl.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: ntohl.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* hostorder = ntohl(netorder) */
 ENTRY(ntohl)
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntohs.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: ntohs.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,23 +29,23 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)ntohs.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: ntohs.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: ntohs.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* hostorder = ntohs(netorder) */
 ENTRY(ntohs)
 	clrl	%d0
-	movw	%sp@(6),%d0
+	movw	6(%sp),%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcmp.S,v 1.2 2008/04/28 20:22:52 martin Exp $	*/
+/*	$NetBSD: bcmp.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * 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.
 @@ -58,110 +58,110 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)bcmp.s 5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: bcmp.S,v 1.2 2008/04/28 20:22:52 martin Exp $")
+	RCSID("$NetBSD: bcmp.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(bcmp)
-	movl	%sp@(4),%a0		| string 1
+	movl	4(%sp),%a0		| string 1
-	movl	%sp@(8),%a1		| string 2
+	movl	8(%sp),%a1		| string 2
-	movl	%sp@(12),%d1		| length
+	movl	12(%sp),%d1		| length
 	/*
 	 * It isn't worth the overhead of aligning to {long}word boundries
 	 * if the string is too short.
 	 */
 	cmpl	#8,%d1
 	jlt	Lbcbyte
 #ifdef	__mc68010__
 	/*
 	 * The 68010 cannot access a word or long on an odd boundary,
 	 * period.  If the source and the destination addresses aren't
 	 * of the same evenness, we're forced to do a bytewise compare.
 	 */
 	movl	%a0,%d0
 	addl	%a1,%d0
 	btst	#0,%d0
 	jne	Lbcbyte
 #endif	/* __mc68010__ */
 	/* word align */
 	movl	%a0,%d0
 	btst	#0,%d0
 	jeq	Lbcalgndw
-	cmpmb	%a0@+,%a1@+
+	cmpmb	(%a0)+,(%a1)+
 	jne	Lbcnoteq
 	subql	#1,%d1
 Lbcalgndw:
 	/* long word align */
 	btst	#1,%d0
 	jeq	Lbcalgndl
-	cmpmw	%a0@+,%a1@+
+	cmpmw	(%a0)+,(%a1)+
 	jne	Lbcnoteq
 	subql	#2,%d1
 Lbcalgndl:
 	/* compare by 8 longwords */
 	movl	%d1,%d0
 	lsrl	#5,%d0			| cnt = len / 32
 	jeq	Lbclong			| if (cnt)
 	andl	#31,%d1			|	len %= 32
 	subql	#1,%d0			|	set up for dbf
 Lbc32loop:
-	cmpml	%a0@+,%a1@+		|	compare 8 longwords
+	cmpml	(%a0)+,(%a1)+		|	compare 8 longwords
 	jne	Lbcnoteq		|	not equal, return non-zero
-	cmpml	%a0@+,%a1@+
+	cmpml	(%a0)+,(%a1)+
 	jne	Lbcnoteq
-	cmpml	%a0@+,%a1@+
+	cmpml	(%a0)+,(%a1)+
 	jne	Lbcnoteq
-	cmpml	%a0@+,%a1@+
+	cmpml	(%a0)+,(%a1)+
 	jne	Lbcnoteq
-	cmpml	%a0@+,%a1@+
+	cmpml	(%a0)+,(%a1)+
 	jne	Lbcnoteq
-	cmpml	%a0@+,%a1@+
+	cmpml	(%a0)+,(%a1)+
 	jne	Lbcnoteq
-	cmpml	%a0@+,%a1@+
+	cmpml	(%a0)+,(%a1)+
 	jne	Lbcnoteq
-	cmpml	%a0@+,%a1@+
+	cmpml	(%a0)+,(%a1)+
 	jne	Lbcnoteq
 	dbf	%d0,Lbc32loop		|	till done
 	clrw	%d0
 	subql	#1,%d0
 	jcc	Lbc32loop
 Lbclong:
 	/* compare by longwords */
 	movl	%d1,%d0
 	lsrl	#2,%d0			| cnt = len / 4
 	jeq	Lbcbyte			| if (cnt)
 	subql	#1,%d0			|	set up for dbf
 Lbclloop:
-	cmpml	%a0@+,%a1@+		|	compare a longword
+	cmpml	(%a0)+,(%a1)+		|	compare a longword
 	jne	Lbcnoteq		|	not equal, return non-zero
 	dbf	%d0,Lbclloop		|	till done
 	andl	#3,%d1			|	len %= 4
 	jeq	Lbcdone
 	subql	#1,%d1			| set up for dbf
 Lbcbloop:
-	cmpmb	%a0@+,%a1@+		| compare a byte
+	cmpmb	(%a0)+,(%a1)+		| compare a byte
 	jne	Lbcnoteq		| not equal, return non-zero
 Lbcbyte:
 	dbf	%d1,Lbcbloop
 Lbcdone:
 	movql	#0,%d0
 	rts
 Lbcnoteq:
 	movql	#1,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcopy.S,v 1.2 2008/04/28 20:22:52 martin Exp $	*/
+/*	$NetBSD: bcopy.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * 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.
 @@ -58,48 +58,48 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)bcopy.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: bcopy.S,v 1.2 2008/04/28 20:22:52 martin Exp $")
+	RCSID("$NetBSD: bcopy.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #ifdef MEMCOPY
 ENTRY(memcpy)
 #else
 #ifdef MEMMOVE
 ENTRY(memmove)
 #else
 ENTRY(bcopy)
 #endif
 #endif
 #if defined(MEMCOPY) || defined(MEMMOVE)
-	movl	%sp@(4),%a1		| dest address
+	movl	4(%sp),%a1		| dest address
-	movl	%sp@(8),%a0		| src address
+	movl	8(%sp),%a0		| src address
 #else
-	movl	%sp@(4),%a0		| src address
+	movl	4(%sp),%a0		| src address
-	movl	%sp@(8),%a1		| dest address
+	movl	8(%sp),%a1		| dest address
 #endif
-	movl	%sp@(12),%d1		| count
+	movl	12(%sp),%d1		| count
 	cmpl	%a1,%a0			| src after dest?
 	jlt	Lbcback			| yes, must copy backwards
 	/*
 	 * It isn't worth the overhead of aligning to {long}word boundries
 	 * if the string is too short.
 	 */
 	cmpl	#8,%d1
 	jlt	Lbcfbyte
 #ifdef	__mc68010__
 	/*
 @@ -107,75 +107,75 @@ ENTRY(bcopy)
 	 * period.  If the source and the destination addresses aren't
 	 * of the same evenness, we're forced to do a bytewise copy.
 	 */
 	movl	%a0,%d0
 	addl	%a1,%d0
 	btst	#0,%d0
 	jne	Lbcfbyte
 #endif	/* __mc68010__ */
 	/* word align */
 	movl	%a1,%d0
 	btst	#0,%d0		| if (dst & 1)
 	jeq	Lbcfalgndw	|
-	movb	%a0@+,%a1@+	|	*(char *)dst++ = *(char *) src++
+	movb	(%a0)+,(%a1)+	|	*(char *)dst++ = *(char *) src++
 	subql	#1,%d1		|	len--
 Lbcfalgndw:
 	/* long word align */
 	btst	#1,%d0		| if (dst & 2)
 	jeq	Lbcfalgndl
-	movw	%a0@+,%a1@+	|	*(short *)dst++ = *(short *) dst++
+	movw	(%a0)+,(%a1)+	|	*(short *)dst++ = *(short *) dst++
 	subql	#2,%d1		|	len -= 2
 Lbcfalgndl:
 	/* copy by 8 longwords */
 	movel	%d1,%d0
 	lsrl	#5,%d0		| cnt = len / 32
 	jeq	Lbcflong	| if (cnt)
 	andl	#31,%d1		|	len %= 32
 	subql	#1,%d0		|	set up for dbf
 Lbcf32loop:
-	movl	%a0@+,%a1@+	|	copy 8 long words
+	movl	(%a0)+,(%a1)+	|	copy 8 long words
-	movl	%a0@+,%a1@+
+	movl	(%a0)+,(%a1)+
-	movl	%a0@+,%a1@+
+	movl	(%a0)+,(%a1)+
-	movl	%a0@+,%a1@+
+	movl	(%a0)+,(%a1)+
-	movl	%a0@+,%a1@+
+	movl	(%a0)+,(%a1)+
-	movl	%a0@+,%a1@+
+	movl	(%a0)+,(%a1)+
-	movl	%a0@+,%a1@+
+	movl	(%a0)+,(%a1)+
-	movl	%a0@+,%a1@+
+	movl	(%a0)+,(%a1)+
 	dbf	%d0,Lbcf32loop	|	till done
 	clrw	%d0
 	subql	#1,%d0
 	jcc	Lbcf32loop
 Lbcflong:
 	/* copy by longwords */
 	movel	%d1,%d0
 	lsrl	#2,%d0		| cnt = len / 4
 	jeq	Lbcfbyte	| if (cnt)
 	subql	#1,%d0		|	set up for dbf
 Lbcflloop:
-	movl	%a0@+,%a1@+	|	copy longwords
+	movl	(%a0)+,(%a1)+	|	copy longwords
 	dbf	%d0,Lbcflloop	|	til done
 	andl	#3,%d1		|	len %= 4
 	jeq	Lbcdone
 	subql	#1,%d1		| set up for dbf
 Lbcfbloop:
-	movb	%a0@+,%a1@+	| copy bytes
+	movb	(%a0)+,(%a1)+	| copy bytes
 Lbcfbyte:
 	dbf	%d1,Lbcfbloop	| till done
 Lbcdone:
 #if defined(MEMCOPY) || defined(MEMMOVE)
-	movl	%sp@(4),%d0	| dest address
+	movl	4(%sp),%d0	| dest address
 #if defined(__SVR4_ABI__)
 	moveal	%d0,%a0
 #endif
 #endif
 	rts
 Lbcback:
 	addl	%d1,%a0		| src pointer to end
 	addl	%d1,%a1		| dest pointer to end
 	/*
 	 * It isn't worth the overhead of aligning to {long}word boundries
 @@ -190,67 +190,67 @@ Lbcback:
 	 * period.  If the source and the destination addresses aren't
 	 * of the same evenness, we're forced to do a bytewise copy.
 	 */
 	movl	%a0,%d0
 	addl	%a1,%d0
 	btst	#0,%d0
 	jne	Lbcbbyte
 #endif	/* __mc68010__ */
 	/* word align */
 	movl	%a1,%d0
 	btst	#0,%d0		| if (dst & 1)
 	jeq	Lbcbalgndw	|
-	movb	%a0@-,%a1@-	|	*(char *)dst-- = *(char *) src--
+	movb	-(%a0),-(%a1)	|	*(char *)dst-- = *(char *) src--
 	subql	#1,%d1		|	len--
 Lbcbalgndw:
 	/* long word align */
 	btst	#1,%d0		| if (dst & 2)
 	jeq	Lbcbalgndl
-	movw	%a0@-,%a1@-	|	*(short *)dst-- = *(short *) dst--
+	movw	-(%a0),-(%a1)	|	*(short *)dst-- = *(short *) dst--
 	subql	#2,%d1		|	len -= 2
 Lbcbalgndl:
 	/* copy by 8 longwords */
 	movel	%d1,%d0
 	lsrl	#5,%d0		| cnt = len / 32
 	jeq	Lbcblong	| if (cnt)
 	andl	#31,%d1		|	len %= 32
 	subql	#1,%d0		|	set up for dbf
 Lbcb32loop:
-	movl	%a0@-,%a1@-	|	copy 8 long words
+	movl	-(%a0),-(%a1)	|	copy 8 long words
-	movl	%a0@-,%a1@-
+	movl	-(%a0),-(%a1)
-	movl	%a0@-,%a1@-
+	movl	-(%a0),-(%a1)
-	movl	%a0@-,%a1@-
+	movl	-(%a0),-(%a1)
-	movl	%a0@-,%a1@-
+	movl	-(%a0),-(%a1)
-	movl	%a0@-,%a1@-
+	movl	-(%a0),-(%a1)
-	movl	%a0@-,%a1@-
+	movl	-(%a0),-(%a1)
-	movl	%a0@-,%a1@-
+	movl	-(%a0),-(%a1)
 	dbf	%d0,Lbcb32loop	|	till done
 	clrw	%d0
 	subql	#1,%d0
 	jcc	Lbcb32loop
 Lbcblong:
 	/* copy by longwords */
 	movel	%d1,%d0
 	lsrl	#2,%d0		| cnt = len / 4
 	jeq	Lbcbbyte	| if (cnt)
 	subql	#1,%d0		|	set up for dbf
 Lbcblloop:
-	movl	%a0@-,%a1@-	|	copy longwords
+	movl	-(%a0),-(%a1)	|	copy longwords
 	dbf	%d0,Lbcblloop	|	til done
 	andl	#3,%d1		|	len %= 4
 	jeq	Lbcdone
 	subql	#1,%d1		| set up for dbf
 Lbcbbloop:
-	movb	%a0@-,%a1@-	| copy bytes
+	movb	-(%a0),-(%a1)	| copy bytes
 Lbcbbyte:
 	dbf	%d1,Lbcbbloop	| till done
 #if defined(MEMCOPY) || defined(MEMMOVE)
-	movl	%sp@(4),%d0	| dest address
+	movl	4(%sp),%d0	| dest address
 #if defined(__SVR4_ABI__)
 	moveal	%d0,%a0
 #endif
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bzero.S,v 1.2 2008/04/28 20:22:52 martin Exp $	*/
+/*	$NetBSD: bzero.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * 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.
 @@ -58,84 +58,84 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)bzero.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: bzero.S,v 1.2 2008/04/28 20:22:52 martin Exp $")
+	RCSID("$NetBSD: bzero.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(bzero)
-	movl	%d2,%sp@-
+	movl	%d2,-(%sp)
-	movl	%sp@(8),%a0		| destination
+	movl	8(%sp),%a0		| destination
-	movl	%sp@(12),%d1		| count
+	movl	12(%sp),%d1		| count
 	movql	#0,%d2
 	/*
 	 * It isn't worth the overhead of aligning to {long}word boundries
 	 * if the string is too short.
 	 */
 	cmpl	#8,%d1
 	jlt	Lbzbyte
 	/* word align */
 	movl	%a0,%d0
 	btst	#0,%d0			| if (dst & 1)
 	jeq	Lbzalgndw		|
-	movb	%d2,%a0@+		| 	*(char *)dst++ = 0
+	movb	%d2,(%a0)+		| 	*(char *)dst++ = 0
 	subql	#1,%d1			|	len--
 Lbzalgndw:
 	/* long word align */
 	btst	#1,%d0			| if (dst & 2)
 	jeq	Lbzalgndl		|
-	movw	%d2,%a0@+		|	*(short *)dst++ = 0
+	movw	%d2,(%a0)+		|	*(short *)dst++ = 0
 	subql	#2,%d1			|	len -= 2
 Lbzalgndl:
 	/* zero by 8 longwords */
 	movel	%d1,%d0
 	lsrl	#5,%d0			| cnt = len / 32
 	jeq	Lbzlong			| if (cnt)
 	andl	#31,%d1			|	len %= 32
 	subql	#1,%d0			|	set up for dbf
 Lbz32loop:
-	movl	%d2,%a0@+		|	zero 8 long words
+	movl	%d2,(%a0)+		|	zero 8 long words
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
 	dbf	%d0,Lbz32loop		|	till done
 	clrw	%d0
 	subql	#1,%d0
 	jcc	Lbz32loop
 Lbzlong:
 	/* copy by longwords */
 	movel	%d1,%d0
 	lsrl	#2,%d0			| cnt = len / 4
 	jeq	Lbzbyte			| if (cnt)
 	subql	#1,%d0			|	set up for dbf
 Lbzlloop:
-	movl	%d2,%a0@+		|	clear longwords
+	movl	%d2,(%a0)+		|	clear longwords
 	dbf	%d0,Lbzlloop		|	till done
 	andl	#3,%d1			|	len %= 4
 	jeq	Lbzdone
 	subql	#1,%d1			| set up for dbf
 Lbzbloop:
-	movb	%d2,%a0@+		| zero bytes
+	movb	%d2,(%a0)+		| zero bytes
 Lbzbyte:
 	dbf	%d1,Lbzbloop		| till done
 Lbzdone:
-	movl	%sp@+,%d2
+	movl	(%sp)+,%d2
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs.S,v 1.2 2011/07/09 14:57:29 mrg Exp $	*/
+/*	$NetBSD: ffs.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,48 +29,48 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)ffs.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: ffs.S,v 1.2 2011/07/09 14:57:29 mrg Exp $")
+	RCSID("$NetBSD: ffs.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* bit = ffs(value) */
 WEAK_ALIAS(__ffssi2,ffs)
 #ifndef	__mc68010__
 ENTRY(ffs)
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
 	movl	%d0,%d1
 	negl	%d0
 	andl	%d0,%d1
 	movql	#32,%d0
 	bfffo	%d1{#0:#32},%d1
 	subl	%d1,%d0
 	rts
 #else	/* __mc68010__ */
 ENTRY(ffs)
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
 	jeq	L2
 	movql	#31,%d1
 L1:
 	lsrl	#1,%d0
 	dbcs	%d1,L1
 	movql	#32,%d0
 	subl	%d1,%d0
 L2:
 	rts
 #endif	/* __mc68010__ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: memset.S,v 1.2 2008/04/28 20:22:52 martin Exp $	*/
+/*	$NetBSD: memset.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * 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.
 @@ -58,105 +58,105 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)bzero.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: memset.S,v 1.2 2008/04/28 20:22:52 martin Exp $")
+	RCSID("$NetBSD: memset.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(memset)
-	movl	%d2,%sp@-
+	movl	%d2,-(%sp)
-	movl	%sp@(8),%a0		| destination
+	movl	8(%sp),%a0		| destination
-	movl	%sp@(16),%d1		| count
+	movl	16(%sp),%d1		| count
-	movb	%sp@(15),%d2		| character
+	movb	15(%sp),%d2		| character
 	/*
 	 * It isn't worth the overhead of aligning to {long}word boundries
 	 * if the string is too short.
 	 */
 	cmpl	#15,%d1
 	jlt	Lbzbyte
 	clrl	%d0			| replicate byte to fill longword
 	movb	%d2,%d0
 	movl	%d0,%d2
 	lsll	#8,%d0
 	orl	%d0,%d2
 	lsll	#8,%d0
 	orl	%d0,%d2
 	lsll	#8,%d0
 	orl	%d0,%d2
 	/* word align */
 	movl	%a0,%d0
 	btst	#0,%d0			| if (dst & 1)
 	jeq	Lbzalgndw		|
-	movb	%d2,%a0@+		|	*(char *)dst++ = X
+	movb	%d2,(%a0)+		|	*(char *)dst++ = X
 	subql	#1,%d1			|	len--
 	addql	#1,%d0
 Lbzalgndw:
 #ifndef	__mc68010__
 	/* long word align */
 	btst	#1,%d0			| if (dst & 2)
 	jeq	Lbzalgndl		|
-	movw	%d2,%a0@+		|	*(short *)dst++ = X
+	movw	%d2,(%a0)+		|	*(short *)dst++ = X
 	subql	#2,%d1			|	len -= 2
 Lbzalgndl:
 	/* set by 8 longwords */
 	movel	%d1,%d0
 	lsrl	#5,%d0			| cnt = len / 32
 	jeq	Lbzlong			| if (cnt)
 	andl	#31,%d1			|	len %= 32
 	subql	#1,%d0			|	set up for dbf
 Lbz32loop:
-	movl	%d2,%a0@+		|	set 8 long words
+	movl	%d2,(%a0)+		|	set 8 long words
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
-	movl	%d2,%a0@+
+	movl	%d2,(%a0)+
 	dbf	%d0,Lbz32loop		|	till done
 	clrw	%d0
 	subql	#1,%d0
 	jcc	Lbz32loop
 #endif	/* !__mc68010__ */
 Lbzlong:
 	/* set by longwords */
 	movel	%d1,%d0
 	lsrl	#2,%d0			| cnt = len / 4
 	jeq	Lbzbyte			| if (cnt)
 	subql	#1,%d0			|	set up for dbf
 Lbzlloop:
-	movl	%d2,%a0@+		|	clear longwords
+	movl	%d2,(%a0)+		|	clear longwords
 	dbf	%d0,Lbzlloop		|	till done
 #ifdef	__mc68010__
 	clrw	%d0
 	subql	#1,%d0
 	jcc	Lbzlloop
 #endif	/* __mc68010__ */
 	andl	#3,%d1			|	len %= 4
 	jeq	Lbzdone
 	subql	#1,%d1			| set up for dbf
 Lbzbloop:
-	movb	%d2,%a0@+		| set bytes
+	movb	%d2,(%a0)+		| set bytes
 Lbzbyte:
 	dbf	%d1,Lbzbloop		| till done
 Lbzdone:
-	movl	%sp@(8),%d0		| return destination
+	movl	8(%sp),%d0		| return destination
 #ifdef __SVR4_ABI__
 	moveal	%d0,%a0
 #endif
-	movl	%sp@+,%d2
+	movl	(%sp)+,%d2
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strchr.S,v 1.2 2009/07/17 19:37:57 dsl Exp $	*/
+/*	$NetBSD: strchr.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,35 +29,35 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)index.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: strchr.S,v 1.2 2009/07/17 19:37:57 dsl Exp $")
+	RCSID("$NetBSD: strchr.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(strchr)
-	movl	%sp@(4),%a0		| string
+	movl	4(%sp),%a0		| string
-	movb	%sp@(11),%d0		| char to look for
+	movb	11(%sp),%d0		| char to look for
 ixloop:
-	cmpb	%a0@,%d0		| found our char?
+	cmpb	(%a0),%d0		| found our char?
 	jeq	ixfound			| yes, break out
-	tstb	%a0@+			| null?
+	tstb	(%a0)+			| null?
 	jne	ixloop			| no, keep going
 	moveq	#0,%d0			| not found, return null
 #ifdef __SVR4_ABI__
 	moveal	%d0,%a0
 #endif
 	rts
 ixfound:
 	movl	%a0,%d0			| found, return pointer
 	rts
 STRONG_ALIAS(index,strchr)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strcmp.S,v 1.2 2008/04/28 20:22:52 martin Exp $	*/
+/*	$NetBSD: strcmp.S,v 1.3 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Hiroshi Horimoto <horimoto@cs-aoi.cs.sist.ac.jp> and
  * by J.T. Conklin <jtc@NetBSD.org>.
+ *
  * 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
 @@ -23,49 +23,49 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: strcmp.S,v 1.2 2008/04/28 20:22:52 martin Exp $")
+	RCSID("$NetBSD: strcmp.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 ENTRY(strcmp)
-	movl	%sp@(4),%a0
+	movl	4(%sp),%a0
-	movl	%sp@(8),%a1
+	movl	8(%sp),%a1
 L1:				/* unrolled by 4 for 680[23]0's */
-	movb	%a0@+,%d1
+	movb	(%a0)+,%d1
 	jeq	L2
-	subb	%a1@+,%d1
+	subb	(%a1)+,%d1
 	jne	L3
-	movb	%a0@+,%d1
+	movb	(%a0)+,%d1
 	jeq	L2
-	subb	%a1@+,%d1
+	subb	(%a1)+,%d1
 	jne	L3
-	movb	%a0@+,%d1
+	movb	(%a0)+,%d1
 	jeq	L2
-	subb	%a1@+,%d1
+	subb	(%a1)+,%d1
 	jne	L3
-	movb	%a0@+,%d1
+	movb	(%a0)+,%d1
 	jeq	L2
-	subb	%a1@+,%d1
+	subb	(%a1)+,%d1
 	jeq	L1
 L3:	scs	%d0
 	EXTBL(%d0)
 	movb	%d1,%d0
 	rts
 L2:	movq	#0,%d0
-	movb	%a1@,%d0
+	movb	(%a1),%d0
 	negl	%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strncmp.S,v 1.2 2008/04/28 20:22:52 martin Exp $	*/
+/*	$NetBSD: strncmp.S,v 1.3 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Hiroshi Horimoto <horimoto@cs-aoi.cs.sist.ac.jp> and
  * by J.T. Conklin <jtc@NetBSD.org>.
+ *
  * 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
 @@ -23,56 +23,56 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: strncmp.S,v 1.2 2008/04/28 20:22:52 martin Exp $")
+	RCSID("$NetBSD: strncmp.S,v 1.3 2013/07/16 20:49:42 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 ENTRY(strncmp)
-	movl	%sp@(12),%d0
+	movl	12(%sp),%d0
 	jeq	L4
-	movl	%sp@(4),%a0
+	movl	4(%sp),%a0
-	movl	%sp@(8),%a1
+	movl	8(%sp),%a1
 L1:				/* unroll by 4 for m680[23]0's */
-	movb	%a0@+,%d1
+	movb	(%a0)+,%d1
 	jeq	L2
-	subb	%a1@+,%d1
+	subb	(%a1)+,%d1
 	jne	L3
 	subql	#1,%d0
 	jeq	L4
-	movb	%a0@+,%d1
+	movb	(%a0)+,%d1
 	jeq	L2
-	subb	%a1@+,%d1
+	subb	(%a1)+,%d1
 	jne	L3
 	subql	#1,%d0
 	jeq	L4
-	movb	%a0@+,%d1
+	movb	(%a0)+,%d1
 	jeq	L2
-	subb	%a1@+,%d1
+	subb	(%a1)+,%d1
 	jne	L3
 	subql	#1,%d0
 	jeq	L4
-	movb	%a0@+,%d1
+	movb	(%a0)+,%d1
 	jeq	L2
-	subb	%a1@+,%d1
+	subb	(%a1)+,%d1
 	jne	L3
 	subql	#1,%d0
 	jne	L1
 L4:	rts
-L2:	subb	%a1@,%d1
+L2:	subb	(%a1),%d1
 L3:	scs	%d0
 	EXTBL(%d0)
 	movb	%d1,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strrchr.S,v 1.2 2009/07/17 19:37:57 dsl Exp $	*/
+/*	$NetBSD: strrchr.S,v 1.3 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,32 +29,32 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)rindex.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: strrchr.S,v 1.2 2009/07/17 19:37:57 dsl Exp $")
+	RCSID("$NetBSD: strrchr.S,v 1.3 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(strrchr)
-	movl	%sp@(4),%a1		| string
+	movl	4(%sp),%a1		| string
-	movb	%sp@(11),%d0		| char to look for
+	movb	11(%sp),%d0		| char to look for
 	subl	%a0,%a0			| clear rindex pointer
 rixloop:
-	cmpb	%a1@,%d0		| found our char?
+	cmpb	(%a1),%d0		| found our char?
 	jne	rixnope			| no, check for null
 	movl	%a1,%a0			| yes, remember location
 rixnope:
-	tstb	%a1@+			| null?
+	tstb	(%a1)+			| null?
 	jne	rixloop			| no, keep going
 	movl	%a0,%d0			| return value
 	rts
 STRONG_ALIAS(rindex,strrchr)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: memcmp.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: memcmp.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,72 +29,72 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)bcmp.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: memcmp.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: memcmp.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* memcmp(s1, s2, n) */
 /*
  * This is probably not the best we can do, but it is still 2-10 times
  * faster than the C version in the portable gen directory.
+ *
  * Things that might help:
  *	- longword align when possible (only on the 68020)
  *	- use nested DBcc instructions or use one and limit size to 64K
  */
 ENTRY(memcmp)
-	movl	%sp@(4),%a0		| string 1
+	movl	4(%sp),%a0		| string 1
-	movl	%sp@(8),%a1		| string 2
+	movl	8(%sp),%a1		| string 2
-	movl	%sp@(12),%d0		| length
+	movl	12(%sp),%d0		| length
 	jeq	bcdone			| if zero, nothing to do
 	movl	%a0,%d1
 	btst	#0,%d1			| string 1 address odd?
 	jeq	bceven			| no, skip alignment
-	cmpmb	%a0@+,%a1@+		| yes, compare a byte
+	cmpmb	(%a0)+,(%a1)+		| yes, compare a byte
 	jne	bcnoteq			| not equal, return non-zero
 	subql	#1,%d0			| adjust count
 	jeq	bcdone			| count 0, reutrn zero
 bceven:
 	movl	%a1,%d1
 	btst	#0,%d1			| string 2 address odd?
 	jne	bcbloop			| yes, no hope for alignment, compare bytes
 	movl	%d0,%d1			| no, both even
 	lsrl	#2,%d1			| convert count to longword count
 	jeq	bcbloop			| count 0, skip longword loop
 bclloop:
-	cmpml	%a0@+,%a1@+		| compare a longword
+	cmpml	(%a0)+,(%a1)+		| compare a longword
 	jne	bcnoteql		| not equal, return non-zero
 	subql	#1,%d1			| adjust count
 	jne	bclloop			| still more, keep comparing
 	andl	#3,%d0			| what remains
 	jeq	bcdone			| nothing, all done
 bcbloop:
-	cmpmb	%a0@+,%a1@+		| compare a byte
+	cmpmb	(%a0)+,(%a1)+		| compare a byte
 	jne	bcnoteq			| not equal, return non-zero
 	subql	#1,%d0			| adjust count
 	jne	bcbloop			| still more, keep going
 	rts
 bcnoteql:
 	subql	#4,%a0
 	subql	#4,%a1
 	movl	#4,%d0
 	jra	bcbloop
 bcnoteq:
 	clrl	%d0
 	clrl	%d1
-	movb	%a0@-,%d0
+	movb	-(%a0),%d0
-	movb	%a1@-,%d1
+	movb	-(%a1),%d1
 	subl	%d1,%d0
 bcdone:
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strcat.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: strcat.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,32 +29,32 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)strcpy.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: strcat.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: strcat.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(strcat)
-	movl	%sp@(8),%a0		| a0 = fromaddr
+	movl	8(%sp),%a0		| a0 = fromaddr
-	movl	%sp@(4),%d0		| return value is toaddr
+	movl	4(%sp),%d0		| return value is toaddr
 	movl	%d0,%a1			| a1 = toaddr
 Lslloop:
-	tstb	%a1@+			| null?
+	tstb	(%a1)+			| null?
 	jne	Lslloop			| no, keep going
 	subql	#1,%a1
 Lscloop:
-	movb	%a0@+,%a1@+		| copy a byte
+	movb	(%a0)+,(%a1)+		| copy a byte
 	jne	Lscloop			| copied non-null, keep going
 #ifdef __SVR4_ABI__
 	moveal	%d0,%a0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strcpy.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: strcpy.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,28 +29,28 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)strcpy.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: strcpy.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: strcpy.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(strcpy)
-	movl	%sp@(8),%a0		| a0 = fromaddr
+	movl	8(%sp),%a0		| a0 = fromaddr
-	movl	%sp@(4),%d0		| return value is toaddr
+	movl	4(%sp),%d0		| return value is toaddr
 	movl	%d0,%a1			| a1 = toaddr
 Lscloop:
-	movb	%a0@+,%a1@+		| copy a byte
+	movb	(%a0)+,(%a1)+		| copy a byte
 	jne	Lscloop			| copied non-null, keep going
 #ifdef __SVR4_ABI__
 	moveal	%d0,%a0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strlen.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: strlen.S,v 1.2 2013/07/16 20:49:41 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,26 +29,26 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)strlen.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: strlen.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: strlen.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(strlen)
-	movl	%sp@(4),%a0		| string
+	movl	4(%sp),%a0		| string
 	movl	%a0,%d0
 	notl	%d0
 Lslloop:
-	tstb	%a0@+			| null?
+	tstb	(%a0)+			| null?
 	jne	Lslloop			| no, keep going
 	addl	%a0,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strncpy.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: strncpy.S,v 1.2 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,45 +29,45 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)strncpy.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: strncpy.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+	RCSID("$NetBSD: strncpy.S,v 1.2 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 ENTRY(strncpy)
-	movl	%sp@(4),%d0		| return value is toaddr
+	movl	4(%sp),%d0		| return value is toaddr
-	movl	%sp@(12),%d1		| count
+	movl	12(%sp),%d1		| count
 	jeq	Lscdone			| nothing to do
-	movl	%sp@(8),%a0		| a0 = fromaddr
+	movl	8(%sp),%a0		| a0 = fromaddr
 	movl	%d0,%a1			| a1 = toaddr
 	subql	#1,%d1
 Lscloop:
-	movb	%a0@+,%a1@+		| copy a byte
+	movb	(%a0)+,(%a1)+		| copy a byte
 	dbeq	%d1,Lscloop		| loop through low word of d1
 	jeq	Lscpadding		| copied null, padding if necessary
 	clrw	%d1			| clear low word of d1
 	subql	#1,%d1			| adjust count for long copies
 	jcc	Lscloop			| more room, keep going
 Lscdone:
 #ifdef __SVR4_ABI__
 	moveal	%d0,%a0
 #endif
 	rts
 Lscploop:
-	clrb	%a1@+			| clear a byte
+	clrb	(%a1)+			| clear a byte
 	dbra	%d1,Lscploop		| keep going
 	clrw	%d1
 Lscpadding:
 	subql	#1,%d1
 	jcc	Lscploop
 	jra	Lscdone

 @@ -1,14 +1,14 @@
-/*	$NetBSD: _setjmp.S,v 1.7 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: _setjmp.S,v 1.8 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,60 +29,60 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)_setjmp.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: _setjmp.S,v 1.7 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: _setjmp.S,v 1.8 2013/07/16 20:49: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.
  */
 ENTRY(_setjmp)
-	movl	%sp@(4),%a0	/* save area pointer */
+	movl	4(%sp),%a0	/* save area pointer */
-	clrl	%a0@+		/* no old onstack */
+	clrl	(%a0)+		/* no old onstack */
-	clrl	%a0@+		/* no old sigmask */
+	clrl	(%a0)+		/* no old sigmask */
-	movl	%sp,%a0@+	/* save old SP */
+	movl	%sp,(%a0)+	/* save old SP */
-	movl	%a6,%a0@+	/* save old FP */
+	movl	%a6,(%a0)+	/* save old FP */
-	clrl	%a0@+		/* no old AP */
+	clrl	(%a0)+		/* no old AP */
-	movl	%sp@,%a0@+	/* save old PC */
+	movl	(%sp),(%a0)+	/* save old PC */
-	clrl	%a0@+		/* clear PS */
+	clrl	(%a0)+		/* clear PS */
-	moveml	#0x3CFC,%a0@	/* save other non-scratch regs */
+	moveml	#0x3CFC,(%a0)	/* save other non-scratch regs */
 	clrl	%d0		/* return zero */
 	rts
 ENTRY(_longjmp)
-	movl	%sp@(4),%a0	/* save area pointer */
+	movl	4(%sp),%a0	/* save area pointer */
 	addql	#8,%a0		/* skip onstack/sigmask */
-	tstl	%a0@		/* ensure non-zero SP */
+	tstl	(%a0)		/* ensure non-zero SP */
 	jeq	botch		/* oops! */
-	movl	%sp@(8),%d0	/* grab return value */
+	movl	8(%sp),%d0	/* grab return value */
 	jne	ok		/* non-zero ok */
 	moveq	#1,%d0		/* else make non-zero */
 ok:
-	movl	%a0@+,%sp	/* restore SP */
+	movl	(%a0)+,%sp	/* restore SP */
-	movl	%a0@+,%a6	/* restore FP */
+	movl	(%a0)+,%a6	/* restore FP */
 	addql	#4,%a0		/* skip AP */
-	movl	%a0@+,%sp@	/* restore PC */
+	movl	(%a0)+,(%sp)	/* restore PC */
-	moveml	%a0@(4),#0x3CFC	/* restore non-scratch regs */
+	moveml	4(%a0),#0x3CFC	/* restore non-scratch regs */
 	rts
 botch:
 	jbsr	PIC_PLT(_C_LABEL(longjmperror))
 	stop	#0

 @@ -1,14 +1,14 @@
-/*	$NetBSD: muldf3.S,v 1.7 2003/08/07 16:42:11 agc Exp $	*/
+/*	$NetBSD: muldf3.S,v 1.8 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)muldf3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: muldf3.S,v 1.7 2003/08/07 16:42:11 agc Exp $")
+	RCSID("$NetBSD: muldf3.S,v 1.8 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* double * double */
 ENTRY(__muldf3)
-	fmoved	%sp@(4),%fp0
+	fmoved	4(%sp),%fp0
-	fmuld	%sp@(12),%fp0
+	fmuld	12(%sp),%fp0
 #ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
+	fmoved	%fp0,-(%sp)
-	movel	%sp@+,%d0
+	movel	(%sp)+,%d0
-	movel	%sp@+,%d1
+	movel	(%sp)+,%d1
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: negdf2.S,v 1.7 2003/08/07 16:42:11 agc Exp $	*/
+/*	$NetBSD: negdf2.S,v 1.8 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)negdf2.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: negdf2.S,v 1.7 2003/08/07 16:42:11 agc Exp $")
+	RCSID("$NetBSD: negdf2.S,v 1.8 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* -double */
 ENTRY(__negdf2)
 #if defined(__SVR4_ABI__) && defined(__HAVE_68881__)
-	fnegd	%sp@(4),%fp0
+	fnegd	4(%sp),%fp0
 #else
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
-	movel	%sp@(8),%d1
+	movel	8(%sp),%d1
 	bchg	#31,%d0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: negsf2.S,v 1.7 2003/08/07 16:42:11 agc Exp $	*/
+/*	$NetBSD: negsf2.S,v 1.8 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,26 +29,26 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID"from: @(#)negsf2.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: negsf2.S,v 1.7 2003/08/07 16:42:11 agc Exp $")
+	RCSID("$NetBSD: negsf2.S,v 1.8 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* -single */
 ENTRY(__negsf2)
 #if defined(__SVR4_ABI__) && defined(__HAVE_68881__)
-	fnegs	%sp@(4),%fp0
+	fnegs	4(%sp),%fp0
 #else
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
 	bchg	#31,%d0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: adddf3.S,v 1.6 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: adddf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)adddf3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: adddf3.S,v 1.6 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: adddf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* double + double */
 ENTRY(__adddf3)
-	fmoved	%sp@(4),%fp0
+	fmoved	4(%sp),%fp0
-	faddd	%sp@(12),%fp0
+	faddd	12(%sp),%fp0
 #ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
+	fmoved	%fp0,-(%sp)
-	movel	%sp@+,%d0
+	movel	(%sp)+,%d0
-	movel	%sp@+,%d1
+	movel	(%sp)+,%d1
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: addsf3.S,v 1.6 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: addsf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,25 +29,25 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)addsf3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: addsf3.S,v 1.6 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: addsf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* single + single */
 ENTRY(__addsf3)
-	fmoves	%sp@(4),%fp0
+	fmoves	4(%sp),%fp0
-	fadds	%sp@(8),%fp0
+	fadds	8(%sp),%fp0
 #ifndef __SVR4_ABI__
 	fmoves	%fp0,%d0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: alloca.S,v 1.6 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: alloca.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,31 +29,31 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)alloca.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: alloca.S,v 1.6 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: alloca.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* like alloc, but automatic free in return */
 ENTRY(alloca)
-	movl	%sp@,%a1	/* save return addr */
+	movl	(%sp),%a1	/* save return addr */
 	movl	%sp,%d0		/* get current SP value */
-	subl	%sp@(4),%d0	/* allocate requested space */
+	subl	4(%sp),%d0	/* allocate requested space */
 	andb	#~3,%d0		/* longword align for efficiency */
 	addql	#8,%d0		/* reuse space of call frame */
 	movl	%d0,%sp		/* set new SP value */
-	lea	%sp@(-4),%sp	/* account for argument pop in caller */
+	lea	-4(%sp),%sp	/* account for argument pop in caller */
 #ifdef __SVR4_ABI__
 	moveal	%d0,%a0
 #endif
-	jmp 	%a1@		/* funny return */
+	jmp 	(%a1)		/* funny return */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: divdf3.S,v 1.6 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: divdf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)divdf3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: divdf3.S,v 1.6 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: divdf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* double / double */
 ENTRY(__divdf3)
-	fmoved	%sp@(4),%fp0
+	fmoved	4(%sp),%fp0
-	fdivd	%sp@(12),%fp0
+	fdivd	12(%sp),%fp0
 #ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
+	fmoved	%fp0,-(%sp)
-	movel	%sp@+,%d0
+	movel	(%sp)+,%d0
-	movel	%sp@+,%d1
+	movel	(%sp)+,%d1
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: divsf3.S,v 1.6 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: divsf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,25 +29,25 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)divsf3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: divsf3.S,v 1.6 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: divsf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* single / single */
 ENTRY(__divsf3)
-	fmoves	%sp@(4),%fp0
+	fmoves	4(%sp),%fp0
-	fdivs	%sp@(8),%fp0
+	fdivs	8(%sp),%fp0
 #ifndef __SVR4_ABI__
 	fmoves	%fp0,%d0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: extendsfdf2.S,v 1.6 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: extendsfdf2.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,26 +29,26 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)extendsfdf2.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: extendsfdf2.S,v 1.6 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: extendsfdf2.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* (double) float */
 ENTRY(__extendsfdf2)
-	fmoves	%sp@(4),%fp0
+	fmoves	4(%sp),%fp0
 #ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
+	fmoved	%fp0,-(%sp)
-	movel	%sp@+,%d0
+	movel	(%sp)+,%d0
-	movel	%sp@+,%d1
+	movel	(%sp)+,%d1
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: floatsidf.S,v 1.6 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: floatsidf.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)floatsidf.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: floatsidf.S,v 1.6 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: floatsidf.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* (double) int */
 ENTRY(__floatsidf)
-	fmovel	%sp@(4),%fp0
+	fmovel	4(%sp),%fp0
 #ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
+	fmoved	%fp0,-(%sp)
-	movel	%sp@+,%d0
+	movel	(%sp)+,%d0
-	movel	%sp@+,%d1
+	movel	(%sp)+,%d1
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: modf.S,v 1.6 2003/08/07 16:42:11 agc Exp $	*/
+/*	$NetBSD: modf.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,33 +29,33 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)modf.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: modf.S,v 1.6 2003/08/07 16:42:11 agc Exp $")
+	RCSID("$NetBSD: modf.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*
  * double modf(val, iptr)
  * returns: xxx and n (in *iptr) where val == n.xxx
  */
 ENTRY(modf)
-	fmoved	%sp@(4),%fp0
+	fmoved	4(%sp),%fp0
-	movel	%sp@(12),%a0
+	movel	12(%sp),%a0
 	fintrzx	%fp0,%fp1
-	fmoved	%fp1,%a0@
+	fmoved	%fp1,(%a0)
 	fsubx	%fp1,%fp0
 #ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
+	fmoved	%fp0,-(%sp)
-	movel	%sp@+,%d0
+	movel	(%sp)+,%d0
-	movel	%sp@+,%d1
+	movel	(%sp)+,%d1
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mulsf3.S,v 1.6 2003/08/07 16:42:11 agc Exp $	*/
+/*	$NetBSD: mulsf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,25 +29,25 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)mulsf3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: mulsf3.S,v 1.6 2003/08/07 16:42:11 agc Exp $")
+	RCSID("$NetBSD: mulsf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* single * single */
 ENTRY(__mulsf3)
-	fmoves	%sp@(4),%fp0
+	fmoves	4(%sp),%fp0
-	fmuls	%sp@(8),%fp0
+	fmuls	8(%sp),%fp0
 #ifndef __SVR4_ABI__
 	fmoves	%fp0,%d0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subdf3.S,v 1.6 2003/08/07 16:42:11 agc Exp $	*/
+/*	$NetBSD: subdf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)subdf3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: subdf3.S,v 1.6 2003/08/07 16:42:11 agc Exp $")
+	RCSID("$NetBSD: subdf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* double - double */
 ENTRY(__subdf3)
-	fmoved	%sp@(4),%fp0
+	fmoved	4(%sp),%fp0
-	fsubd	%sp@(12),%fp0
+	fsubd	12(%sp),%fp0
 #ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
+	fmoved	%fp0,-(%sp)
-	movel	%sp@+,%d0
+	movel	(%sp)+,%d0
-	movel	%sp@+,%d1
+	movel	(%sp)+,%d1
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subsf3.S,v 1.6 2003/08/07 16:42:11 agc Exp $	*/
+/*	$NetBSD: subsf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,25 +29,25 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)subsf3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: subsf3.S,v 1.6 2003/08/07 16:42:11 agc Exp $")
+	RCSID("$NetBSD: subsf3.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* single - single */
 ENTRY(__subsf3)
-	fmoves	%sp@(4),%fp0
+	fmoves	4(%sp),%fp0
-	fsubs	%sp@(8),%fp0
+	fsubs	8(%sp),%fp0
 #ifndef __SVR4_ABI__
 	fmoves	%fp0,%d0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: truncdfsf2.S,v 1.6 2003/08/07 16:42:11 agc Exp $	*/
+/*	$NetBSD: truncdfsf2.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,24 +29,24 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)truncdfsf2.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: truncdfsf2.S,v 1.6 2003/08/07 16:42:11 agc Exp $")
+	RCSID("$NetBSD: truncdfsf2.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* (float) double */
 ENTRY(__truncdfsf2)
-	fmoved	%sp@(4),%fp0
+	fmoved	4(%sp),%fp0
 #ifndef __SVR4_ABI__
 	fmoves	%fp0,%d0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ashlsi3.S,v 1.5 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: ashlsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,23 +29,23 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)ashlsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: ashlsi3.S,v 1.5 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: ashlsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* int << int */
 ENTRY(__ashlsi3)
-	movel	%sp@(8),%d1
+	movel	8(%sp),%d1
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
 	asll	%d1,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ashrsi3.S,v 1.5 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: ashrsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,23 +29,23 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)ashrsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: ashrsi3.S,v 1.5 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: ashrsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* int >> int */
 ENTRY(__ashrsi3)
-	movel	%sp@(8),%d1
+	movel	8(%sp),%d1
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
 	asrl	%d1,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cmpdf2.S,v 1.5 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: cmpdf2.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,30 +29,30 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)cmpdf2.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: cmpdf2.S,v 1.5 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: cmpdf2.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* double > double: 1 */
 /* double < double: -1 */
 /* double == double: 0 */
 ENTRY(__cmpdf2)
-	fmoved	%sp@(4),%fp0
+	fmoved	4(%sp),%fp0
-	fcmpd	%sp@(12),%fp0
+	fcmpd	12(%sp),%fp0
 	fbgt	Lagtb
 	fslt	%d0
 	extbl	%d0
 	rts
 Lagtb:
 	moveq	#1,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cmpsf2.S,v 1.5 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: cmpsf2.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,30 +29,30 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)cmpsf2.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: cmpsf2.S,v 1.5 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: cmpsf2.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* single > single: 1 */
 /* single < single: -1 */
 /* single == single: 0 */
 ENTRY(__cmpsf2)
-	fmoves	%sp@(4),%fp0
+	fmoves	4(%sp),%fp0
-	fcmps	%sp@(8),%fp0
+	fcmps	8(%sp),%fp0
 	fbgt	Lagtb
 	fslt	%d0
 	extbl	%d0
 	rts
 Lagtb:
 	moveq	#1,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fixdfsi.S,v 1.5 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: fixdfsi.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,22 +29,22 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)fixdfsi.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: fixdfsi.S,v 1.5 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: fixdfsi.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* (int) double */
 ENTRY(__fixdfsi)
-	fintrzd	%sp@(4),%fp0
+	fintrzd	4(%sp),%fp0
 	fmovel	%fp0,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fixunsdfsi.S,v 1.5 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: fixunsdfsi.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,29 +29,29 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)fixunsdfsi.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: fixunsdfsi.S,v 1.5 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: fixunsdfsi.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* (unsigned) double */
 ENTRY(__fixunsdfsi)
-	fintrzd	%sp@(4),%fp0
+	fintrzd	4(%sp),%fp0
 	fcmpd	#0r2147483648.0,%fp0
 	fbge	Lwaybig
 	fmovel	%fp0,%d0
 	rts
 Lwaybig:
 	fsubd	#0r2147483648.0,%fp0
 	fmovel	%fp0,%d0
 	bset	#31,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lshlsi3.S,v 1.5 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: lshlsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,23 +29,23 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)lshlsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: lshlsi3.S,v 1.5 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: lshlsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* unsigned << unsigned */
 ENTRY(__lshlsi3)
-	movel	%sp@(8),%d1
+	movel	8(%sp),%d1
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
 	lsll	%d1,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lshrsi3.S,v 1.5 2003/08/07 16:42:10 agc Exp $	*/
+/*	$NetBSD: lshrsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,23 +29,23 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)lshrsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: lshrsi3.S,v 1.5 2003/08/07 16:42:10 agc Exp $")
+	RCSID("$NetBSD: lshrsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* unsigned >> unsigned */
 ENTRY(__lshrsi3)
-	movel	%sp@(8),%d1
+	movel	8(%sp),%d1
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
 	lsrl	%d1,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: resumecontext.S,v 1.5 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: resumecontext.S,v 1.6 2013/07/16 20:49: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.
 @@ -22,38 +22,38 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: resumecontext.S,v 1.5 2008/04/28 20:22:56 martin Exp $")
+	RCSID("$NetBSD: resumecontext.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif /* LIBC_SCCS && !lint */
 /*
  * This assembly-language implementation differs from the (obvious)
  * C-language implementation only in not clobbering the previous
  * function's return address (us), which is the point of the exercise.
  */
 ENTRY(_resumecontext)
 	subl	#(4 + 1024),%sp		/* retaddr preservation + ucontext_t */
-	lea	%sp@,%a0
+	lea	(%sp),%a0
-	movl	%a0,%sp@-
+	movl	%a0,-(%sp)
 	jbsr	PIC_PLT(_C_LABEL(_getcontext))
-	movl	%sp@(4 + 4),%sp@	/* uc_link */
+	movl	(4 + 4)(%sp),(%sp)	/* uc_link */
-	tstl	%sp@			/* check for NULL */
+	tstl	(%sp)			/* check for NULL */
 	jne	1f
 	jbsr	PIC_PLT(_C_LABEL(exit))	/* cleanly exit(0) */
 	jmp	2f
 :	jbsr	PIC_PLT(_C_LABEL(setcontext))
 	/* NOTREACHED */
 	/* But just in case... */
-:	movl	#-1,%sp@
+:	movl	#-1,(%sp)
 	jbsr	PIC_PLT(_C_LABEL(_exit))
 	/* NOTREACHED */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: umulsi3.S,v 1.5 2003/08/07 16:42:12 agc Exp $	*/
+/*	$NetBSD: umulsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,22 +29,22 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)umulsi3.s	5.1 (Berkeley) 6/7/90")
 #else
-	RCSID("$NetBSD: umulsi3.S,v 1.5 2003/08/07 16:42:12 agc Exp $")
+	RCSID("$NetBSD: umulsi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* unsigned * unsigned */
 ENTRY(__umulsi3)
-	movel	%sp@(4),%d0
+	movel	4(%sp),%d0
-	mulul	%sp@(8),%d0
+	mulul	8(%sp),%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fabs.S,v 1.8 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: fabs.S,v 1.9 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by
+ *
  * 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,25 +21,25 @@
  * 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>
-RCSID("$NetBSD: fabs.S,v 1.8 2008/04/28 20:22:56 martin Exp $")
+RCSID("$NetBSD: fabs.S,v 1.9 2013/07/16 20:49:42 matt Exp $")
 ENTRY(fabs)
 #if defined(__SVR4_ABI__) && defined(__HAVE_68881__)
-	bclr	#31,%sp@(4)
+	bclr	#31,4(%sp)
-	fmoved	%sp@(4),%fp0
+	fmoved	4(%sp),%fp0
 #else
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
-	movl	%sp@(8),%d1
+	movl	8(%sp),%d1
 	bclr	#31,%d0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sigsetjmp.S,v 1.8 2006/03/09 16:20:27 christos Exp $	*/
+/*	$NetBSD: sigsetjmp.S,v 1.9 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,49 +29,49 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)_setjmp.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: sigsetjmp.S,v 1.8 2006/03/09 16:20:27 christos Exp $")
+	RCSID("$NetBSD: sigsetjmp.S,v 1.9 2013/07/16 20:49: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,m)
  * by restoring registers from the stack,
  * The previous signal state is restored if 'm' was non-zero.
  */
 /* grab _JBLEN */
 #include <m68k/setjmp.h>
 ENTRY(__sigsetjmp14)
-	movl	%sp@(8),%d1	/* grab the mask */
+	movl	8(%sp),%d1	/* grab the mask */
-        movl	%sp@(4),%a0	/* grab the area pointer */
+        movl	4(%sp),%a0	/* grab the area pointer */
-	movl	%d1,%a0@(_JBLEN * 4)	/* save at end of area */
+	movl	%d1,(_JBLEN * 4)(%a0)	/* save at end of area */
 	tstl	%d1
 	bne	dosig
 	jra	PIC_PLT(_C_LABEL(_setjmp))
 dosig:
 	jra	PIC_PLT(_C_LABEL(__setjmp14))
 ENTRY(__siglongjmp14)
-	movl	%sp@(4),%a0	/* save area pointer */
+	movl	4(%sp),%a0	/* save area pointer */
-	tstl	%a0@(_JBLEN * 4) /* check mask... */
+	tstl	(_JBLEN * 4)(%a0) /* check mask... */
 	bne	didsig
 	jra	PIC_PLT(_C_LABEL(_longjmp))
 didsig:
 	jra	PIC_PLT(_C_LABEL(__longjmp14))

 @@ -1,14 +1,14 @@
-/*	$NetBSD: setjmp.S,v 1.12 2006/03/09 16:20:27 christos Exp $	*/
+/*	$NetBSD: setjmp.S,v 1.13 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,65 +29,65 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)setjmp.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: setjmp.S,v 1.12 2006/03/09 16:20:27 christos Exp $")
+	RCSID("$NetBSD: setjmp.S,v 1.13 2013/07/16 20:49: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>
  */
 ENTRY(__setjmp14)
 	/* Get signal stack info.  Note overlay of ss_sp and ss_size! */
-	lea	%sp@(-12),%sp	/* sizeof(stack_t) */
+	lea	-12(%sp),%sp	/* sizeof(stack_t) */
-	clrl	%sp@		/* ss = NULL */
+	clrl	(%sp)		/* ss = NULL */
-	movl	%sp,%sp@(4)	/* oss = stack_t on stack */
+	movl	%sp,4(%sp)	/* oss = stack_t on stack */
 	jbsr	PIC_PLT(_C_LABEL(__sigaltstack14))
-	movl	%sp@(8),%d0	/* ss_flags */
+	movl	8(%sp),%d0	/* ss_flags */
 	andl	#1,%d0		/* extract SS_ONSTACK */
-	lea	%sp@(12),%sp	/* pop stack_t */
+	lea	12(%sp),%sp	/* pop stack_t */
 	/* Get pointer to jmp_buf; a sigcontext is at the beginning. */
-	movl	%sp@(4),%a0
+	movl	4(%sp),%a0
-	movl	%d0,%a0@	/* store onstack */
+	movl	%d0,(%a0)	/* store onstack */
-	clrl	%a0@(4)		/* unused word (old style signal mask) */
+	clrl	4(%a0)		/* unused word (old style signal mask) */
 	/* Get the signal mask. */
-	pea	%a0@(28)	/* oset = &sc.sc_mask */
+	pea	28(%a0)	/* oset = &sc.sc_mask */
-	movl	#0,%sp@-	/* set = NULL */
+	movl	#0,-(%sp)	/* set = NULL */
-	movl	#0,%sp@-	/* action = 0 <ignored> */
+	movl	#0,-(%sp)	/* action = 0 <ignored> */
 	jbsr	PIC_PLT(_C_LABEL(__sigprocmask14))
 	addl	#12,%sp
-	movl	%sp@(4),%a0	/* get jmp_buf pointer again */
+	movl	4(%sp),%a0	/* get jmp_buf pointer again */
-	lea	%sp@(4),%a1	/* adjust SP since we won't rts */
+	lea	4(%sp),%a1	/* adjust SP since we won't rts */
-	movl	%a1,%a0@(8)	/* save SP */
+	movl	%a1,8(%a0)	/* save SP */
-	movl	%a6,%a0@(12)	/* save FP */
+	movl	%a6,12(%a0)	/* save FP */
-	clrl	%a0@(16)	/* no AP */
+	clrl	16(%a0)	/* no AP */
-	movl	%sp@,%a0@(20)	/* save return PC */
+	movl	(%sp),20(%a0)	/* save return PC */
-	clrl	%a0@(24)	/* clear PS */
+	clrl	24(%a0)	/* clear PS */
 	/* Save remaining non-scratch regs after signal mask. */
-	moveml	#0x3CFC,%a0@(44)
+	moveml	#0x3CFC,44(%a0)
 	clrl	%d0		/* return 0 */
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: swapcontext.S,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: swapcontext.S,v 1.4 2013/07/16 20:49: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.
 @@ -22,28 +22,28 @@
  * 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: swapcontext.S,v 1.3 2008/04/28 20:22:56 martin Exp $")
+	RCSID("$NetBSD: swapcontext.S,v 1.4 2013/07/16 20:49:42 matt Exp $")
 #endif /* LIBC_SCCS && !lint */
 ENTRY(swapcontext)
-	movl	%sp@(4),%sp@-		| push oucp on stack
+	movl	4(%sp),-(%sp)		| push oucp on stack
 	jbsr	PIC_PLT(_C_LABEL(_getcontext))	| getcontext(oucp)
 	tstl	%d0			| OK?
 	jne	L1
-	movl	%sp@,%a0
+	movl	(%sp),%a0
-	addql	#8,%a0@(96)		| adjust saved stack pointer (again)
+	addql	#8,96(%a0)		| adjust saved stack pointer (again)
-	movl	%sp@(4),%a0@(100)	| adjust saved program counter (again)
+	movl	4(%sp),100(%a0)	| adjust saved program counter (again)
-	movl	%sp@(12),%sp@		| push ucp on stack
+	movl	12(%sp),(%sp)		| push ucp on stack
 	jbsr	PIC_PLT(_C_LABEL(setcontext))	| setcontext(ucp)
 L1:	addql	#4,%sp			| pop ucp
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ashldi3.S,v 1.4 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: ashldi3.S,v 1.5 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * 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,34 +27,34 @@
  * 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>
 | d0 msw
 | d1 lsw
 | d2 shift
 | d3 offset (32 - shift)
 ENTRY(__ashldi3)
-	link	%a6,#0
+	link	%fp,#0
-	moveml	%d2-%d4,%sp@-
+	moveml	%d2-%d4,-(%sp)
-	movel	%a6@(8),%d0
+	movel	8(%fp),%d0
-	movel	%a6@(12),%d1
+	movel	12(%fp),%d1
-	movel	%a6@(16),%d2
+	movel	16(%fp),%d2
 	moveq	#32,%d3
 	subl	%d2,%d3
 	jgt	L2
 	negl	%d3
 	movel	%d1,%d0
 	asll	%d3,%d0
 	clrl	%d1
 	jra	L3
 L2:	asll	%d2,%d0
 	movel	%d1,%d4
 	lsrl	%d3,%d4
 	orl	%d4,%d0
 	asll	%d2,%d1
-L3:	moveml	%a6@(-12),%d2-%d4
+L3:	moveml	-12(%fp),%d2-%d4
-	unlk	%a6
+	unlk	%fp
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ashrdi3.S,v 1.4 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: ashrdi3.S,v 1.5 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * 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,35 +27,35 @@
  * 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>
 | d0 msw
 | d1 lsw
 | d2 shift
 | d3 offset (32 - shift)
 ENTRY(__ashrdi3)
-	link	%a6,#0
+	link	%fp,#0
-	moveml	%d2-%d4,%sp@-
+	moveml	%d2-%d4,-(%sp)
-	movel	%a6@(8),%d0
+	movel	8(%fp),%d0
-	movel	%a6@(12),%d1
+	movel	12(%fp),%d1
-	movel	%a6@(16),%d2
+	movel	16(%fp),%d2
 	moveq	#32,%d3
 	subl	%d2,%d3
 	jgt	L2
 	negl	%d3
 	movel	%d0,%d1
 	asrl	%d3,%d1
 	smi	%d0
 	extbl	%d0
 	jra	L3
 L2:	lsrl	%d2,%d1
 	movel	%d0,%d4
 	asll	%d3,%d4
 	orl	%d4,%d1
 	asrl	%d2,%d0
-L3:	moveml	%a6@(-12),%d2-%d4
+L3:	moveml	-12(%fp),%d2-%d4
-	unlk	%a6
+	unlk	%fp
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lshrdi3.S,v 1.5 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: lshrdi3.S,v 1.6 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * 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,34 +27,34 @@
  * 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>
 | d0 msw
 | d1 lsw
 | d2 shift
 | d3 offset (32 - shift)
 ENTRY(__lshrdi3)
-	link	%a6,#0
+	link	%fp,#0
-	moveml	%d2-%d4,%sp@-
+	moveml	%d2-%d4,-(%sp)
-	movel	%a6@(8),%d0
+	movel	8(%fp),%d0
-	movel	%a6@(12),%d1
+	movel	12(%fp),%d1
-	movel	%a6@(16),%d2
+	movel	16(%fp),%d2
 	moveq	#32,%d3
 	subl	%d2,%d3
 	jgt	L2
 	negl	%d3
 	movel	%d0,%d1
 	lsrl	%d3,%d1
 	clrl	%d0
 	jra	L3
 L2:	lsrl	%d2,%d1
 	movel	%d0,%d4
 	asll	%d3,%d4
 	orl	%d4,%d1
 	lsrl	%d2,%d0
-L3:	moveml	%a6@(-12),%d2-%d4
+L3:	moveml	-12(%fp),%d2-%d4
-	unlk	%a6
+	unlk	%fp
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: abs.S,v 1.6 2003/08/07 16:42:12 agc Exp $	*/
+/*	$NetBSD: abs.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,30 +29,30 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)abs.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: abs.S,v 1.6 2003/08/07 16:42:12 agc Exp $")
+	RCSID("$NetBSD: abs.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* labs - long int absolute value */
 ENTRY_NOPROFILE(labs)
 /* fall through to: */
 /* abs - int absolute value */
 ENTRY(abs)
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
 	jge	L1
 	negl	%d0
 L1:
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: llabs.S,v 1.4 2008/08/04 21:29:28 matt Exp $	*/
+/*	$NetBSD: llabs.S,v 1.5 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,35 +29,35 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)abs.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: llabs.S,v 1.4 2008/08/04 21:29:28 matt Exp $")
+	RCSID("$NetBSD: llabs.S,v 1.5 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(llabs, _llabs)
 WEAK_ALIAS(imaxabs, _llabs)
 #endif
 /* llabs - long long int absolute value */
 #ifdef WEAK_ALIAS
 ENTRY(_llabs)
 #else
 ENTRY(llabs)
 #endif
-	movl	%sp@(8),%d1
+	movl	8(%sp),%d1
-	movl	%sp@(4),%d0
+	movl	4(%sp),%d0
 	jge	L1
 	negl	%d1
 	negxl	%d0
 L1:
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: memccpy.S,v 1.1 2001/02/05 00:17:22 scottr Exp $	*/
+/*	$NetBSD: memccpy.S,v 1.2 2013/07/16 20:49:42 matt Exp $	*/
 /*
  * Copyright (C) 1999 Scott Reynolds.  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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -19,64 +19,64 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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>
 #if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: memccpy.S,v 1.1 2001/02/05 00:17:22 scottr Exp $")
+	RCSID("$NetBSD: memccpy.S,v 1.2 2013/07/16 20:49:42 matt Exp $")
 #endif /* LIBC_SCCS and not lint */
 ENTRY(memccpy)
-	movl	%sp@(16),%d0		| count
+	movl	16(%sp),%d0		| count
 	jeq	Lmcbail			| nothing to do
-	movl	%sp@(4),%a0		| a0 = toaddr
+	movl	4(%sp),%a0		| a0 = toaddr
 	subql	#1,%d0			|   prepare count for DBcc loop
-	movl	%sp@(8),%a1		| a1 = fromaddr
+	movl	8(%sp),%a1		| a1 = fromaddr
-	movl	%sp@(12),%d1		| d1 = terminator
+	movl	12(%sp),%d1		| d1 = terminator
 	jeq	Lmcloop			|   handle ASCII NUL specially
-	movl	%d2,%sp@-		| save scratch register
+	movl	%d2,-(%sp)		| save scratch register
 Lmcnzloop:
-	movb	%a1@+,%d2		| move a byte
+	movb	(%a1)+,%d2		| move a byte
-	movb	%d2,%a0@+
+	movb	%d2,(%a0)+
 	cmpb	%d2,%d1			| found the terminator?
 	dbeq	%d0,Lmcnzloop		| if not, keep transferring,
 	jeq	Lmcnzdone		|   otherwise done
 	clrw	%d0			| check to see if more to do
 	subql	#1,%d0
 	jcc	Lmcnzloop		| yes, keep going...
-	movl	%sp@+,%d2		| restore scratch register
+	movl	(%sp)+,%d2		| restore scratch register
 	movql	#0,%d0			| no terminator found, return NULL
 #ifdef __SVR4_ABI__
 	movl	%d0,%a0			| XXX maybe use lea to avoid stall?
 #endif
 	rts
 Lmcloop:
-	movb	%a1@+,%a0@+		| move a byte; was it NUL?
+	movb	(%a1)+,(%a0)+		| move a byte; was it NUL?
 	dbeq	%d0,Lmcloop		| if not, keep transferring,
 	jeq	Lmcdone			|   otherwise done
 	clrw	%d0			| check to see if more to do
 	subql	#1,%d0
 	jcc	Lmcloop			| yes, keep going...
 					| Note: %d0 is now -1!
 	movql	#0,%d0			| no terminator found, return NULL
 Lmcbail:
 #ifdef __SVR4_ABI__
 	movl	%d0,%a0			| XXX maybe use lea to avoid stall?
 #endif
 	rts
 Lmcnzdone:
-	movl	%sp@+,%d2		| restore scratch register
+	movl	(%sp)+,%d2		| restore scratch register
 Lmcdone:
 	movl	%a0,%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: __clone.S,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: __clone.S,v 1.4 2013/07/16 20:49: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 Steve C. Woodford.
+ *
  * 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.
 @@ -30,36 +30,36 @@
  */
 #include <sys/errno.h>
 #include "SYS.h"
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(clone, __clone)
 #endif
 /*
  * int clone(int (*fn)(void *), void *stack, int flags, void *arg);
  */
 ENTRY(__clone)
-	movl	%sp@(4),%d0	/* NULL function pointer? */
+	movl	4(%sp),%d0	/* NULL function pointer? */
 	jeq	2f		/* Yup, bomb out */
 	movl	%d0,%a1
-	movl	%sp@(8),%d0	/* NULL stack? */
+	movl	8(%sp),%d0	/* NULL stack? */
 	jeq	2f		/* Yup, bomb out */
 	movl	%d0,%a0
-	movl	%sp@(16),%a0@-	/* Push clone's `arg' on its new stack */
+	movl	16(%sp),-(%a0)	/* Push clone's `arg' on its new stack */
-	lea	%a0@(-12),%a0	/* Fake syscall args for the clone */
+	lea	-12(%a0),%a0	/* Fake syscall args for the clone */
-	movl	%a0,%sp@-	/* Syscall arg: stack */
+	movl	%a0,-(%sp)	/* Syscall arg: stack */
-	movl	%sp@(16),%sp@-	/* Syscall arg: flags */
+	movl	16(%sp),-(%sp)	/* Syscall arg: flags */
-	clrl	%sp@-		/* Fake return address */
+	clrl	-(%sp)		/* Fake return address */
-	SYSTRAP(__clone)	/* Note: `fn' in a1@ is preserved */
+	SYSTRAP(__clone)	/* Note: `fn' in (a1) is preserved */
-	lea	%sp@(12),%sp	/* Zap syscall args */
+	lea	12(%sp),%sp	/* Zap syscall args */
 	jcs	3f		/* Punt if syscall failed */
 	tstl	%d0
 	jne	1f		/* We're the parent, just return. */
-	jsr	%a1@		/* We're the clone, call the function */
+	jsr	(%a1)		/* We're the clone, call the function */
-	movl	%d0,%sp@-	/* If clone returns, invoke _exit(3) */
+	movl	%d0,-(%sp)	/* If clone returns, invoke _exit(3) */
 	jbsr	PIC_PLT(_C_LABEL(_exit))
 	/* NOTREACHED */
 :	rts
 :	movl	#EINVAL,%d0
 :	jra	PIC_PLT(CERROR)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
+/*	$NetBSD: getcontext.S,v 1.4 2013/07/16 20:49: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.
 @@ -22,26 +22,26 @@
  * 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(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:56 martin Exp $")
+	RCSID("$NetBSD: getcontext.S,v 1.4 2013/07/16 20:49:42 matt Exp $")
 #endif /* SYSLIBC_SCCS && !lint */
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(getcontext, _getcontext)
 #endif
 _SYSCALL(_getcontext,getcontext)
-	movl	%sp@(4),%a0
+	movl	4(%sp),%a0
-	addql	#4,%a0@(96)		| adjust saved stack pointer
+	addql	#4,96(%a0)		| adjust saved stack pointer
-	movl	%sp@,%a0@(100)		| adjust saved program counter
+	movl	(%sp),100(%a0)		| adjust saved program counter
-	clrl	%a0@(36)		| arrange for return value of 0
+	clrl	36(%a0)		| arrange for return value of 0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: __sigtramp2.S,v 1.2 2008/05/02 18:34:17 martin Exp $ */
+/*	$NetBSD: __sigtramp2.S,v 1.3 2013/07/16 20:49:42 matt Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * 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.
 @@ -31,20 +31,20 @@
 /*
  * The m68k signal trampoline is invoked only to return from
  * the signal; the kernel calls the signal handler directly.
+ *
  * On entry, stack looks like:
+ *
  *		ucontext structure			[12+sizeof(siginfo_t)]
  *		siginfo structure			[12]
  *		pointer to ucontext structure		[8]
  *		pointer to siginfo structure		[4]
  *	sp->	signal number				[0]
  */
 ENTRY_NOPROFILE(__sigtramp_siginfo_2)
-	movl	%sp@(8),%a0	/* get pointer to ucontext */
+	movl	8(%sp),%a0	/* get pointer to ucontext */
-	movl	%a0,%sp@(4)	/* put it in the argument slot */
+	movl	%a0,4(%sp)	/* put it in the argument slot */
 				/* fake return address already there */
         movl    #SYS_setcontext,%d0
         trap    #0
-	movl	%d0,%sp@(4)	/* error code */
+	movl	%d0,4(%sp)	/* error code */
 	SYSTRAP(exit)		/* exit */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: __vfork14.S,v 1.9 2003/08/07 16:42:14 agc Exp $	*/
+/*	$NetBSD: __vfork14.S,v 1.10 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,79 +29,66 @@
  * 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)
 #if 0
 	RCSID("from: @(#)Ovfork.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: __vfork14.S,v 1.9 2003/08/07 16:42:14 agc Exp $")
+	RCSID("$NetBSD: __vfork14.S,v 1.10 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*
  * @(#)vfork.s	4.1 (Berkeley) 12/21/80
  * C library -- vfork
  */
 /*
  * pid = vfork();
+ *
  * d1 == 0 in parent process, d1 == 1 in child process.
  * d0 == pid of child in parent, d0 == pid of parent in child.
+ *
  * trickery here, due to keith sklower, uses ret to clear the stack,
  * and then returns with a jump indirect, since only one person can return
  * with a ret off this stack... we do the ret before we vfork!
  */
 ENTRY(__vfork14)
-	movl	%sp@+,%a1
+	movl	(%sp)+,%a1
 	movl	#SYS___vfork14,%d0
 	trap	#0
 	jcs	err
 	subql	#1,%d1	/* from 1 to 0 in child, 0 to -1 in parent */
 	andl	%d1,%d0
-	jmp	%a1@
+	jmp	(%a1)
 err:
 #ifdef	_REENTRANT
 	.globl	_C_LABEL(__errno)
-	movl	%a1,%sp@-
+	movl	%a1,-(%sp)
-	movl	%d0,%sp@-
+	movl	%d0,-(%sp)
 #if defined(PIC) && !defined(__ELF__)
 	movl	#_C_LABEL(_GLOBAL_OFFSET_TABLE_),%a1
 	lea	%pc@(0,a1:l),%a1
 	movl	%a1@(_C_LABEL(__errno):l),%a1
 	jsr	%a1@
 #else
 	jbsr	PIC_PLT(_C_LABEL(__errno))
 #endif	/* PIC */
 #ifdef	__SVR4_ABI__
-	movl	%sp@+,%a0@
+	movl	(%sp)+,(%a0)
 #else
 	movl	%d0,%a1
-	movl	%sp@+,%a1@
+	movl	(%sp)+,(%a1)
 #endif
-	movl	%sp@+,%a1
+	movl	(%sp)+,%a1
 #else
 	.globl	_C_LABEL(errno)
 #ifdef	PIC
-#ifdef	__ELF__
+	lea	(_GLOBAL_OFFSET_TABLE_@GOTPC,%pc),%a0
-	lea	%pc@(_GLOBAL_OFFSET_TABLE_@GOTPC),%a0
+	movl	_C_LABEL(errno)@GOT:w(%a0),%a0
-	movl	%a0@(_C_LABEL(errno)@GOT:w),%a0
+	movl	%d0,(%a0)
 #else
 	movl	#_C_LABEL(_GLOBAL_OFFSET_TABLE_),%a0
 	lea	%pc@(0,a0:l),%a0
 	movl	%a0@(_C_LABEL(errno):w),%a0
 #endif
 	movl	%d0,%a0@
 #else
 	movl	%d0,_C_LABEL(errno)
 #endif	/* PIC */
 #endif	/* _REENTRANT */
 	moveq	#-1,%d0
-	jmp	%a1@
+	jmp	(%a1)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: brk.S,v 1.15 2003/12/26 11:21:48 martin Exp $	*/
+/*	$NetBSD: brk.S,v 1.16 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,66 +29,56 @@
  * 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)
 #if 0
 	RCSID("from: @(#)brk.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: brk.S,v 1.15 2003/12/26 11:21:48 martin Exp $")
+	RCSID("$NetBSD: brk.S,v 1.16 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 	.globl	_end
 	.globl	_C_LABEL(__minbrk)
-	.globl	CURBRK
+	.globl	_C_LABEL(__curbrk)
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(brk, _brk)
 #endif
 	.data
 _C_LABEL(__minbrk):
 	.long	_end
 	.text
 ENTRY(_brk)
 #ifdef	PIC
-#ifdef	__ELF__
+	lea	(_GLOBAL_OFFSET_TABLE_@GOTPC,%pc),%a1
-	lea	%pc@(_GLOBAL_OFFSET_TABLE_@GOTPC),%a1
+	movl	_C_LABEL(__minbrk)@GOT:w(%a1),%a0
-	movl	%a1@(_C_LABEL(__minbrk)@GOT:w),%a0
+	movl	(%a0),%d0
 #else
 	movl	#_C_LABEL(_GLOBAL_OFFSET_TABLE_),%a1
 	lea	%pc@(0,a1:l),%a1
 	movl	%a1@(_C_LABEL(__minbrk):w),%a0
 #endif
 	movl	%a0@,%d0
 #else
 	movl	_C_LABEL(__minbrk),%d0
 #endif
-	cmpl	%sp@(4),%d0
+	cmpl	4(%sp),%d0
 	jls	ok
-	movl	%d0,%sp@(4)
+	movl	%d0,4(%sp)
 ok:
 	movl	#SYS_break,%d0
 	trap	#0
 	jcs	err
 #ifdef	PIC
-#ifdef	__ELF__
+	movl	_C_LABEL(__curbrk)@GOT:w(%a1),%a0
-	movl	%a1@(CURBRK@GOT:w),%a0
+	movl	4(%sp),(%a0)
 #else
 	movl	%a1@(CURBRK:w),%a0
 #endif
 	movl	%sp@(4),%a0@
 #else
-	movl	%sp@(4),CURBRK
+	movl	4(%sp),_C_LABEL(__curbrk)
 #endif
 	clrl	%d0
 	rts
 err:
 	jra	PIC_PLT(CERROR)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cerror.S,v 1.15 2009/10/03 22:28:33 phx Exp $	*/
+/*	$NetBSD: cerror.S,v 1.16 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,58 +29,45 @@
  * 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)
 #if 0
 	RCSID("from: @(#)cerror.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: cerror.S,v 1.15 2009/10/03 22:28:33 phx Exp $")
+	RCSID("$NetBSD: cerror.S,v 1.16 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #ifdef	_REENTRANT
 	.globl	_C_LABEL(__errno)
 #else
 	.globl	_C_LABEL(errno)
 #endif
 _ENTRY(CERROR)
 #ifdef	_REENTRANT
-	movl	%d0,%sp@-
+	movl	%d0,-(%sp)
 #if defined(PIC) && !defined(__ELF__)
 	movl	#_C_LABEL(_GLOBAL_OFFSET_TABLE_),%a0
 	lea	%pc@(0,%a0:l),%a0
 	movl	%a0@(_C_LABEL(__errno):l),%a0
 	jsr	%a0@
 #else
 	jbsr	PIC_PLT(_C_LABEL(__errno))
 #endif
 #ifndef	__SVR4_ABI__
 	movl	%d0,%a0
 #endif
-	movl	%sp@+,%a0@
+	movl	(%sp)+,(%a0)
 #else
 #ifdef	PIC
-#ifdef	__ELF__
+	lea	(_GLOBAL_OFFSET_TABLE_@GOTPC,%pc),%a0
-	lea	%pc@(_GLOBAL_OFFSET_TABLE_@GOTPC),%a0
+	movl	_C_LABEL(errno)@GOT:w(%a0),%a0
-	movl	%a0@(_C_LABEL(errno)@GOT:w),%a0
+	movl	%d0,(%a0)
 #else
 	movl	#_C_LABEL(_GLOBAL_OFFSET_TABLE_),%a0
 	lea	%pc@(0,a0:l),%a0
 	movl	%a0@(_C_LABEL(errno):w),%a0
 #endif
 	movl	%d0,%a0@
 #else
 	movl	%d0,_C_LABEL(errno)
 #endif
 #endif	/* _REENTRANT */
 	movl	#-1,%d0
 	movl	#-1,%d1
 #ifdef	__SVR4_ABI__
 	movl	%d0,%a0
 #endif
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pipe.S,v 1.6 2003/08/07 16:42:14 agc Exp $	*/
+/*	$NetBSD: pipe.S,v 1.7 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * 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)
 #if 0
 	RCSID("from: @(#)pipe.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: pipe.S,v 1.6 2003/08/07 16:42:14 agc Exp $")
+	RCSID("$NetBSD: pipe.S,v 1.7 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(pipe, _pipe)
 #endif
 _SYSCALL(_pipe,pipe)
-	movl	%sp@(4),%a0
+	movl	4(%sp),%a0
-	movl	%d0,%a0@+
+	movl	%d0,(%a0)+
-	movl	%d1,%a0@
+	movl	%d1,(%a0)
 	clrl	%d0
 	rts

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptrace.S,v 1.11 2003/08/07 16:42:14 agc Exp $	*/
+/*	$NetBSD: ptrace.S,v 1.12 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,58 +29,45 @@
  * 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)
 #if 0
 	RCSID("from: @(#)ptrace.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: ptrace.S,v 1.11 2003/08/07 16:42:14 agc Exp $")
+	RCSID("$NetBSD: ptrace.S,v 1.12 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 #ifdef	_REENTRANT
 	.globl	_C_LABEL(__errno)
 #else
 	.globl	_C_LABEL(errno)
 #endif
 ENTRY(ptrace)
 #ifdef	_REENTRANT
 #if defined(PIC) && !defined(__ELF__)
 	movl	#_C_LABEL(_GLOBAL_OFFSET_TABLE_),%a0
 	lea	%pc@(0,%a0:l),%a0
 	movl	%a0@(_C_LABEL(__errno):l),%a0
 	jsr	%a0@
 #else
 	jbsr	PIC_PLT(_C_LABEL(__errno))
 #endif	/* PIC */
 #ifndef	__SVR4_ABI__
 	movl	%d0,%a0
 #endif
-	clrl	%a0@
+	clrl	(%a0)
 #else
 #ifdef	PIC
-#ifdef	__ELF__
+	lea	(_GLOBAL_OFFSET_TABLE_@GOTPC,%pc),%a0
-	lea	%pc@(_GLOBAL_OFFSET_TABLE_@GOTPC),%a0
+	movl	_C_LABEL(errno)@GOT:w(%a0),%a0
-	movl	%a0@(_C_LABEL(errno)@GOT:w),%a0
+	clrl	(%a0)
 #else
 	movl	#_C_LABEL(_GLOBAL_OFFSET_TABLE_),%a0
 	lea	%pc@(0,%a0:l),%a0
 	movl	%a0@(_C_LABEL(errno):w),%a0
 #endif
 	clrl	%a0@
 #else
 	clrl	_C_LABEL(errno)
 #endif	/* PIC */
 #endif	/* _REENTRANT */
 	movl	#SYS_ptrace,%d0
 	trap	#0
 	jcs	err
 	rts
 err:
 	jra	PIC_PLT(CERROR)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sbrk.S,v 1.14 2003/08/07 16:42:14 agc Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.15 2013/07/16 20:49:42 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -29,60 +29,55 @@
  * 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)
 #if 0
 	RCSID("from: @(#)sbrk.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: sbrk.S,v 1.14 2003/08/07 16:42:14 agc Exp $")
+	RCSID("$NetBSD: sbrk.S,v 1.15 2013/07/16 20:49:42 matt Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 	.globl	_end
-	.globl	CURBRK
+	.globl	_C_LABEL(__curbrk)
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(sbrk, _sbrk)
 #endif
 	.data
-CURBRK:	.long	_end
+_C_LABEL(__curbrk):
 	.long	_end
 	.text
 ENTRY(_sbrk)
 #ifdef	PIC
-#ifdef	__ELF__
+	lea	(_GLOBAL_OFFSET_TABLE_@GOTPC,%pc),%a1
-	lea	%pc@(_GLOBAL_OFFSET_TABLE_@GOTPC),%a1
+	movl	_C_LABEL(__curbrk)@GOT:w(%a1),%a1
-	movl	%a1@(CURBRK@GOT:w),%a1
+	movl	(%a1),%d0
 #else
-	movl	#_C_LABEL(_GLOBAL_OFFSET_TABLE_),%a1
+	movl	_C_LABEL(__curbrk),%d0
 	lea	%pc@(0,%a1:l),%a1
 	movl	%a1@(CURBRK:w),%a1
 #endif
-	movl	%a1@,%d0
+	addl	%d0,4(%sp)
 #else
 	movl	CURBRK,%d0
 #endif
 	addl	%d0,%sp@(4)
 	movl	#SYS_break,%d0
 	trap	#0
 	jcs 	err
 #ifdef	PIC
-	movl	%a1@,%d0
+	movl	(%a1),%d0
-	movl	%sp@(4),%a1@
+	movl	4(%sp),(%a1)
 #else
-	movl	CURBRK,%d0
+	movl	_C_LABEL(__curbrk),%d0
-	movl	%sp@(4),CURBRK
+	movl	4(%sp),_C_LABEL(__curbrk)
 #endif
 #ifdef	__SVR4_ABI__
 	movl	%d0,%a0
 #endif
 	rts
 err:
 	jra	PIC_PLT(CERROR)

 @@ -1,23 +1,23 @@
-/*	$NetBSD: fpsetmask.S,v 1.7 2002/01/13 21:45:44 thorpej Exp $	*/
+/*	$NetBSD: fpsetmask.S,v 1.8 2013/07/16 20:49:42 matt Exp $	*/
 /*
  * Written by Charles M. Hannum, Apr 9, 1995
  * Public Domain.
  */
 #include <machine/asm.h>
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(fpsetmask, _fpsetmask)
 ENTRY(_fpsetmask)
 #else
 ENTRY(fpsetmask)
 #endif
-	movel %d2,%sp@-
+	movel %d2,-(%sp)
 	fmovel %fpcr,%d1
-	movel %sp@(8),%d2
+	movel 8(%sp),%d2
 	bfextu %d1{#18:#5},%d0
 	bfins %d2,%d1{#18:#5}
-	movel %sp@+,%d2
+	movel (%sp)+,%d2
 	fmovel %d1,%fpcr
 	rts

 @@ -1,32 +1,32 @@
-/*	$NetBSD: flt_rounds_softfloat.S,v 1.2 2004/09/26 21:13:27 jmmv Exp $	*/
+/*	$NetBSD: flt_rounds_softfloat.S,v 1.3 2013/07/16 20:49:42 matt Exp $	*/
 /*
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  * Broken by Bruce O'Neel Aug 4 2003
 	gcc no longer seems to export fpCCR so this fails.
 	for now just return 0.
  */
 #include <machine/asm.h>
 	.text
 	.even
 	/* NB: this is tied to the gcc-2.95 lb1sf68.asm: */
 _map:
 	.byte 1		/* round to nearest */
 	.byte 0		/* round to zero */
 	.byte 2		/* round to positive infinity */
 	.byte 3		/* round to negative infinity */
 ENTRY(__flt_rounds)
 	/* lea	_C_LABEL(_fpCCR),%a0	| check the rounding mode */
-	/* movew	%a0@(6),%d0	| rounding mode in d0 */
+	/* movew	6(%a0),%d0	| rounding mode in d0 */
 	/* lea	_map,%a0 */
 	moveb	#0,%d0
 	rts

 @@ -1,20 +1,20 @@
-/*	$NetBSD: swab.S,v 1.7 1999/10/25 23:48:16 thorpej Exp $	*/
+/*	$NetBSD: swab.S,v 1.8 2013/07/16 20:49:42 matt Exp $	*/
 #include <machine/asm.h>
 ENTRY(swab)
-	movl	%sp@(4),%a0		| source
+	movl	4(%sp),%a0		| source
-	movl	%sp@(8),%a1		| destination
+	movl	8(%sp),%a1		| destination
-	movl	%sp@(12),%d0		| count
+	movl	12(%sp),%d0		| count
 	lsrl	#1,%d0			| count is in bytes; we need words
 	jeq	swdone
 swloop:
-	movw	%a0@+,%d1
+	movw	(%a0)+,%d1
 	rorw	#8,%d1
-	movw	%d1,%a1@+
+	movw	%d1,(%a1)+
 	subql	#1,%d0
 	jne	swloop
 swdone:
 	rts