Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libc/arch/arm/string Nuke trailing whitespace.
details: https://anonhg.NetBSD.org/src/rev/00dc4558c46a
branches: trunk
changeset: 581508:00dc4558c46a
user: scw <scw%NetBSD.org@localhost>
date: Thu Jun 02 08:18:20 2005 +0000
description:
Nuke trailing whitespace.
diffstat:
lib/libc/arch/arm/string/memcpy_arm.S | 38 +++++++-------
lib/libc/arch/arm/string/memcpy_xscale.S | 14 ++--
lib/libc/arch/arm/string/memmove.S | 78 ++++++++++++++++----------------
3 files changed, 65 insertions(+), 65 deletions(-)
diffs (truncated from 410 to 300 lines):
diff -r 465116a66446 -r 00dc4558c46a lib/libc/arch/arm/string/memcpy_arm.S
--- a/lib/libc/arch/arm/string/memcpy_arm.S Thu Jun 02 08:03:50 2005 +0000
+++ b/lib/libc/arch/arm/string/memcpy_arm.S Thu Jun 02 08:18:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy_arm.S,v 1.1 2003/10/14 07:51:45 scw Exp $ */
+/* $NetBSD: memcpy_arm.S,v 1.2 2005/06/02 08:18:20 scw Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -83,34 +83,34 @@
/* We have aligned source and destination */
subs r2, r2, #8
blt .Lmemcpy_l12 /* less than 12 bytes (4 from above) */
- subs r2, r2, #0x14
+ subs r2, r2, #0x14
blt .Lmemcpy_l32 /* less than 32 bytes (12 from above) */
stmdb sp!, {r4} /* borrow r4 */
/* blat 32 bytes at a time */
/* XXX for really big copies perhaps we should use more registers */
-.Lmemcpy_loop32:
+.Lmemcpy_loop32:
ldmia r1!, {r3, r4, r12, lr}
stmia r0!, {r3, r4, r12, lr}
ldmia r1!, {r3, r4, r12, lr}
stmia r0!, {r3, r4, r12, lr}
- subs r2, r2, #0x20
+ subs r2, r2, #0x20
bge .Lmemcpy_loop32
cmn r2, #0x10
ldmgeia r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */
stmgeia r0!, {r3, r4, r12, lr}
- subge r2, r2, #0x10
+ subge r2, r2, #0x10
ldmia sp!, {r4} /* return r4 */
.Lmemcpy_l32:
- adds r2, r2, #0x14
+ adds r2, r2, #0x14
/* blat 12 bytes at a time */
.Lmemcpy_loop12:
ldmgeia r1!, {r3, r12, lr}
stmgeia r0!, {r3, r12, lr}
- subges r2, r2, #0x0c
+ subges r2, r2, #0x0c
bge .Lmemcpy_loop12
.Lmemcpy_l12:
@@ -168,9 +168,9 @@
cmp r12, #2
bgt .Lmemcpy_srcul3
beq .Lmemcpy_srcul2
- cmp r2, #0x0c
+ cmp r2, #0x0c
blt .Lmemcpy_srcul1loop4
- sub r2, r2, #0x0c
+ sub r2, r2, #0x0c
stmdb sp!, {r4, r5}
.Lmemcpy_srcul1loop16:
@@ -198,10 +198,10 @@
orr r12, r12, lr, lsl #24
#endif
stmia r0!, {r3-r5, r12}
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lmemcpy_srcul1loop16
ldmia sp!, {r4, r5}
- adds r2, r2, #0x0c
+ adds r2, r2, #0x0c
blt .Lmemcpy_srcul1l4
.Lmemcpy_srcul1loop4:
@@ -225,9 +225,9 @@
b .Lmemcpy_l4
.Lmemcpy_srcul2:
- cmp r2, #0x0c
+ cmp r2, #0x0c
blt .Lmemcpy_srcul2loop4
- sub r2, r2, #0x0c
+ sub r2, r2, #0x0c
stmdb sp!, {r4, r5}
.Lmemcpy_srcul2loop16:
@@ -255,10 +255,10 @@
orr r12, r12, lr, lsl #16
#endif
stmia r0!, {r3-r5, r12}
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lmemcpy_srcul2loop16
ldmia sp!, {r4, r5}
- adds r2, r2, #0x0c
+ adds r2, r2, #0x0c
blt .Lmemcpy_srcul2l4
.Lmemcpy_srcul2loop4:
@@ -282,9 +282,9 @@
b .Lmemcpy_l4
.Lmemcpy_srcul3:
- cmp r2, #0x0c
+ cmp r2, #0x0c
blt .Lmemcpy_srcul3loop4
- sub r2, r2, #0x0c
+ sub r2, r2, #0x0c
stmdb sp!, {r4, r5}
.Lmemcpy_srcul3loop16:
@@ -312,10 +312,10 @@
orr r12, r12, lr, lsl #8
#endif
stmia r0!, {r3-r5, r12}
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lmemcpy_srcul3loop16
ldmia sp!, {r4, r5}
- adds r2, r2, #0x0c
+ adds r2, r2, #0x0c
blt .Lmemcpy_srcul3l4
.Lmemcpy_srcul3loop4:
diff -r 465116a66446 -r 00dc4558c46a lib/libc/arch/arm/string/memcpy_xscale.S
--- a/lib/libc/arch/arm/string/memcpy_xscale.S Thu Jun 02 08:03:50 2005 +0000
+++ b/lib/libc/arch/arm/string/memcpy_xscale.S Thu Jun 02 08:18:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy_xscale.S,v 1.2 2004/08/21 11:22:33 rearnsha Exp $ */
+/* $NetBSD: memcpy_xscale.S,v 1.3 2005/06/02 08:18:20 scw Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -248,10 +248,10 @@
str r6, [r3], #0x04
str r7, [r3], #0x04
.Lmemcpy_bad1:
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lmemcpy_bad1_loop16
- adds r2, r2, #0x10
+ adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
bxeq lr /* Return now if done */
subs r2, r2, #0x04
@@ -309,10 +309,10 @@
str r6, [r3], #0x04
str r7, [r3], #0x04
.Lmemcpy_bad2:
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lmemcpy_bad2_loop16
- adds r2, r2, #0x10
+ adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
bxeq lr /* Return now if done */
subs r2, r2, #0x04
@@ -370,10 +370,10 @@
str r6, [r3], #0x04
str r7, [r3], #0x04
.Lmemcpy_bad3:
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lmemcpy_bad3_loop16
- adds r2, r2, #0x10
+ adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
bxeq lr /* Return now if done */
subs r2, r2, #0x04
diff -r 465116a66446 -r 00dc4558c46a lib/libc/arch/arm/string/memmove.S
--- a/lib/libc/arch/arm/string/memmove.S Thu Jun 02 08:03:50 2005 +0000
+++ b/lib/libc/arch/arm/string/memmove.S Thu Jun 02 08:18:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: memmove.S,v 1.5 2004/08/21 11:25:17 rearnsha Exp $ */
+/* $NetBSD: memmove.S,v 1.6 2005/06/02 08:18:20 scw Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -46,9 +46,9 @@
/* LINTSTUB: Func: void bcopy(void *, void *, size_t) */
ENTRY(bcopy)
/* switch the source and destination registers */
- eor r0, r1, r0
- eor r1, r0, r1
- eor r0, r1, r0
+ eor r0, r1, r0
+ eor r1, r0, r1
+ eor r0, r1, r0
#endif
/* Do the buffers overlap? */
cmp r0, r1
@@ -77,34 +77,34 @@
/* We have aligned source and destination */
subs r2, r2, #8
blt .Lmemmove_fl12 /* less than 12 bytes (4 from above) */
- subs r2, r2, #0x14
+ subs r2, r2, #0x14
blt .Lmemmove_fl32 /* less than 32 bytes (12 from above) */
stmdb sp!, {r4} /* borrow r4 */
/* blat 32 bytes at a time */
/* XXX for really big copies perhaps we should use more registers */
-.Lmemmove_floop32:
+.Lmemmove_floop32:
ldmia r1!, {r3, r4, r12, lr}
stmia r0!, {r3, r4, r12, lr}
ldmia r1!, {r3, r4, r12, lr}
stmia r0!, {r3, r4, r12, lr}
- subs r2, r2, #0x20
+ subs r2, r2, #0x20
bge .Lmemmove_floop32
cmn r2, #0x10
ldmgeia r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */
stmgeia r0!, {r3, r4, r12, lr}
- subge r2, r2, #0x10
+ subge r2, r2, #0x10
ldmia sp!, {r4} /* return r4 */
.Lmemmove_fl32:
- adds r2, r2, #0x14
+ adds r2, r2, #0x14
/* blat 12 bytes at a time */
.Lmemmove_floop12:
ldmgeia r1!, {r3, r12, lr}
stmgeia r0!, {r3, r12, lr}
- subges r2, r2, #0x0c
+ subges r2, r2, #0x0c
bge .Lmemmove_floop12
.Lmemmove_fl12:
@@ -159,9 +159,9 @@
cmp r12, #2
bgt .Lmemmove_fsrcul3
beq .Lmemmove_fsrcul2
- cmp r2, #0x0c
+ cmp r2, #0x0c
blt .Lmemmove_fsrcul1loop4
- sub r2, r2, #0x0c
+ sub r2, r2, #0x0c
stmdb sp!, {r4, r5}
.Lmemmove_fsrcul1loop16:
@@ -189,10 +189,10 @@
orr r12, r12, lr, lsl #24
#endif
stmia r0!, {r3-r5, r12}
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lmemmove_fsrcul1loop16
ldmia sp!, {r4, r5}
- adds r2, r2, #0x0c
+ adds r2, r2, #0x0c
blt .Lmemmove_fsrcul1l4
.Lmemmove_fsrcul1loop4:
@@ -216,9 +216,9 @@
b .Lmemmove_fl4
.Lmemmove_fsrcul2:
- cmp r2, #0x0c
+ cmp r2, #0x0c
blt .Lmemmove_fsrcul2loop4
- sub r2, r2, #0x0c
+ sub r2, r2, #0x0c
stmdb sp!, {r4, r5}
.Lmemmove_fsrcul2loop16:
@@ -246,10 +246,10 @@
orr r12, r12, lr, lsl #16
#endif
stmia r0!, {r3-r5, r12}
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lmemmove_fsrcul2loop16
ldmia sp!, {r4, r5}
- adds r2, r2, #0x0c
+ adds r2, r2, #0x0c
blt .Lmemmove_fsrcul2l4
.Lmemmove_fsrcul2loop4:
@@ -273,9 +273,9 @@
b .Lmemmove_fl4
.Lmemmove_fsrcul3:
- cmp r2, #0x0c
+ cmp r2, #0x0c
blt .Lmemmove_fsrcul3loop4
- sub r2, r2, #0x0c
+ sub r2, r2, #0x0c
stmdb sp!, {r4, r5}
.Lmemmove_fsrcul3loop16:
@@ -303,10 +303,10 @@
orr r12, r12, lr, lsl #8
Home |
Main Index |
Thread Index |
Old Index