Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/common/lib/libc/arch/m68k Add END(func)
details: https://anonhg.NetBSD.org/src/rev/3a8ecb3121f9
branches: trunk
changeset: 787971:3a8ecb3121f9
user: matt <matt%NetBSD.org@localhost>
date: Tue Jul 16 23:24:18 2013 +0000
description:
Add END(func)
Fix some straggling %r@<eol> to (%r)
diffstat:
common/lib/libc/arch/m68k/atomic/atomic_add.S | 9 ++++++---
common/lib/libc/arch/m68k/atomic/atomic_and.S | 8 +++++---
common/lib/libc/arch/m68k/atomic/atomic_cas.S | 5 +++--
common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S | 4 ++--
common/lib/libc/arch/m68k/atomic/atomic_dec.S | 8 +++++---
common/lib/libc/arch/m68k/atomic/atomic_inc.S | 8 +++++---
common/lib/libc/arch/m68k/atomic/atomic_or.S | 7 ++++---
common/lib/libc/arch/m68k/atomic/atomic_swap.S | 5 +++--
common/lib/libc/arch/m68k/gen/bswap16.S | 9 ++++++---
common/lib/libc/arch/m68k/gen/bswap32.S | 9 ++++++---
common/lib/libc/arch/m68k/gen/bswap64.S | 3 ++-
common/lib/libc/arch/m68k/gen/divsi3.S | 9 ++++++---
common/lib/libc/arch/m68k/gen/modsi3.S | 9 ++++++---
common/lib/libc/arch/m68k/gen/mulsi3.S | 5 +++--
common/lib/libc/arch/m68k/gen/udivsi3.S | 9 ++++++---
common/lib/libc/arch/m68k/gen/umodsi3.S | 9 ++++++---
common/lib/libc/arch/m68k/net/htonl.S | 5 +++--
common/lib/libc/arch/m68k/net/htons.S | 5 +++--
common/lib/libc/arch/m68k/net/ntohl.S | 5 +++--
common/lib/libc/arch/m68k/net/ntohs.S | 5 +++--
common/lib/libc/arch/m68k/string/bcmp.S | 5 +++--
common/lib/libc/arch/m68k/string/bcopy.S | 17 +++++++++--------
common/lib/libc/arch/m68k/string/bzero.S | 5 +++--
common/lib/libc/arch/m68k/string/ffs.S | 6 ++++--
common/lib/libc/arch/m68k/string/memcmp.S | 5 +++--
common/lib/libc/arch/m68k/string/memset.S | 5 +++--
common/lib/libc/arch/m68k/string/strcat.S | 5 +++--
common/lib/libc/arch/m68k/string/strchr.S | 5 +++--
common/lib/libc/arch/m68k/string/strcmp.S | 5 +++--
common/lib/libc/arch/m68k/string/strcpy.S | 5 +++--
common/lib/libc/arch/m68k/string/strlen.S | 5 +++--
common/lib/libc/arch/m68k/string/strncmp.S | 5 +++--
common/lib/libc/arch/m68k/string/strncpy.S | 5 +++--
common/lib/libc/arch/m68k/string/strrchr.S | 5 +++--
34 files changed, 135 insertions(+), 84 deletions(-)
diffs (truncated from 904 to 300 lines):
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/atomic/atomic_add.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_add.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_add.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/atomic/atomic_and.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_and.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_and.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/atomic/atomic_cas.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_cas.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_cas.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_cas_68000.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
movl 12(%sp), (%a0) /* *ptr = new */
RAS_END_ASM_HIDDEN(_atomic_cas)
1: rts
-
+END(_atomic_cas_up)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/atomic/atomic_dec.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_dec.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_dec.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/atomic/atomic_inc.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_inc.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_inc.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/atomic/atomic_or.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_or.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_or.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/atomic/atomic_swap.S
--- a/common/lib/libc/arch/m68k/atomic/atomic_swap.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/atomic/atomic_swap.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/gen/bswap16.S
--- a/common/lib/libc/arch/m68k/gen/bswap16.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/gen/bswap16.S Tue Jul 16 23:24:18 2013 +0000
@@ -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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/gen/bswap32.S
--- a/common/lib/libc/arch/m68k/gen/bswap32.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/gen/bswap32.S Tue Jul 16 23:24:18 2013 +0000
@@ -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)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/gen/bswap64.S
--- a/common/lib/libc/arch/m68k/gen/bswap64.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/gen/bswap64.S Tue Jul 16 23:24:18 2013 +0000
@@ -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 @@
rolw #8,%d0
rolw #8,%d1
rts
+END(bswap64)
diff -r 5bc560e40f2f -r 3a8ecb3121f9 common/lib/libc/arch/m68k/gen/divsi3.S
--- a/common/lib/libc/arch/m68k/gen/divsi3.S Tue Jul 16 23:01:05 2013 +0000
+++ b/common/lib/libc/arch/m68k/gen/divsi3.S Tue Jul 16 23:24:18 2013 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index