Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src switch to ELF naming for local labels.
details: https://anonhg.NetBSD.org/src/rev/33c36baa1749
branches: trunk
changeset: 789781:33c36baa1749
user: chs <chs%NetBSD.org@localhost>
date: Sat Sep 07 19:06:29 2013 +0000
description:
switch to ELF naming for local labels.
diffstat:
common/lib/libc/arch/m68k/gen/divsi3.S | 8 +-
common/lib/libc/arch/m68k/gen/modsi3.S | 8 +-
common/lib/libc/arch/m68k/string/bcmp.S | 72 +++++-----
common/lib/libc/arch/m68k/string/bcopy.S | 90 ++++++------
common/lib/libc/arch/m68k/string/bzero.S | 44 +++---
common/lib/libc/arch/m68k/string/ffs.S | 20 +-
common/lib/libc/arch/m68k/string/memcmp.S | 40 ++--
common/lib/libc/arch/m68k/string/memset.S | 44 +++---
common/lib/libc/arch/m68k/string/strcat.S | 12 +-
common/lib/libc/arch/m68k/string/strcmp.S | 26 +-
common/lib/libc/arch/m68k/string/strcpy.S | 8 +-
common/lib/libc/arch/m68k/string/strlen.S | 8 +-
common/lib/libc/arch/m68k/string/strncmp.S | 38 ++--
common/lib/libc/arch/m68k/string/strncpy.S | 26 +-
sys/arch/m68k/m68k/compat_13_sigreturn13.s | 10 +-
sys/arch/m68k/m68k/compat_16_sigreturn14.s | 10 +-
sys/arch/m68k/m68k/copy.s | 208 ++++++++++++++--------------
sys/arch/m68k/m68k/copypage.s | 22 +-
sys/arch/m68k/m68k/oc_cksum.s | 36 ++--
sys/arch/m68k/m68k/reenter_syscall.s | 11 +-
sys/arch/m68k/m68k/switch_subr.s | 84 +++++-----
sys/arch/mac68k/mac68k/locore.s | 62 ++++----
sys/arch/mac68k/mac68k/pramasm.s | 10 +-
23 files changed, 448 insertions(+), 449 deletions(-)
diffs (truncated from 2325 to 300 lines):
diff -r 194ea7fdf25f -r 33c36baa1749 common/lib/libc/arch/m68k/gen/divsi3.S
--- a/common/lib/libc/arch/m68k/gen/divsi3.S Sat Sep 07 18:55:29 2013 +0000
+++ b/common/lib/libc/arch/m68k/gen/divsi3.S Sat Sep 07 19:06:29 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: divsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $ */
+/* $NetBSD: divsi3.S,v 1.5 2013/09/07 19:06:29 chs Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)divsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: divsi3.S,v 1.4 2013/07/16 23:24:18 matt Exp $")
+ RCSID("$NetBSD: divsi3.S,v 1.5 2013/09/07 19:06:29 chs Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,9 +62,9 @@
2: eorl %d1, %d0
bpl 3f | branch if sgn(divisor) == sgn(dividend)
movel (%sp)+, %a0 | pop return address
- pea (Lret,%pc) | push our return address
+ pea (.Lret,%pc) | push our return address
3: jmp _C_LABEL(__udivsi3)
-Lret: negl %d0 | negate quotient
+.Lret: negl %d0 | negate quotient
jmp (%a0)
END(__divsi3)
#endif /* __mc68010__ */
diff -r 194ea7fdf25f -r 33c36baa1749 common/lib/libc/arch/m68k/gen/modsi3.S
--- a/common/lib/libc/arch/m68k/gen/modsi3.S Sat Sep 07 18:55:29 2013 +0000
+++ b/common/lib/libc/arch/m68k/gen/modsi3.S Sat Sep 07 19:06:29 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: modsi3.S,v 1.5 2013/07/16 23:24:18 matt Exp $ */
+/* $NetBSD: modsi3.S,v 1.6 2013/09/07 19:06:29 chs Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)modsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: modsi3.S,v 1.5 2013/07/16 23:24:18 matt Exp $")
+ RCSID("$NetBSD: modsi3.S,v 1.6 2013/09/07 19:06:29 chs Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,13 +59,13 @@
bpl 1f
negl 4(%sp) | store abs(divisor)
1: movel (%sp), %d0 | load the dividend
- pea (Lret,%pc) | push our return address
+ pea (.Lret,%pc) | push our return address
bpl 2f
negl 4(%sp) | store abs(dividend)
subql #2, (%sp) | adjust return address
2: jmp _C_LABEL(__udivsi3)
negl %d1 | negate modulus
-Lret: movl %d1, %d0 | move modulus into %d0
+.Lret: movl %d1, %d0 | move modulus into %d0
jmp (%a0)
END(__modsi3)
#endif /* __mc68010__ */
diff -r 194ea7fdf25f -r 33c36baa1749 common/lib/libc/arch/m68k/string/bcmp.S
--- a/common/lib/libc/arch/m68k/string/bcmp.S Sat Sep 07 18:55:29 2013 +0000
+++ b/common/lib/libc/arch/m68k/string/bcmp.S Sat Sep 07 19:06:29 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmp.S,v 1.5 2013/07/18 22:42:50 matt Exp $ */
+/* $NetBSD: bcmp.S,v 1.6 2013/09/07 19:06:29 chs 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.5 2013/07/18 22:42:50 matt Exp $")
+ RCSID("$NetBSD: bcmp.S,v 1.6 2013/09/07 19:06:29 chs Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -95,7 +95,7 @@
* if the string is too short.
*/
cmpl #8,%d1
- jlt Lbcbyte
+ jlt .Lbcbyte
#ifdef __mc68010__
/*
@@ -106,91 +106,91 @@
movl %a0,%d0
addl %a1,%d0
btst #0,%d0
- jne Lbcbyte
+ jne .Lbcbyte
#endif /* __mc68010__ */
/* word align */
movl %a0,%d0
btst #0,%d0
- jeq Lbcalgndw
+ jeq .Lbcalgndw
CMPMB((%a0)+,(%a1)+)
- jne Lbcnoteq
+ jne .Lbcnoteq
subql #1,%d1
-Lbcalgndw:
+.Lbcalgndw:
/* long word align */
btst #1,%d0
- jeq Lbcalgndl
+ jeq .Lbcalgndl
CMPMW((%a0)+,(%a1)+)
- jne Lbcnoteq
+ jne .Lbcnoteq
subql #2,%d1
-Lbcalgndl:
+.Lbcalgndl:
/* compare by 8 longwords */
movl %d1,%d0
lsrl #5,%d0 | cnt = len / 32
- jeq Lbclong | if (cnt)
+ jeq .Lbclong | if (cnt)
andl #31,%d1 | len %= 32
subql #1,%d0 | set up for dbf
-Lbc32loop:
+.Lbc32loop:
CMPML((%a0)+,(%a1)+) | compare 1 of 8 longwords
- jne Lbcnoteq | not equal, return non-zero
+ jne .Lbcnoteq | not equal, return non-zero
CMPML((%a0)+,(%a1)+) | compare 2 of 8 longwords
- jne Lbcnoteq
+ jne .Lbcnoteq
CMPML((%a0)+,(%a1)+) | compare 3 of 8 longwords
- jne Lbcnoteq
+ jne .Lbcnoteq
CMPML((%a0)+,(%a1)+) | compare 4 of 8 longwords
- jne Lbcnoteq
+ jne .Lbcnoteq
CMPML((%a0)+,(%a1)+) | compare 5 of 8 longwords
- jne Lbcnoteq
+ jne .Lbcnoteq
CMPML((%a0)+,(%a1)+) | compare 6 of 8 longwords
- jne Lbcnoteq
+ jne .Lbcnoteq
CMPML((%a0)+,(%a1)+) | compare 7 of 8 longwords
- jne Lbcnoteq
+ jne .Lbcnoteq
CMPML((%a0)+,(%a1)+) | compare 8 of 8 longwords
- jne Lbcnoteq
+ jne .Lbcnoteq
#ifndef __mcoldfire__
- dbf %d0,Lbc32loop | till done
+ dbf %d0,.Lbc32loop | till done
clrw %d0
#endif
subql #1,%d0
- jcc Lbc32loop
+ jcc .Lbc32loop
-Lbclong:
+.Lbclong:
/* compare by longwords */
movl %d1,%d0
lsrl #2,%d0 | cnt = len / 4
- jeq Lbcbyte | if (cnt)
+ jeq .Lbcbyte | if (cnt)
subql #1,%d0 | set up for dbf
-Lbclloop:
+.Lbclloop:
CMPML((%a0)+,(%a1)+) | compare a longword
- jne Lbcnoteq | not equal, return non-zero
+ jne .Lbcnoteq | not equal, return non-zero
#ifdef __mcoldfire__
subql #1,%d0 | decrement
- jcc Lbclloop | till done
+ jcc .Lbclloop | till done
#else
- dbf %d0,Lbclloop | till done
+ dbf %d0,.Lbclloop | till done
#endif
andl #3,%d1 | len %= 4
- jeq Lbcdone
+ jeq .Lbcdone
subql #1,%d1 | set up for dbf
-Lbcbloop:
+.Lbcbloop:
CMPMB((%a0)+,(%a1)+) | compare a byte
- jne Lbcnoteq | not equal, return non-zero
-Lbcbyte:
+ jne .Lbcnoteq | not equal, return non-zero
+.Lbcbyte:
#ifdef __mcoldfire__
subql #1,%d0 | decrement
- jcc Lbcbloop | till done
+ jcc .Lbcbloop | till done
#else
- dbf %d1,Lbcbloop
+ dbf %d1,.Lbcbloop
#endif
-Lbcdone:
+.Lbcdone:
#ifdef __mcoldfire__
movl (%sp)+,%d2 | restore temp
#endif
movql #0,%d0
rts
-Lbcnoteq:
+.Lbcnoteq:
movql #1,%d0
rts
END(bcmp)
diff -r 194ea7fdf25f -r 33c36baa1749 common/lib/libc/arch/m68k/string/bcopy.S
--- a/common/lib/libc/arch/m68k/string/bcopy.S Sat Sep 07 18:55:29 2013 +0000
+++ b/common/lib/libc/arch/m68k/string/bcopy.S Sat Sep 07 19:06:29 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopy.S,v 1.5 2013/07/18 22:42:50 matt Exp $ */
+/* $NetBSD: bcopy.S,v 1.6 2013/09/07 19:06:29 chs Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
RCSID("from: @(#)bcopy.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: bcopy.S,v 1.5 2013/07/18 22:42:50 matt Exp $")
+ RCSID("$NetBSD: bcopy.S,v 1.6 2013/09/07 19:06:29 chs Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -92,14 +92,14 @@
movl 12(%sp),%d1 | count
cmpl %a1,%a0 | src after dest?
- jlt Lbcback | yes, must copy backwards
+ 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
+ jlt .Lbcfbyte
#ifdef __mc68010__
/*
@@ -110,29 +110,29 @@
movl %a0,%d0
addl %a1,%d0
btst #0,%d0
- jne Lbcfbyte
+ jne .Lbcfbyte
#endif /* __mc68010__ */
/* word align */
movl %a1,%d0
btst #0,%d0 | if (dst & 1)
- jeq Lbcfalgndw |
+ jeq .Lbcfalgndw |
movb (%a0)+,(%a1)+ | *(char *)dst++ = *(char *) src++
subql #1,%d1 | len--
-Lbcfalgndw:
+.Lbcfalgndw:
/* long word align */
btst #1,%d0 | if (dst & 2)
- jeq Lbcfalgndl
+ jeq .Lbcfalgndl
movw (%a0)+,(%a1)+ | *(short *)dst++ = *(short *) dst++
subql #2,%d1 | len -= 2
-Lbcfalgndl:
+.Lbcfalgndl:
/* copy by 8 longwords */
movel %d1,%d0
lsrl #5,%d0 | cnt = len / 32
- jeq Lbcflong | if (cnt)
+ jeq .Lbcflong | if (cnt)
andl #31,%d1 | len %= 32
subql #1,%d0 | set up for dbf
-Lbcf32loop:
+.Lbcf32loop:
movl (%a0)+,(%a1)+ | copy 8 long words
movl (%a0)+,(%a1)+
movl (%a0)+,(%a1)+
@@ -142,40 +142,40 @@
movl (%a0)+,(%a1)+
movl (%a0)+,(%a1)+
#ifndef __mcoldfire__
- dbf %d0,Lbcf32loop | till done
+ dbf %d0,.Lbcf32loop | till done
clrw %d0
#endif
subql #1,%d0
- jcc Lbcf32loop
+ jcc .Lbcf32loop
Home |
Main Index |
Thread Index |
Old Index