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 Always use bx for returning (this c...
details: https://anonhg.NetBSD.org/src/rev/223e216a726c
branches: trunk
changeset: 569452:223e216a726c
user: rearnsha <rearnsha%NetBSD.org@localhost>
date: Sat Aug 21 11:22:33 2004 +0000
description:
Always use bx for returning (this code is always ARMv5TE.
diffstat:
lib/libc/arch/arm/string/memcpy_xscale.S | 154 +++++++++++++++---------------
1 files changed, 77 insertions(+), 77 deletions(-)
diffs (truncated from 687 to 300 lines):
diff -r a82f9072f1a2 -r 223e216a726c lib/libc/arch/arm/string/memcpy_xscale.S
--- a/lib/libc/arch/arm/string/memcpy_xscale.S Sat Aug 21 11:20:10 2004 +0000
+++ b/lib/libc/arch/arm/string/memcpy_xscale.S Sat Aug 21 11:22:33 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy_xscale.S,v 1.1 2003/10/14 07:51:45 scw Exp $ */
+/* $NetBSD: memcpy_xscale.S,v 1.2 2004/08/21 11:22:33 rearnsha Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -134,7 +134,7 @@
.Lmemcpy_w_lessthan128:
adds r2, r2, #0x80 /* Adjust for extra sub */
ldmeqfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x20
blt .Lmemcpy_w_lessthan32
@@ -159,7 +159,7 @@
.Lmemcpy_w_lessthan32:
adds r2, r2, #0x20 /* Adjust for extra sub */
ldmeqfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
and r4, r2, #0x18
rsbs r4, r4, #0x18
@@ -186,11 +186,11 @@
/* Less than 8 bytes remaining */
ldmfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x04
ldrge ip, [r1], #0x04
strge ip, [r3], #0x04
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
addlt r2, r2, #0x04
ldrb ip, [r1], #0x01
cmp r2, #0x02
@@ -199,7 +199,7 @@
ldrgtb ip, [r1]
strgeb r2, [r3], #0x01
strgtb ip, [r3]
- mov pc, lr
+ bx lr
/*
@@ -253,7 +253,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x04
sublt r1, r1, #0x03
blt .Lmemcpy_bad_done
@@ -314,7 +314,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x04
sublt r1, r1, #0x02
blt .Lmemcpy_bad_done
@@ -375,7 +375,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ bxeq lr /* Return now if done */
subs r2, r2, #0x04
sublt r1, r1, #0x01
blt .Lmemcpy_bad_done
@@ -400,7 +400,7 @@
.Lmemcpy_bad_done:
ldmfd sp!, {r4-r7}
adds r2, r2, #0x04
- moveq pc, lr
+ bxeq lr
ldrb ip, [r1], #0x01
cmp r2, #0x02
ldrgeb r2, [r1], #0x01
@@ -408,7 +408,7 @@
ldrgtb ip, [r1]
strgeb r2, [r3], #0x01
strgtb ip, [r3]
- mov pc, lr
+ bx lr
/*
@@ -420,7 +420,7 @@
#ifndef _STANDALONE
add pc, pc, r2, lsl #2
nop
- mov pc, lr /* 0x00 */
+ bx lr /* 0x00 */
b .Lmemcpy_bytewise /* 0x01 */
b .Lmemcpy_bytewise /* 0x02 */
b .Lmemcpy_bytewise /* 0x03 */
@@ -441,7 +441,7 @@
strb ip, [r3], #0x01
ldrneb ip, [r1], #0x01
bne 1b
- mov pc, lr
+ bx lr
#ifndef _STANDALONE
/******************************************************************************
@@ -462,7 +462,7 @@
*/
ldr r2, [r1]
str r2, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -478,7 +478,7 @@
orr r3, r3, r2, lsl #24 /* r3 = 3210 */
#endif
str r3, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -493,7 +493,7 @@
#endif
orr r3, r2, r3, lsl #16
str r3, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -509,7 +509,7 @@
orr r3, r3, r2, lsl #8 /* r3 = 3210 */
#endif
str r3, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -528,7 +528,7 @@
strb r1, [r0, #0x03]
#endif
strh r3, [r0, #0x01]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -540,7 +540,7 @@
strb r2, [r0]
strh r3, [r0, #0x01]
strb r1, [r0, #0x03]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -561,7 +561,7 @@
#endif
strh r2, [r0, #0x01]
strb r3, [r0, #0x03]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -573,7 +573,7 @@
strb r2, [r0]
strh r3, [r0, #0x01]
strb r1, [r0, #0x03]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -589,7 +589,7 @@
mov r3, r2, lsr #16
strh r3, [r0, #0x02]
#endif
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -607,7 +607,7 @@
orr r2, r2, r3, lsl #8 /* r2 = xx32 */
#endif
strh r2, [r0, #0x02]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -617,7 +617,7 @@
ldrh r3, [r1, #0x02]
strh r2, [r0]
strh r3, [r0, #0x02]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -635,7 +635,7 @@
orr r3, r3, r2, lsr #24 /* r3 = 3210 */
#endif
strh r3, [r0]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -655,7 +655,7 @@
strh r3, [r0, #0x01]
strb r1, [r0, #0x03]
#endif
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -667,7 +667,7 @@
strb r2, [r0]
strh r3, [r0, #0x01]
strb r1, [r0, #0x03]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -692,7 +692,7 @@
mov r3, r3, lsr #8 /* r3 = ...3 */
strb r3, [r0, #0x03]
#endif
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
/*
@@ -704,7 +704,7 @@
strb r2, [r0]
strh r3, [r0, #0x01]
strb r1, [r0, #0x03]
- mov pc, lr
+ bx lr
LMEMCPY_4_PAD
@@ -728,7 +728,7 @@
ldrh r3, [r1, #0x04]
str r2, [r0]
strh r3, [r0, #0x04]
- mov pc, lr
+ bx lr
LMEMCPY_6_PAD
/*
@@ -746,7 +746,7 @@
mov r3, r3, lsr #8 /* BE:r3 = .345 LE:r3 = .x54 */
str r2, [r0]
strh r3, [r0, #0x04]
- mov pc, lr
+ bx lr
LMEMCPY_6_PAD
/*
@@ -765,7 +765,7 @@
str r2, [r0]
strh r1, [r0, #0x04]
#endif
- mov pc, lr
+ bx lr
LMEMCPY_6_PAD
/*
@@ -787,7 +787,7 @@
#endif
str r2, [r0]
strh r1, [r0, #0x04]
- mov pc, lr
+ bx lr
LMEMCPY_6_PAD
/*
@@ -810,7 +810,7 @@
#endif
strh r3, [r0, #0x03]
strb r2, [r0, #0x05]
- mov pc, lr
+ bx lr
LMEMCPY_6_PAD
Home |
Main Index |
Thread Index |
Old Index