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 Local label fixup.
details: https://anonhg.NetBSD.org/src/rev/2f99e67cd371
branches: trunk
changeset: 535408:2f99e67cd371
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Aug 17 19:54:30 2002 +0000
description:
Local label fixup.
diffstat:
lib/libc/arch/arm/gen/__setjmp14.S | 14 +-
lib/libc/arch/arm/gen/__sigsetjmp14.S | 6 +-
lib/libc/arch/arm/gen/_setjmp.S | 8 +-
lib/libc/arch/arm/gen/divsi3.S | 232 +++++++++++++++++-----------------
lib/libc/arch/arm/gen/setjmp.S | 8 +-
lib/libc/arch/arm/gen/sigsetjmp.S | 6 +-
lib/libc/arch/arm/string/_memcpy.S | 187 +++++++++++++-------------
lib/libc/arch/arm/string/ffs.S | 11 +-
lib/libc/arch/arm/string/memset.S | 26 +-
lib/libc/arch/arm/sys/__clone.S | 10 +-
lib/libc/arch/arm/sys/brk.S | 18 +-
lib/libc/arch/arm/sys/cerror.S | 12 +-
lib/libc/arch/arm/sys/ptrace.S | 12 +-
lib/libc/arch/arm/sys/sbrk.S | 12 +-
lib/libc/arch/arm/sys/setlogin.S | 12 +-
15 files changed, 286 insertions(+), 288 deletions(-)
diffs (truncated from 1484 to 300 lines):
diff -r c17523e26106 -r 2f99e67cd371 lib/libc/arch/arm/gen/__setjmp14.S
--- a/lib/libc/arch/arm/gen/__setjmp14.S Sat Aug 17 19:19:57 2002 +0000
+++ b/lib/libc/arch/arm/gen/__setjmp14.S Sat Aug 17 19:54:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: __setjmp14.S,v 1.3 2001/11/13 20:04:52 chris Exp $ */
+/* $NetBSD: __setjmp14.S,v 1.4 2002/08/17 19:54:30 thorpej Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -54,7 +54,7 @@
bl PIC_SYM(_C_LABEL(__sigprocmask14), PLT)
ldmfd sp!, {r0-r2, r14}
- ldr r1, Lsetjmp_magic
+ ldr r1, .Lsetjmp_magic
str r1, [r0], #4
#ifdef SOFTFLOAT
@@ -75,15 +75,15 @@
mov r15, r14
#endif
-Lsetjmp_magic:
+.Lsetjmp_magic:
.word _JB_MAGIC_SETJMP
ENTRY(__longjmp14)
- ldr r2, Lsetjmp_magic
+ ldr r2, .Lsetjmp_magic
ldr r3, [r0]
teq r2, r3
- bne botch
+ bne .Lbotch
/* Restore the signal mask. */
stmfd sp!, {r0-r2, r14}
@@ -109,7 +109,7 @@
/* Validate sp and r14 */
teq sp, #0
teqne r14, #0
- beq botch
+ beq .Lbotch
/* Set return value */
@@ -123,7 +123,7 @@
#endif
/* validation failed, die die die. */
-botch:
+.Lbotch:
bl PIC_SYM(_C_LABEL(longjmperror), PLT)
bl PIC_SYM(_C_LABEL(abort), PLT)
b . - 8 /* Cannot get here */
diff -r c17523e26106 -r 2f99e67cd371 lib/libc/arch/arm/gen/__sigsetjmp14.S
--- a/lib/libc/arch/arm/gen/__sigsetjmp14.S Sat Aug 17 19:19:57 2002 +0000
+++ b/lib/libc/arch/arm/gen/__sigsetjmp14.S Sat Aug 17 19:54:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: __sigsetjmp14.S,v 1.2 2001/07/16 05:50:05 matt Exp $ */
+/* $NetBSD: __sigsetjmp14.S,v 1.3 2002/08/17 19:54:30 thorpej Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -50,11 +50,11 @@
beq PIC_SYM(_C_LABEL(_setjmp), PLT)
b PIC_SYM(_C_LABEL(__setjmp14), PLT)
-L_setjmp_magic:
+.L_setjmp_magic:
.word _JB_MAGIC__SETJMP
ENTRY(__siglongjmp14)
- ldr r2, L_setjmp_magic
+ ldr r2, .L_setjmp_magic
ldr r3, [r0]
teq r2, r3
beq PIC_SYM(_C_LABEL(_longjmp), PLT)
diff -r c17523e26106 -r 2f99e67cd371 lib/libc/arch/arm/gen/_setjmp.S
--- a/lib/libc/arch/arm/gen/_setjmp.S Sat Aug 17 19:19:57 2002 +0000
+++ b/lib/libc/arch/arm/gen/_setjmp.S Sat Aug 17 19:54:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.3 2001/11/13 20:04:52 chris Exp $ */
+/* $NetBSD: _setjmp.S,v 1.4 2002/08/17 19:54:30 thorpej Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -49,7 +49,7 @@
*/
ENTRY(_setjmp)
- ldr r1, L_setjmp_magic
+ ldr r1, .L_setjmp_magic
str r1, [r0], #4
#ifdef SOFTFLOAT
add r0, r0, #52
@@ -70,11 +70,11 @@
mov r15, r14
#endif
-L_setjmp_magic:
+.L_setjmp_magic:
.word _JB_MAGIC__SETJMP
ENTRY(_longjmp)
- ldr r2, L_setjmp_magic
+ ldr r2, .L_setjmp_magic
ldr r3, [r0], #4
teq r2, r3
bne botch
diff -r c17523e26106 -r 2f99e67cd371 lib/libc/arch/arm/gen/divsi3.S
--- a/lib/libc/arch/arm/gen/divsi3.S Sat Aug 17 19:19:57 2002 +0000
+++ b/lib/libc/arch/arm/gen/divsi3.S Sat Aug 17 19:54:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: divsi3.S,v 1.3 2001/11/13 20:03:38 chris Exp $ */
+/* $NetBSD: divsi3.S,v 1.4 2002/08/17 19:54:30 thorpej Exp $ */
/*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -17,14 +17,14 @@
#include <machine/asm.h>
/*
- * stack is aligned as there's a possibility of branching to L_overflow
+ * stack is aligned as there's a possibility of branching to .L_overflow
* which makes a C call
*/
ENTRY(__umodsi3)
stmfd sp!, {lr}
sub sp, sp, #4 /* align stack */
- bl L_udivide
+ bl .L_udivide
add sp, sp, #4 /* unalign stack */
mov r0, r1
#ifdef __APCS_26__
@@ -36,7 +36,7 @@
ENTRY(__modsi3)
stmfd sp!, {lr}
sub sp, sp, #4 /* align stack */
- bl L_divide
+ bl .L_divide
add sp, sp, #4 /* unalign stack */
mov r0, r1
#ifdef __APCS_26__
@@ -45,7 +45,7 @@
ldmfd sp!, {pc}
#endif
-L_overflow:
+.L_overflow:
#if !defined(_KERNEL) && !defined(_STANDALONE)
mov r0, #8 /* SIGFPE */
bl PIC_SYM(_C_LABEL(raise), PLT) /* raise it */
@@ -61,23 +61,23 @@
#endif
ENTRY(__udivsi3)
-L_udivide: /* r0 = r0 / r1; r1 = r0 % r1 */
+.L_udivide: /* r0 = r0 / r1; r1 = r0 % r1 */
eor r0, r1, r0
eor r1, r0, r1
eor r0, r1, r0
/* r0 = r1 / r0; r1 = r1 % r0 */
cmp r0, #1
- bcc L_overflow
- beq L_divide_l0
+ bcc .L_overflow
+ beq .L_divide_l0
mov ip, #0
movs r1, r1
- bpl L_divide_l1
+ bpl .L_divide_l1
orr ip, ip, #0x20000000 /* ip bit 0x20000000 = -ve r1 */
movs r1, r1, lsr #1
orrcs ip, ip, #0x10000000 /* ip bit 0x10000000 = bit 0 of r1 */
- b L_divide_l1
+ b .L_divide_l1
-L_divide_l0: /* r0 == 1 */
+.L_divide_l0: /* r0 == 1 */
mov r0, r1
mov r1, #0
#ifdef __APCS_26__
@@ -87,14 +87,14 @@
#endif
ENTRY(__divsi3)
-L_divide: /* r0 = r0 / r1; r1 = r0 % r1 */
+.L_divide: /* r0 = r0 / r1; r1 = r0 % r1 */
eor r0, r1, r0
eor r1, r0, r1
eor r0, r1, r0
/* r0 = r1 / r0; r1 = r1 % r0 */
cmp r0, #1
- bcc L_overflow
- beq L_divide_l0
+ bcc .L_overflow
+ beq .L_divide_l0
ands ip, r0, #0x80000000
rsbmi r0, r0, #0
ands r2, r1, #0x80000000
@@ -103,7 +103,7 @@
orr ip, r2, ip, lsr #1 /* ip bit 0x40000000 = -ve division */
/* ip bit 0x80000000 = -ve remainder */
-L_divide_l1:
+.L_divide_l1:
mov r2, #1
mov r3, #0
@@ -112,276 +112,276 @@
* careful when shifting the divisor. Test this.
*/
movs r1,r1
- bpl L_old_code
+ bpl .L_old_code
/*
* At this point, the highest bit of r1 is known to be set.
* We abuse this below in the tst instructions.
*/
tst r1, r0 /*, lsl #0 */
- bmi L_divide_b1
+ bmi .L_divide_b1
tst r1, r0, lsl #1
- bmi L_divide_b2
+ bmi .L_divide_b2
tst r1, r0, lsl #2
- bmi L_divide_b3
+ bmi .L_divide_b3
tst r1, r0, lsl #3
- bmi L_divide_b4
+ bmi .L_divide_b4
tst r1, r0, lsl #4
- bmi L_divide_b5
+ bmi .L_divide_b5
tst r1, r0, lsl #5
- bmi L_divide_b6
+ bmi .L_divide_b6
tst r1, r0, lsl #6
- bmi L_divide_b7
+ bmi .L_divide_b7
tst r1, r0, lsl #7
- bmi L_divide_b8
+ bmi .L_divide_b8
tst r1, r0, lsl #8
- bmi L_divide_b9
+ bmi .L_divide_b9
tst r1, r0, lsl #9
- bmi L_divide_b10
+ bmi .L_divide_b10
tst r1, r0, lsl #10
- bmi L_divide_b11
+ bmi .L_divide_b11
tst r1, r0, lsl #11
- bmi L_divide_b12
+ bmi .L_divide_b12
tst r1, r0, lsl #12
- bmi L_divide_b13
+ bmi .L_divide_b13
tst r1, r0, lsl #13
- bmi L_divide_b14
+ bmi .L_divide_b14
tst r1, r0, lsl #14
- bmi L_divide_b15
+ bmi .L_divide_b15
tst r1, r0, lsl #15
- bmi L_divide_b16
+ bmi .L_divide_b16
tst r1, r0, lsl #16
- bmi L_divide_b17
+ bmi .L_divide_b17
tst r1, r0, lsl #17
- bmi L_divide_b18
+ bmi .L_divide_b18
tst r1, r0, lsl #18
- bmi L_divide_b19
+ bmi .L_divide_b19
tst r1, r0, lsl #19
- bmi L_divide_b20
+ bmi .L_divide_b20
tst r1, r0, lsl #20
- bmi L_divide_b21
+ bmi .L_divide_b21
tst r1, r0, lsl #21
- bmi L_divide_b22
+ bmi .L_divide_b22
tst r1, r0, lsl #22
- bmi L_divide_b23
+ bmi .L_divide_b23
tst r1, r0, lsl #23
- bmi L_divide_b24
+ bmi .L_divide_b24
tst r1, r0, lsl #24
- bmi L_divide_b25
+ bmi .L_divide_b25
tst r1, r0, lsl #25
- bmi L_divide_b26
+ bmi .L_divide_b26
Home |
Main Index |
Thread Index |
Old Index