git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
arch
/
arm
/
lib
/
io-readsw-armv4.S
diff --git
a/arch/arm/lib/io-readsw-armv4.S
b/arch/arm/lib/io-readsw-armv4.S
index
c92b66e
..
1f393d4
100644
(file)
--- a/
arch/arm/lib/io-readsw-armv4.S
+++ b/
arch/arm/lib/io-readsw-armv4.S
@@
-18,8
+18,8
@@
#endif
.endm
#endif
.endm
-.
insw_align:
movs ip, r1, lsl #31
- bne .insw_noalign
+.
Linsw_align:
movs ip, r1, lsl #31
+ bne .
L
insw_noalign
ldrh ip, [r0]
sub r2, r2, #1
strh ip, [r1], #2
ldrh ip, [r0]
sub r2, r2, #1
strh ip, [r1], #2
@@
-28,14
+28,14
@@
ENTRY(__raw_readsw)
teq r2, #0
moveq pc, lr
tst r1, #3
teq r2, #0
moveq pc, lr
tst r1, #3
- bne .insw_align
+ bne .
L
insw_align
stmfd sp!, {r4, r5, lr}
subs r2, r2, #8
stmfd sp!, {r4, r5, lr}
subs r2, r2, #8
- bmi .no_insw_8
+ bmi .
L
no_insw_8
-.
insw_8_lp:
ldrh r3, [r0]
+.
Linsw_8_lp:
ldrh r3, [r0]
ldrh r4, [r0]
pack r3, r3, r4
ldrh r4, [r0]
pack r3, r3, r4
@@
-53,10
+53,10
@@
ENTRY(__raw_readsw)
subs r2, r2, #8
stmia r1!, {r3 - r5, ip}
subs r2, r2, #8
stmia r1!, {r3 - r5, ip}
- bpl .insw_8_lp
+ bpl .
L
insw_8_lp
-.
no_insw_8:
tst r2, #4
- beq .no_insw_4
+.
Lno_insw_8:
tst r2, #4
+ beq .
L
no_insw_4
ldrh r3, [r0]
ldrh r4, [r0]
ldrh r3, [r0]
ldrh r4, [r0]
@@
-68,15
+68,15
@@
ENTRY(__raw_readsw)
stmia r1!, {r3, r4}
stmia r1!, {r3, r4}
-.
no_insw_4:
movs r2, r2, lsl #31
- bcc .no_insw_2
+.
Lno_insw_4:
movs r2, r2, lsl #31
+ bcc .
L
no_insw_2
ldrh r3, [r0]
ldrh ip, [r0]
pack r3, r3, ip
str r3, [r1], #4
ldrh r3, [r0]
ldrh ip, [r0]
pack r3, r3, ip
str r3, [r1], #4
-.
no_insw_2:
ldrneh r3, [r0]
+.
Lno_insw_2:
ldrneh r3, [r0]
strneh r3, [r1]
ldmfd sp!, {r4, r5, pc}
strneh r3, [r1]
ldmfd sp!, {r4, r5, pc}
@@
-93,7
+93,7
@@
ENTRY(__raw_readsw)
#define pull_hbyte1 lsr #8
#endif
#define pull_hbyte1 lsr #8
#endif
-.
insw_noalign:
stmfd sp!, {r4, lr}
+.
Linsw_noalign:
stmfd sp!, {r4, lr}
ldrccb ip, [r1, #-1]!
bcc 1f
ldrccb ip, [r1, #-1]!
bcc 1f
@@
-128,3
+128,4
@@
ENTRY(__raw_readsw)
_BE_ONLY_( movne ip, ip, lsr #24 )
strneb ip, [r1]
ldmfd sp!, {r4, pc}
_BE_ONLY_( movne ip, ip, lsr #24 )
strneb ip, [r1]
ldmfd sp!, {r4, pc}
+ENDPROC(__raw_readsw)