Module Name: src
Committed By: matt
Date: Tue Jan 25 04:45:29 UTC 2011
Modified Files:
src/common/lib/libc/arch/vax/gen: bswap16.S bswap32.S bswap64.S udiv.S
urem.S
src/common/lib/libc/arch/vax/string: memcpy.S memmove.S memset.S
Log Message:
Use END(sym)
use RCSID
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/vax/gen/bswap16.S \
src/common/lib/libc/arch/vax/gen/bswap32.S \
src/common/lib/libc/arch/vax/gen/bswap64.S \
src/common/lib/libc/arch/vax/gen/udiv.S \
src/common/lib/libc/arch/vax/gen/urem.S
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/vax/string/memcpy.S \
src/common/lib/libc/arch/vax/string/memmove.S
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/vax/string/memset.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/vax/gen/bswap16.S
diff -u src/common/lib/libc/arch/vax/gen/bswap16.S:1.2 src/common/lib/libc/arch/vax/gen/bswap16.S:1.3
--- src/common/lib/libc/arch/vax/gen/bswap16.S:1.2 Mon Apr 28 20:22:52 2008
+++ src/common/lib/libc/arch/vax/gen/bswap16.S Tue Jan 25 04:45:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap16.S,v 1.2 2008/04/28 20:22:52 martin Exp $ */
+/* $NetBSD: bswap16.S,v 1.3 2011/01/25 04:45:28 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,14 +31,17 @@
#include <machine/asm.h>
+RCSID("$NetBSD: bswap16.S,v 1.3 2011/01/25 04:45:28 matt Exp $")
+
#if defined(_KERNEL) || defined(_STANDALONE)
-ENTRY(_C_LABEL(bswap16), 0)
+ALTENTRY(_C_LABEL(bswap16))
#else
ALTENTRY(_C_LABEL(ntohs))
ALTENTRY(_C_LABEL(htons))
-ENTRY(_C_LABEL(__bswap16), 0)
#endif
+ENTRY(_C_LABEL(__bswap16), 0)
movl 4(%ap), %r1
extzv $8, $8, %r1, %r0
insv %r1, $8, $8, %r0
ret
+END(_C_LABEL(__bswap16))
Index: src/common/lib/libc/arch/vax/gen/bswap32.S
diff -u src/common/lib/libc/arch/vax/gen/bswap32.S:1.2 src/common/lib/libc/arch/vax/gen/bswap32.S:1.3
--- src/common/lib/libc/arch/vax/gen/bswap32.S:1.2 Mon Apr 28 20:22:52 2008
+++ src/common/lib/libc/arch/vax/gen/bswap32.S Tue Jan 25 04:45:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap32.S,v 1.2 2008/04/28 20:22:52 martin Exp $ */
+/* $NetBSD: bswap32.S,v 1.3 2011/01/25 04:45:28 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,18 +31,18 @@
#include <machine/asm.h>
+RCSID("$NetBSD: bswap32.S,v 1.3 2011/01/25 04:45:28 matt Exp $")
+
#if defined(_KERNEL) || defined(_STANDALONE)
-ENTRY(_C_LABEL(bswap32), 0)
+ALTENTRY(_C_LABEL(bswap32))
#else
-#if BYTE_ORDER == LITTLE_ENDIAN
ALTENTRY(_C_LABEL(ntohl))
ALTENTRY(_C_LABEL(htonl))
#endif
ENTRY(_C_LABEL(__bswap32), 0)
-#endif
rotl $-8, 4(%ap), %r0
insv %r0, $16, $8, %r0
rotl $8, 4(%ap), %r1
movb %r1, %r0
ret
-
+END(_C_LABEL(__bswap32))
Index: src/common/lib/libc/arch/vax/gen/bswap64.S
diff -u src/common/lib/libc/arch/vax/gen/bswap64.S:1.2 src/common/lib/libc/arch/vax/gen/bswap64.S:1.3
--- src/common/lib/libc/arch/vax/gen/bswap64.S:1.2 Sat Dec 24 08:33:32 2005
+++ src/common/lib/libc/arch/vax/gen/bswap64.S Tue Jan 25 04:45:28 2011
@@ -1,11 +1,9 @@
/* Written by Anders Magnusson. Public Domain */
-#if defined(LIBC_SCCS) && !defined(lint)
- .asciz "$NetBSD: bswap64.S,v 1.2 2005/12/24 08:33:32 matt Exp $"
-#endif /* LIBC_SCCS and not lint */
-
#include <machine/asm.h>
+RCSID("$NetBSD: bswap64.S,v 1.3 2011/01/25 04:45:28 matt Exp $")
+
ENTRY(bswap64, 0)
movq 4(%ap),%r3
rotl $-8,%r3,%r1
@@ -17,3 +15,4 @@
rotl $8,%r4,%r2
movb %r2,%r0
ret
+END(bswap64)
Index: src/common/lib/libc/arch/vax/gen/udiv.S
diff -u src/common/lib/libc/arch/vax/gen/udiv.S:1.2 src/common/lib/libc/arch/vax/gen/udiv.S:1.3
--- src/common/lib/libc/arch/vax/gen/udiv.S:1.2 Sat Dec 24 08:33:32 2005
+++ src/common/lib/libc/arch/vax/gen/udiv.S Tue Jan 25 04:45:28 2011
@@ -30,10 +30,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
+#include <machine/asm.h>
+
/* .asciz "@(#)udiv.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: udiv.S,v 1.2 2005/12/24 08:33:32 matt Exp $"
-#endif /* LIBC_SCCS and not lint */
+RCSID("$NetBSD: udiv.S,v 1.3 2011/01/25 04:45:28 matt Exp $")
/*
* Unsigned division, PCC flavor.
@@ -41,16 +41,10 @@
* audiv() takes a pointer to a dividend and an ordinary divisor.
*/
-#include <machine/asm.h>
-
#define DIVIDEND 4(%ap)
#define DIVISOR 8(%ap)
-#ifdef __ELF__
ASENTRY(__udiv,0)
-#else
-ASENTRY(udiv,0)
-#endif
movl DIVISOR,%r2
jlss Leasy # big divisor: settle by comparison
movl DIVIDEND,%r0
@@ -69,12 +63,9 @@
Lone:
movl $1,%r0
ret
+END(__udiv)
-#ifdef __ELF__
ASENTRY(__audiv,0)
-#else
-ASENTRY(audiv,0)
-#endif
movl DIVIDEND,%r3
movl DIVISOR,%r2
jlss La_easy # big divisor: settle by comparison
@@ -98,3 +89,4 @@
movl $1,%r0
movl %r0,(%r3)
ret
+END(__audiv)
Index: src/common/lib/libc/arch/vax/gen/urem.S
diff -u src/common/lib/libc/arch/vax/gen/urem.S:1.2 src/common/lib/libc/arch/vax/gen/urem.S:1.3
--- src/common/lib/libc/arch/vax/gen/urem.S:1.2 Sat Dec 24 08:33:32 2005
+++ src/common/lib/libc/arch/vax/gen/urem.S Tue Jan 25 04:45:28 2011
@@ -30,13 +30,11 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
- /* .asciz "@(#)urem.s 8.1 (Berkeley) 6/4/93" */
- .asciz "$NetBSD: urem.S,v 1.2 2005/12/24 08:33:32 matt Exp $"
-#endif /* LIBC_SCCS and not lint */
-
#include <machine/asm.h>
+ /* .asciz "@(#)urem.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: urem.S,v 1.3 2011/01/25 04:45:28 matt Exp $")
+
/*
* Unsigned modulus, PCC flavor.
* urem() takes an ordinary dividend/divisor pair;
@@ -46,11 +44,7 @@
#define DIVIDEND 4(%ap)
#define DIVISOR 8(%ap)
-#ifdef __ELF__
ASENTRY(__urem,0)
-#else
-ASENTRY(urem,0)
-#endif
movl DIVISOR,%r2
jlss Leasy # big divisor: settle by comparison
movl DIVIDEND,%r0
@@ -69,12 +63,9 @@
movl DIVIDEND,%r0 # if divisor is bigger, return dividend
Ldifference:
ret
+END(__urem)
-#ifdef __ELF__
ASENTRY(__aurem,0)
-#else
-ASENTRY(aurem,0)
-#endif
movl DIVIDEND,%r3
movl DIVISOR,%r2
jlss La_easy # big divisor: settle by comparison
@@ -98,3 +89,4 @@
La_dividend:
movl (%r3),%r0
ret
+END(__aurem)
Index: src/common/lib/libc/arch/vax/string/memcpy.S
diff -u src/common/lib/libc/arch/vax/string/memcpy.S:1.2 src/common/lib/libc/arch/vax/string/memcpy.S:1.3
--- src/common/lib/libc/arch/vax/string/memcpy.S:1.2 Sat Dec 24 08:33:32 2005
+++ src/common/lib/libc/arch/vax/string/memcpy.S Tue Jan 25 04:45:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy.S,v 1.2 2005/12/24 08:33:32 matt Exp $ */
+/* $NetBSD: memcpy.S,v 1.3 2011/01/25 04:45:28 matt Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,9 +28,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
- .asciz "@(#)memcpy.s 8.1 (Berkeley) 6/4/93"
-#endif /* LIBC_SCCS and not lint */
+#include <machine/asm.h>
+
+/* .asciz "@(#)memcpy.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: memcpy.S,v 1.3 2011/01/25 04:45:28 matt Exp $")
/*
* void *memcpy(dst, src, size)
@@ -40,8 +41,6 @@
* of some extra memory references and branches when count >= 65536.
*/
-#include <machine/asm.h>
-
ENTRY(memcpy, 0)
movzwl $65535,%r0 /* %r0 = 64K (needed below) */
movq 8(%ap),%r1 /* %r1 = src, %r2 = length */
@@ -88,3 +87,4 @@
subl2 %r0,%r1
subl2 %r0,%r3
brb 5b
+END(memcpy)
Index: src/common/lib/libc/arch/vax/string/memmove.S
diff -u src/common/lib/libc/arch/vax/string/memmove.S:1.2 src/common/lib/libc/arch/vax/string/memmove.S:1.3
--- src/common/lib/libc/arch/vax/string/memmove.S:1.2 Sat Dec 24 08:33:32 2005
+++ src/common/lib/libc/arch/vax/string/memmove.S Tue Jan 25 04:45:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: memmove.S,v 1.2 2005/12/24 08:33:32 matt Exp $ */
+/* $NetBSD: memmove.S,v 1.3 2011/01/25 04:45:28 matt Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,9 +28,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
- .asciz "@(#)memmove.s 8.1 (Berkeley) 6/4/93"
-#endif /* LIBC_SCCS and not lint */
+#include <machine/asm.h>
+
+/* .asciz "@(#)memmove.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: memmove.S,v 1.3 2011/01/25 04:45:28 matt Exp $")
/*
* void *memmove(dst, src, size)
@@ -40,8 +41,6 @@
* of some extra memory references and branches when count >= 65536.
*/
-#include <machine/asm.h>
-
ENTRY(memmove, 0)
movzwl $65535,%r0 /* %r0 = 64K (needed below) */
movq 8(%ap),%r1 /* %r1 = src, %r2 = length */
@@ -88,3 +87,4 @@
subl2 %r0,%r1
subl2 %r0,%r3
brb 5b
+END(memmove)
Index: src/common/lib/libc/arch/vax/string/memset.S
diff -u src/common/lib/libc/arch/vax/string/memset.S:1.1 src/common/lib/libc/arch/vax/string/memset.S:1.2
--- src/common/lib/libc/arch/vax/string/memset.S:1.1 Fri Mar 12 09:12:34 2010
+++ src/common/lib/libc/arch/vax/string/memset.S Tue Jan 25 04:45:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: memset.S,v 1.1 2010/03/12 09:12:34 uwe Exp $ */
+/* $NetBSD: memset.S,v 1.2 2011/01/25 04:45:28 matt Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,13 +28,12 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
- .asciz "@(#)memset.s 8.1 (Berkeley) 6/4/93"
-#endif /* LIBC_SCCS and not lint */
+#include <machine/asm.h>
-/* void *memset(base, c, length) */
+/* .asciz "@(#)memset.s 8.1 (Berkeley) 6/4/93" */
+RCSID("$NetBSD: memset.S,v 1.2 2011/01/25 04:45:28 matt Exp $")
-#include <machine/asm.h>
+/* void *memset(base, c, length) */
ENTRY(memset, 0)
movl 4(%ap),%r3
@@ -50,3 +49,4 @@
subl2 %r0,12(%ap)
movc5 $0,(%r3),%r1,%r0,(%r3)
jbr 1b
+END(memset)
