Module Name: src
Committed By: matt
Date: Tue Jul 16 23:24:19 UTC 2013
Modified Files:
src/common/lib/libc/arch/m68k/atomic: atomic_add.S atomic_and.S
atomic_cas.S atomic_cas_68000.S atomic_dec.S atomic_inc.S
atomic_or.S atomic_swap.S
src/common/lib/libc/arch/m68k/gen: bswap16.S bswap32.S bswap64.S
divsi3.S modsi3.S mulsi3.S udivsi3.S umodsi3.S
src/common/lib/libc/arch/m68k/net: htonl.S htons.S ntohl.S ntohs.S
src/common/lib/libc/arch/m68k/string: bcmp.S bcopy.S bzero.S ffs.S
memcmp.S memset.S strcat.S strchr.S strcmp.S strcpy.S strlen.S
strncmp.S strncpy.S strrchr.S
Log Message:
Add END(func)
Fix some straggling %r@<eol> to (%r)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/m68k/atomic/atomic_add.S \
src/common/lib/libc/arch/m68k/atomic/atomic_dec.S \
src/common/lib/libc/arch/m68k/atomic/atomic_inc.S \
src/common/lib/libc/arch/m68k/atomic/atomic_swap.S
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/m68k/atomic/atomic_and.S \
src/common/lib/libc/arch/m68k/atomic/atomic_or.S
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/m68k/atomic/atomic_cas.S
cvs rdiff -u -r1.4 -r1.5 \
src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/m68k/gen/bswap16.S \
src/common/lib/libc/arch/m68k/gen/bswap32.S \
src/common/lib/libc/arch/m68k/gen/divsi3.S \
src/common/lib/libc/arch/m68k/gen/mulsi3.S \
src/common/lib/libc/arch/m68k/gen/udivsi3.S \
src/common/lib/libc/arch/m68k/gen/umodsi3.S
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/m68k/gen/bswap64.S
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/m68k/gen/modsi3.S
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/m68k/net/htonl.S \
src/common/lib/libc/arch/m68k/net/htons.S \
src/common/lib/libc/arch/m68k/net/ntohl.S \
src/common/lib/libc/arch/m68k/net/ntohs.S
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/m68k/string/bcmp.S \
src/common/lib/libc/arch/m68k/string/bcopy.S \
src/common/lib/libc/arch/m68k/string/bzero.S \
src/common/lib/libc/arch/m68k/string/ffs.S \
src/common/lib/libc/arch/m68k/string/memset.S \
src/common/lib/libc/arch/m68k/string/strchr.S \
src/common/lib/libc/arch/m68k/string/strcmp.S \
src/common/lib/libc/arch/m68k/string/strncmp.S \
src/common/lib/libc/arch/m68k/string/strrchr.S
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/m68k/string/memcmp.S \
src/common/lib/libc/arch/m68k/string/strcat.S \
src/common/lib/libc/arch/m68k/string/strcpy.S \
src/common/lib/libc/arch/m68k/string/strlen.S \
src/common/lib/libc/arch/m68k/string/strncpy.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/m68k/atomic/atomic_add.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_add.S:1.5 src/common/lib/libc/arch/m68k/atomic/atomic_add.S:1.6
--- src/common/lib/libc/arch/m68k/atomic/atomic_add.S:1.5 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_add.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_add.S,v 1.5 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: atomic_add.S,v 1.6 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,8 +37,9 @@
ENTRY(_atomic_add_32)
movl 4(%sp), %a0
movl 8(%sp), %d0
- addl %d0, %a0@
+ addl %d0, (%a0)
rts
+END(_atomic_add_32)
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)
@@ -52,10 +53,12 @@ ENTRY(_atomic_add_32_nv)
1: movl (%a0), %d0
movl %d0, %d1
addl 8(%sp), %d0
- casl %d1, %d0, %a0@
+ casl %d1, %d0, (%a0)
bne 1b
movl %d0, %a0 /* pointers return also in %a0 */
rts
+END(_atomic_add_32_nv)
+
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)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_dec.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_dec.S:1.5 src/common/lib/libc/arch/m68k/atomic/atomic_dec.S:1.6
--- src/common/lib/libc/arch/m68k/atomic/atomic_dec.S:1.5 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_dec.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_dec.S,v 1.5 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: atomic_dec.S,v 1.6 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -35,8 +35,9 @@
ENTRY(_atomic_dec_32)
movl 4(%sp), %a0
- subql #1, %a0@
+ subql #1, (%a0)
rts
+END(_atomic_dec_32)
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)
@@ -50,10 +51,11 @@ ENTRY(_atomic_dec_32_nv)
1: movl (%a0), %d0
movl %d0, %d1
subql #1, %d0
- casl %d1, %d0, %a0@
+ casl %d1, %d0, (%a0)
bne 1b
movl %d0, %a0 /* pointers return also in %a0 */
rts
+END(_atomic_dec_32_nv)
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)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_inc.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_inc.S:1.5 src/common/lib/libc/arch/m68k/atomic/atomic_inc.S:1.6
--- src/common/lib/libc/arch/m68k/atomic/atomic_inc.S:1.5 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_inc.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_inc.S,v 1.5 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: atomic_inc.S,v 1.6 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -35,8 +35,9 @@
ENTRY(_atomic_inc_32)
movl 4(%sp), %a0
- addql #1, %a0@
+ addql #1, (%a0)
rts
+END(_atomic_inc_32)
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)
@@ -50,10 +51,11 @@ ENTRY(_atomic_inc_32_nv)
1: movl (%a0), %d0
movl %d0, %d1
addql #1, %d0
- casl %d1, %d0, %a0@
+ casl %d1, %d0, (%a0)
bne 1b
movl %d0, %a0 /* pointers return also in %a0 */
rts
+END(_atomic_inc_32_nv)
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)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_swap.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_swap.S:1.5 src/common/lib/libc/arch/m68k/atomic/atomic_swap.S:1.6
--- src/common/lib/libc/arch/m68k/atomic/atomic_swap.S:1.5 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_swap.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap.S,v 1.5 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: atomic_swap.S,v 1.6 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,11 +37,12 @@ ENTRY(_atomic_swap_32)
movl 4(%sp), %a0
1: movl (%a0), %d0
movl 8(%sp), %d1
- casl %d0, %d1, %a0@
+ casl %d0, %d1, (%a0)
bne 1b
/* %d0 now contains the old value */
movl %d0, %a0 /* pointers return also in %a0 */
rts
+END(_atomic_swap_32)
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)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_and.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_and.S:1.7 src/common/lib/libc/arch/m68k/atomic/atomic_and.S:1.8
--- src/common/lib/libc/arch/m68k/atomic/atomic_and.S:1.7 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_and.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_and.S,v 1.7 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: atomic_and.S,v 1.8 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,8 +36,9 @@
ENTRY(_atomic_and_32)
movl 4(%sp), %a0
movl 8(%sp), %d0
- andl %d0, %a0@
+ andl %d0, (%a0)
rts
+END(_atomic_and_32)
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)
@@ -51,9 +52,10 @@ ENTRY(_atomic_and_32_nv)
1: movl (%a0), %d0
movl %d0, %d1
andl 8(%sp), %d0
- casl %d1, %d0, %a0@
+ casl %d1, %d0, (%a0)
bne 1b
rts
+END(_atomic_and_32_nv)
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)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_or.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_or.S:1.7 src/common/lib/libc/arch/m68k/atomic/atomic_or.S:1.8
--- src/common/lib/libc/arch/m68k/atomic/atomic_or.S:1.7 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_or.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_or.S,v 1.7 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: atomic_or.S,v 1.8 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,8 +36,9 @@
ENTRY(_atomic_or_32)
movl 4(%sp), %a0
movl 8(%sp), %d0
- orl %d0, %a0@
+ orl %d0, (%a0)
rts
+END(_atomic_or_32)
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)
@@ -51,7 +52,7 @@ ENTRY(_atomic_or_32_nv)
1: movl (%a0), %d0
movl %d0, %d1
orl 8(%sp), %d0
- casl %d1, %d0, %a0@
+ casl %d1, %d0, (%a0)
bne 1b
rts
ATOMIC_OP_ALIAS(atomic_or_32_nv,_atomic_or_32_nv)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_cas.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_cas.S:1.6 src/common/lib/libc/arch/m68k/atomic/atomic_cas.S:1.7
--- src/common/lib/libc/arch/m68k/atomic/atomic_cas.S:1.6 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_cas.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas.S,v 1.6 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: atomic_cas.S,v 1.7 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -37,10 +37,11 @@ ENTRY(_atomic_cas_32)
movl 4(%sp), %a0
movl 8(%sp), %d0
movl 12(%sp), %d1
- casl %d0, %d1, %a0@
+ casl %d0, %d1, (%a0)
/* %d0 now contains the old value */
movl %d0, %a0 /* pointers return also in %a0 */
rts
+END(_atomic_cas_32)
ATOMIC_OP_ALIAS(atomic_cas_32,_atomic_cas_32)
ATOMIC_OP_ALIAS(atomic_cas_uint,_atomic_cas_32)
Index: src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S
diff -u src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.4 src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.5
--- src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S:1.4 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_68000.S,v 1.4 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: atomic_cas_68000.S,v 1.5 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -46,4 +46,4 @@ RAS_START_ASM_HIDDEN(_atomic_cas)
movl 12(%sp), (%a0) /* *ptr = new */
RAS_END_ASM_HIDDEN(_atomic_cas)
1: rts
-
+END(_atomic_cas_up)
Index: src/common/lib/libc/arch/m68k/gen/bswap16.S
diff -u src/common/lib/libc/arch/m68k/gen/bswap16.S:1.3 src/common/lib/libc/arch/m68k/gen/bswap16.S:1.4
--- src/common/lib/libc/arch/m68k/gen/bswap16.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/gen/bswap16.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap16.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: bswap16.S,v 1.4 2013/07/16 23:24:18 matt Exp $ */
/*
* Copyright (C) 1996 Scott Reynolds. All rights reserved.
@@ -29,10 +29,13 @@
#include <machine/asm.h>
#if defined(_KERNEL) || defined(_STANDALONE)
-_ENTRY(_C_LABEL(bswap16))
+#define BSWAP16 _C_LABEL(bswap16)
#else /* defined(_KERNEL) || defined(_STANDALONE) */
-_ENTRY(_C_LABEL(__bswap16))
+#define BSWAP16 _C_LABEL(__bswap16)
#endif /* defined(_KERNEL) || defined(_STANDALONE) */
+
+_ENTRY(BSWAP16)
movl 4(%sp),%d0
rolw #8,%d0
rts
+END(BSWAP16)
Index: src/common/lib/libc/arch/m68k/gen/bswap32.S
diff -u src/common/lib/libc/arch/m68k/gen/bswap32.S:1.3 src/common/lib/libc/arch/m68k/gen/bswap32.S:1.4
--- src/common/lib/libc/arch/m68k/gen/bswap32.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/gen/bswap32.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap32.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: bswap32.S,v 1.4 2013/07/16 23:24:18 matt Exp $ */
/*
* Copyright (C) 1996 Scott Reynolds. All rights reserved.
@@ -29,12 +29,15 @@
#include <machine/asm.h>
#if defined(_KERNEL) || defined(_STANDALONE)
-_ENTRY(_C_LABEL(bswap32))
+#define BSWAP32 _C_LABEL(bswap32)
#else /* defined(_KERNEL) || defined(_STANDALONE) */
-_ENTRY(_C_LABEL(__bswap32))
+#define BSWAP32 _C_LABEL(__bswap32)
#endif /* defined(_KERNEL) || defined(_STANDALONE) */
+
+_ENTRY(BSWAP32)
movl 4(%sp),%d0
rolw #8,%d0
swap %d0
rolw #8,%d0
rts
+END(BSWAP32)
Index: src/common/lib/libc/arch/m68k/gen/divsi3.S
diff -u src/common/lib/libc/arch/m68k/gen/divsi3.S:1.3 src/common/lib/libc/arch/m68k/gen/divsi3.S:1.4
--- src/common/lib/libc/arch/m68k/gen/divsi3.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/gen/divsi3.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: divsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: divsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,17 +39,19 @@
#if 0
RCSID("from: @(#)divsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: divsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: divsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
/* int / int */
-ENTRY(__divsi3)
#ifndef __mc68010__
+ENTRY(__divsi3)
movel 4(%sp),%d0
divsl 8(%sp),%d0
rts
+END(__divsi3)
#else
+ENTRY(__divsi3)
| NB: this requires that __udivsi3 preserve %a0:
movel 4(%sp), %d1 | load the dividend
bpl 1f
@@ -64,4 +66,5 @@ ENTRY(__divsi3)
3: jmp _C_LABEL(__udivsi3)
Lret: negl %d0 | negate quotient
jmp (%a0)
+END(__divsi3)
#endif /* __mc68010__ */
Index: src/common/lib/libc/arch/m68k/gen/mulsi3.S
diff -u src/common/lib/libc/arch/m68k/gen/mulsi3.S:1.3 src/common/lib/libc/arch/m68k/gen/mulsi3.S:1.4
--- src/common/lib/libc/arch/m68k/gen/mulsi3.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/gen/mulsi3.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mulsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: mulsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)mulsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: mulsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: mulsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -66,3 +66,4 @@ ENTRY(__mulsi3)
addl %a0, %d0 | final result
#endif /* __mc68010__ */
rts
+END(__mulsi3)
Index: src/common/lib/libc/arch/m68k/gen/udivsi3.S
diff -u src/common/lib/libc/arch/m68k/gen/udivsi3.S:1.3 src/common/lib/libc/arch/m68k/gen/udivsi3.S:1.4
--- src/common/lib/libc/arch/m68k/gen/udivsi3.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/gen/udivsi3.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udivsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: udivsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,17 +39,19 @@
#if 0
RCSID("from: @(#)udivsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: udivsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: udivsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
/* unsigned / unsigned */
-ENTRY(__udivsi3)
#ifndef __mc68010__
+ENTRY(__udivsi3)
movel 4(%sp),%d0
divul 8(%sp),%d0
rts
+END(__udivsi3)
#else
+ENTRY(__udivsi3)
movel %d2, -(%sp) | save %d2
movel 12(%sp), %d0 | load divisor
movel 8(%sp), %d1 | load dividend
@@ -123,4 +125,5 @@ ENTRY(__udivsi3)
addl %a1, %d1 | adjust remainder
3: movel (%sp)+, %d2 | restore %d2
rts
+END(__udivsi3)
#endif /* __mc68010__ */
Index: src/common/lib/libc/arch/m68k/gen/umodsi3.S
diff -u src/common/lib/libc/arch/m68k/gen/umodsi3.S:1.3 src/common/lib/libc/arch/m68k/gen/umodsi3.S:1.4
--- src/common/lib/libc/arch/m68k/gen/umodsi3.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/gen/umodsi3.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: umodsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: umodsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,21 +39,24 @@
#if 0
RCSID("from: @(#)umodsi3.s 5.1 (Berkeley) 6/7/90")(
#else
- RCSID("$NetBSD: umodsi3.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: umodsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
/* unsigned % unsigned */
-ENTRY(__umodsi3)
#ifndef __mc68010__
+ENTRY(__umodsi3)
movel 4(%sp),%d1
divull 8(%sp),%d0:%d1
rts
+END(__umodsi3)
#else
+ENTRY(__umodsi3)
| NB: this requires that __udivsi3 preserve the %a0
| register, and that it returns the modulus in %d1:
movel (%sp)+, %a0 | pop the return address
jsr _C_LABEL(__udivsi3)
movel %d1, %d0 | move the modulus into %d0
jmp (%a0) | return
+END(__umodsi3)
#endif /* __mc68010__ */
Index: src/common/lib/libc/arch/m68k/gen/bswap64.S
diff -u src/common/lib/libc/arch/m68k/gen/bswap64.S:1.2 src/common/lib/libc/arch/m68k/gen/bswap64.S:1.3
--- src/common/lib/libc/arch/m68k/gen/bswap64.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/gen/bswap64.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap64.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: bswap64.S,v 1.3 2013/07/16 23:24:18 matt Exp $ */
/*
* Copyright (C) 1996 Scott Reynolds. All rights reserved.
@@ -38,3 +38,4 @@ ENTRY(bswap64)
rolw #8,%d0
rolw #8,%d1
rts
+END(bswap64)
Index: src/common/lib/libc/arch/m68k/gen/modsi3.S
diff -u src/common/lib/libc/arch/m68k/gen/modsi3.S:1.4 src/common/lib/libc/arch/m68k/gen/modsi3.S:1.5
--- src/common/lib/libc/arch/m68k/gen/modsi3.S:1.4 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/gen/modsi3.S Tue Jul 16 23:24:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: modsi3.S,v 1.4 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: modsi3.S,v 1.5 2013/07/16 23:24:18 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,17 +39,19 @@
#if 0
RCSID("from: @(#)modsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: modsi3.S,v 1.4 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: modsi3.S,v 1.5 2013/07/16 23:24:18 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
/* int % int */
-ENTRY(__modsi3)
#ifndef __mc68010__
+ENTRY(__modsi3)
movel 4(%sp),%d1
divsll 8(%sp),%d0:%d1
rts
+END(__modsi3)
#else
+ENTRY(__modsi3)
| NB: this requires that __udivsi3 preserve %a0 and return
| the modulus in %d1:
movel (%sp)+, %a0 | pop return address
@@ -65,4 +67,5 @@ ENTRY(__modsi3)
negl %d1 | negate modulus
Lret: movl %d1, %d0 | move modulus into %d0
jmp (%a0)
+END(__modsi3)
#endif /* __mc68010__ */
Index: src/common/lib/libc/arch/m68k/net/htonl.S
diff -u src/common/lib/libc/arch/m68k/net/htonl.S:1.2 src/common/lib/libc/arch/m68k/net/htonl.S:1.3
--- src/common/lib/libc/arch/m68k/net/htonl.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/net/htonl.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: htonl.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: htonl.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)htonl.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: htonl.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: htonl.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -48,3 +48,4 @@
ENTRY(htonl)
movl 4(%sp),%d0
rts
+END(htonl)
Index: src/common/lib/libc/arch/m68k/net/htons.S
diff -u src/common/lib/libc/arch/m68k/net/htons.S:1.2 src/common/lib/libc/arch/m68k/net/htons.S:1.3
--- src/common/lib/libc/arch/m68k/net/htons.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/net/htons.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: htons.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: htons.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)htons.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: htons.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: htons.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -49,3 +49,4 @@ ENTRY(htons)
clrl %d0
movw 6(%sp),%d0
rts
+END(htons)
Index: src/common/lib/libc/arch/m68k/net/ntohl.S
diff -u src/common/lib/libc/arch/m68k/net/ntohl.S:1.2 src/common/lib/libc/arch/m68k/net/ntohl.S:1.3
--- src/common/lib/libc/arch/m68k/net/ntohl.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/net/ntohl.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntohl.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: ntohl.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)ntohl.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: ntohl.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: ntohl.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -48,3 +48,4 @@
ENTRY(ntohl)
movl 4(%sp),%d0
rts
+END(ntohl)
Index: src/common/lib/libc/arch/m68k/net/ntohs.S
diff -u src/common/lib/libc/arch/m68k/net/ntohs.S:1.2 src/common/lib/libc/arch/m68k/net/ntohs.S:1.3
--- src/common/lib/libc/arch/m68k/net/ntohs.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/net/ntohs.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntohs.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: ntohs.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)ntohs.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: ntohs.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: ntohs.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -49,3 +49,4 @@ ENTRY(ntohs)
clrl %d0
movw 6(%sp),%d0
rts
+END(ntohs)
Index: src/common/lib/libc/arch/m68k/string/bcmp.S
diff -u src/common/lib/libc/arch/m68k/string/bcmp.S:1.3 src/common/lib/libc/arch/m68k/string/bcmp.S:1.4
--- src/common/lib/libc/arch/m68k/string/bcmp.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/bcmp.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmp.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: bcmp.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
RCSID("from: @(#)bcmp.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: bcmp.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: bcmp.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -165,3 +165,4 @@ Lbcdone:
Lbcnoteq:
movql #1,%d0
rts
+END(bcmp)
Index: src/common/lib/libc/arch/m68k/string/bcopy.S
diff -u src/common/lib/libc/arch/m68k/string/bcopy.S:1.3 src/common/lib/libc/arch/m68k/string/bcopy.S:1.4
--- src/common/lib/libc/arch/m68k/string/bcopy.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/bcopy.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopy.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: bcopy.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,20 +68,20 @@
#if 0
RCSID("from: @(#)bcopy.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: bcopy.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: bcopy.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
#ifdef MEMCOPY
-ENTRY(memcpy)
+#define XCOPY memcpy
+#elif defined(MEMMOVE)
+#define XCOPY memmove
#else
-#ifdef MEMMOVE
-ENTRY(memmove)
-#else
-ENTRY(bcopy)
-#endif
+#define XCOPY bcopy
#endif
+
+ENTRY(XCOPY)
#if defined(MEMCOPY) || defined(MEMMOVE)
movl 4(%sp),%a1 | dest address
movl 8(%sp),%a0 | src address
@@ -254,3 +254,4 @@ Lbcbbyte:
#endif
#endif
rts
+END(XCOPY)
Index: src/common/lib/libc/arch/m68k/string/bzero.S
diff -u src/common/lib/libc/arch/m68k/string/bzero.S:1.3 src/common/lib/libc/arch/m68k/string/bzero.S:1.4
--- src/common/lib/libc/arch/m68k/string/bzero.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/bzero.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bzero.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: bzero.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
RCSID("from: @(#)bzero.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: bzero.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: bzero.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -139,3 +139,4 @@ Lbzbyte:
Lbzdone:
movl (%sp)+,%d2
rts
+END(bzero)
Index: src/common/lib/libc/arch/m68k/string/ffs.S
diff -u src/common/lib/libc/arch/m68k/string/ffs.S:1.3 src/common/lib/libc/arch/m68k/string/ffs.S:1.4
--- src/common/lib/libc/arch/m68k/string/ffs.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/ffs.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: ffs.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)ffs.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: ffs.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: ffs.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,6 +58,7 @@ ENTRY(ffs)
bfffo %d1{#0:#32},%d1
subl %d1,%d0
rts
+END(ffs)
#else /* __mc68010__ */
@@ -72,5 +73,6 @@ L1:
subl %d1,%d0
L2:
rts
+END(ffs)
#endif /* __mc68010__ */
Index: src/common/lib/libc/arch/m68k/string/memset.S
diff -u src/common/lib/libc/arch/m68k/string/memset.S:1.3 src/common/lib/libc/arch/m68k/string/memset.S:1.4
--- src/common/lib/libc/arch/m68k/string/memset.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/memset.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: memset.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: memset.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
RCSID("from: @(#)bzero.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: memset.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: memset.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -160,3 +160,4 @@ Lbzdone:
#endif
movl (%sp)+,%d2
rts
+END(memset)
Index: src/common/lib/libc/arch/m68k/string/strchr.S
diff -u src/common/lib/libc/arch/m68k/string/strchr.S:1.3 src/common/lib/libc/arch/m68k/string/strchr.S:1.4
--- src/common/lib/libc/arch/m68k/string/strchr.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/strchr.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strchr.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: strchr.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)index.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: strchr.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: strchr.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,5 +59,6 @@ ixloop:
ixfound:
movl %a0,%d0 | found, return pointer
rts
+END(strchr)
STRONG_ALIAS(index,strchr)
Index: src/common/lib/libc/arch/m68k/string/strcmp.S
diff -u src/common/lib/libc/arch/m68k/string/strcmp.S:1.3 src/common/lib/libc/arch/m68k/string/strcmp.S:1.4
--- src/common/lib/libc/arch/m68k/string/strcmp.S:1.3 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/strcmp.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strcmp.S,v 1.3 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: strcmp.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <machine/asm.h>
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: strcmp.S,v 1.3 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: strcmp.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif /* LIBC_SCCS and not lint */
ENTRY(strcmp)
@@ -69,3 +69,4 @@ L2: movq #0,%d0
movb (%a1),%d0
negl %d0
rts
+END(strcmp)
Index: src/common/lib/libc/arch/m68k/string/strncmp.S
diff -u src/common/lib/libc/arch/m68k/string/strncmp.S:1.3 src/common/lib/libc/arch/m68k/string/strncmp.S:1.4
--- src/common/lib/libc/arch/m68k/string/strncmp.S:1.3 Tue Jul 16 20:49:42 2013
+++ src/common/lib/libc/arch/m68k/string/strncmp.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strncmp.S,v 1.3 2013/07/16 20:49:42 matt Exp $ */
+/* $NetBSD: strncmp.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <machine/asm.h>
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: strncmp.S,v 1.3 2013/07/16 20:49:42 matt Exp $")
+ RCSID("$NetBSD: strncmp.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif /* LIBC_SCCS and not lint */
ENTRY(strncmp)
@@ -76,3 +76,4 @@ L3: scs %d0
EXTBL(%d0)
movb %d1,%d0
rts
+END(strncmp)
Index: src/common/lib/libc/arch/m68k/string/strrchr.S
diff -u src/common/lib/libc/arch/m68k/string/strrchr.S:1.3 src/common/lib/libc/arch/m68k/string/strrchr.S:1.4
--- src/common/lib/libc/arch/m68k/string/strrchr.S:1.3 Tue Jul 16 20:49:42 2013
+++ src/common/lib/libc/arch/m68k/string/strrchr.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strrchr.S,v 1.3 2013/07/16 20:49:42 matt Exp $ */
+/* $NetBSD: strrchr.S,v 1.4 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)rindex.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: strrchr.S,v 1.3 2013/07/16 20:49:42 matt Exp $")
+ RCSID("$NetBSD: strrchr.S,v 1.4 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,5 +56,6 @@ rixnope:
jne rixloop | no, keep going
movl %a0,%d0 | return value
rts
+END(strrchr)
STRONG_ALIAS(rindex,strrchr)
Index: src/common/lib/libc/arch/m68k/string/memcmp.S
diff -u src/common/lib/libc/arch/m68k/string/memcmp.S:1.2 src/common/lib/libc/arch/m68k/string/memcmp.S:1.3
--- src/common/lib/libc/arch/m68k/string/memcmp.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/memcmp.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: memcmp.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: memcmp.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)bcmp.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: memcmp.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: memcmp.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -98,3 +98,4 @@ bcnoteq:
subl %d1,%d0
bcdone:
rts
+END(memcmp)
Index: src/common/lib/libc/arch/m68k/string/strcat.S
diff -u src/common/lib/libc/arch/m68k/string/strcat.S:1.2 src/common/lib/libc/arch/m68k/string/strcat.S:1.3
--- src/common/lib/libc/arch/m68k/string/strcat.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/strcat.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strcat.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: strcat.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)strcpy.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: strcat.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: strcat.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,3 +58,4 @@ Lscloop:
moveal %d0,%a0
#endif
rts
+END(strcat)
Index: src/common/lib/libc/arch/m68k/string/strcpy.S
diff -u src/common/lib/libc/arch/m68k/string/strcpy.S:1.2 src/common/lib/libc/arch/m68k/string/strcpy.S:1.3
--- src/common/lib/libc/arch/m68k/string/strcpy.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/strcpy.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strcpy.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: strcpy.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)strcpy.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: strcpy.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: strcpy.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -54,3 +54,4 @@ Lscloop:
moveal %d0,%a0
#endif
rts
+END(strcpy)
Index: src/common/lib/libc/arch/m68k/string/strlen.S
diff -u src/common/lib/libc/arch/m68k/string/strlen.S:1.2 src/common/lib/libc/arch/m68k/string/strlen.S:1.3
--- src/common/lib/libc/arch/m68k/string/strlen.S:1.2 Tue Jul 16 20:49:41 2013
+++ src/common/lib/libc/arch/m68k/string/strlen.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strlen.S,v 1.2 2013/07/16 20:49:41 matt Exp $ */
+/* $NetBSD: strlen.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)strlen.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: strlen.S,v 1.2 2013/07/16 20:49:41 matt Exp $")
+ RCSID("$NetBSD: strlen.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -52,3 +52,4 @@ Lslloop:
jne Lslloop | no, keep going
addl %a0,%d0
rts
+END(strlen)
Index: src/common/lib/libc/arch/m68k/string/strncpy.S
diff -u src/common/lib/libc/arch/m68k/string/strncpy.S:1.2 src/common/lib/libc/arch/m68k/string/strncpy.S:1.3
--- src/common/lib/libc/arch/m68k/string/strncpy.S:1.2 Tue Jul 16 20:49:42 2013
+++ src/common/lib/libc/arch/m68k/string/strncpy.S Tue Jul 16 23:24:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strncpy.S,v 1.2 2013/07/16 20:49:42 matt Exp $ */
+/* $NetBSD: strncpy.S,v 1.3 2013/07/16 23:24:19 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)strncpy.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: strncpy.S,v 1.2 2013/07/16 20:49:42 matt Exp $")
+ RCSID("$NetBSD: strncpy.S,v 1.3 2013/07/16 23:24:19 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,3 +71,4 @@ Lscpadding:
subql #1,%d1
jcc Lscploop
jra Lscdone
+END(strncpy)
