8478132a87
This reverts commit 4dd1837d75.
Moving the exports for assembly code into the assembly files breaks
KSYM trimming, but also breaks modversions.
While fixing the KSYM trimming is trivial, fixing modversions brings
us to a technically worse position that we had prior to the above
change:
- We end up with the prototype definitions divorsed from everything
else, which means that adding or removing assembly level ksyms
become more fragile:
* if adding a new assembly ksyms export, a missed prototype in
asm-prototypes.h results in a successful build if no module in
the selected configuration makes use of the symbol.
* when removing a ksyms export, asm-prototypes.h will get forgotten,
with armksyms.c, you'll get a build error if you forget to touch
the file.
- We end up with the same amount of include files and prototypes,
they're just in a header file instead of a .c file with their
exports.
As for lines of code, we don't get much of a size reduction:
(original commit)
47 files changed, 131 insertions(+), 208 deletions(-)
(fix for ksyms trimming)
7 files changed, 18 insertions(+), 5 deletions(-)
(two fixes for modversions)
1 file changed, 34 insertions(+)
3 files changed, 7 insertions(+), 2 deletions(-)
which results in a net total of only 25 lines deleted.
As there does not seem to be much benefit from this change of approach,
revert the change.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
123 lines
2.4 KiB
ArmAsm
123 lines
2.4 KiB
ArmAsm
/*
|
|
* linux/arch/arm/lib/io-readsb.S
|
|
*
|
|
* Copyright (C) 1995-2000 Russell King
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/linkage.h>
|
|
#include <asm/assembler.h>
|
|
|
|
.Linsb_align: rsb ip, ip, #4
|
|
cmp ip, r2
|
|
movgt ip, r2
|
|
cmp ip, #2
|
|
ldrb r3, [r0]
|
|
strb r3, [r1], #1
|
|
ldrgeb r3, [r0]
|
|
strgeb r3, [r1], #1
|
|
ldrgtb r3, [r0]
|
|
strgtb r3, [r1], #1
|
|
subs r2, r2, ip
|
|
bne .Linsb_aligned
|
|
|
|
ENTRY(__raw_readsb)
|
|
teq r2, #0 @ do we have to check for the zero len?
|
|
reteq lr
|
|
ands ip, r1, #3
|
|
bne .Linsb_align
|
|
|
|
.Linsb_aligned: stmfd sp!, {r4 - r6, lr}
|
|
|
|
subs r2, r2, #16
|
|
bmi .Linsb_no_16
|
|
|
|
.Linsb_16_lp: ldrb r3, [r0]
|
|
ldrb r4, [r0]
|
|
ldrb r5, [r0]
|
|
mov r3, r3, put_byte_0
|
|
ldrb r6, [r0]
|
|
orr r3, r3, r4, put_byte_1
|
|
ldrb r4, [r0]
|
|
orr r3, r3, r5, put_byte_2
|
|
ldrb r5, [r0]
|
|
orr r3, r3, r6, put_byte_3
|
|
ldrb r6, [r0]
|
|
mov r4, r4, put_byte_0
|
|
ldrb ip, [r0]
|
|
orr r4, r4, r5, put_byte_1
|
|
ldrb r5, [r0]
|
|
orr r4, r4, r6, put_byte_2
|
|
ldrb r6, [r0]
|
|
orr r4, r4, ip, put_byte_3
|
|
ldrb ip, [r0]
|
|
mov r5, r5, put_byte_0
|
|
ldrb lr, [r0]
|
|
orr r5, r5, r6, put_byte_1
|
|
ldrb r6, [r0]
|
|
orr r5, r5, ip, put_byte_2
|
|
ldrb ip, [r0]
|
|
orr r5, r5, lr, put_byte_3
|
|
ldrb lr, [r0]
|
|
mov r6, r6, put_byte_0
|
|
orr r6, r6, ip, put_byte_1
|
|
ldrb ip, [r0]
|
|
orr r6, r6, lr, put_byte_2
|
|
orr r6, r6, ip, put_byte_3
|
|
stmia r1!, {r3 - r6}
|
|
|
|
subs r2, r2, #16
|
|
bpl .Linsb_16_lp
|
|
|
|
tst r2, #15
|
|
ldmeqfd sp!, {r4 - r6, pc}
|
|
|
|
.Linsb_no_16: tst r2, #8
|
|
beq .Linsb_no_8
|
|
|
|
ldrb r3, [r0]
|
|
ldrb r4, [r0]
|
|
ldrb r5, [r0]
|
|
mov r3, r3, put_byte_0
|
|
ldrb r6, [r0]
|
|
orr r3, r3, r4, put_byte_1
|
|
ldrb r4, [r0]
|
|
orr r3, r3, r5, put_byte_2
|
|
ldrb r5, [r0]
|
|
orr r3, r3, r6, put_byte_3
|
|
ldrb r6, [r0]
|
|
mov r4, r4, put_byte_0
|
|
ldrb ip, [r0]
|
|
orr r4, r4, r5, put_byte_1
|
|
orr r4, r4, r6, put_byte_2
|
|
orr r4, r4, ip, put_byte_3
|
|
stmia r1!, {r3, r4}
|
|
|
|
.Linsb_no_8: tst r2, #4
|
|
beq .Linsb_no_4
|
|
|
|
ldrb r3, [r0]
|
|
ldrb r4, [r0]
|
|
ldrb r5, [r0]
|
|
ldrb r6, [r0]
|
|
mov r3, r3, put_byte_0
|
|
orr r3, r3, r4, put_byte_1
|
|
orr r3, r3, r5, put_byte_2
|
|
orr r3, r3, r6, put_byte_3
|
|
str r3, [r1], #4
|
|
|
|
.Linsb_no_4: ands r2, r2, #3
|
|
ldmeqfd sp!, {r4 - r6, pc}
|
|
|
|
cmp r2, #2
|
|
ldrb r3, [r0]
|
|
strb r3, [r1], #1
|
|
ldrgeb r3, [r0]
|
|
strgeb r3, [r1], #1
|
|
ldrgtb r3, [r0]
|
|
strgtb r3, [r1]
|
|
|
|
ldmfd sp!, {r4 - r6, pc}
|
|
ENDPROC(__raw_readsb)
|