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>
80 lines
1.5 KiB
ArmAsm
80 lines
1.5 KiB
ArmAsm
/*
|
|
* linux/arch/arm/lib/io-readsl.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>
|
|
|
|
ENTRY(__raw_readsl)
|
|
teq r2, #0 @ do we have to check for the zero len?
|
|
reteq lr
|
|
ands ip, r1, #3
|
|
bne 3f
|
|
|
|
subs r2, r2, #4
|
|
bmi 2f
|
|
stmfd sp!, {r4, lr}
|
|
1: ldr r3, [r0, #0]
|
|
ldr r4, [r0, #0]
|
|
ldr ip, [r0, #0]
|
|
ldr lr, [r0, #0]
|
|
subs r2, r2, #4
|
|
stmia r1!, {r3, r4, ip, lr}
|
|
bpl 1b
|
|
ldmfd sp!, {r4, lr}
|
|
2: movs r2, r2, lsl #31
|
|
ldrcs r3, [r0, #0]
|
|
ldrcs ip, [r0, #0]
|
|
stmcsia r1!, {r3, ip}
|
|
ldrne r3, [r0, #0]
|
|
strne r3, [r1, #0]
|
|
ret lr
|
|
|
|
3: ldr r3, [r0]
|
|
cmp ip, #2
|
|
mov ip, r3, get_byte_0
|
|
strb ip, [r1], #1
|
|
bgt 6f
|
|
mov ip, r3, get_byte_1
|
|
strb ip, [r1], #1
|
|
beq 5f
|
|
mov ip, r3, get_byte_2
|
|
strb ip, [r1], #1
|
|
|
|
4: subs r2, r2, #1
|
|
mov ip, r3, lspull #24
|
|
ldrne r3, [r0]
|
|
orrne ip, ip, r3, lspush #8
|
|
strne ip, [r1], #4
|
|
bne 4b
|
|
b 8f
|
|
|
|
5: subs r2, r2, #1
|
|
mov ip, r3, lspull #16
|
|
ldrne r3, [r0]
|
|
orrne ip, ip, r3, lspush #16
|
|
strne ip, [r1], #4
|
|
bne 5b
|
|
b 7f
|
|
|
|
6: subs r2, r2, #1
|
|
mov ip, r3, lspull #8
|
|
ldrne r3, [r0]
|
|
orrne ip, ip, r3, lspush #24
|
|
strne ip, [r1], #4
|
|
bne 6b
|
|
|
|
mov r3, ip, get_byte_2
|
|
strb r3, [r1, #2]
|
|
7: mov r3, ip, get_byte_1
|
|
strb r3, [r1, #1]
|
|
8: mov r3, ip, get_byte_0
|
|
strb r3, [r1, #0]
|
|
ret lr
|
|
ENDPROC(__raw_readsl)
|