![Russell King](/assets/img/avatar_default.png)
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>
127 lines
2.1 KiB
ArmAsm
127 lines
2.1 KiB
ArmAsm
/*
|
|
* linux/arch/arm/lib/io-writesw-armv3.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>
|
|
|
|
.Loutsw_bad_alignment:
|
|
adr r0, .Loutsw_bad_align_msg
|
|
mov r2, lr
|
|
b panic
|
|
.Loutsw_bad_align_msg:
|
|
.asciz "outsw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
|
|
.align
|
|
|
|
.Loutsw_align: tst r1, #1
|
|
bne .Loutsw_bad_alignment
|
|
|
|
add r1, r1, #2
|
|
|
|
ldr r3, [r1, #-4]
|
|
mov r3, r3, lsr #16
|
|
orr r3, r3, r3, lsl #16
|
|
str r3, [r0]
|
|
subs r2, r2, #1
|
|
reteq lr
|
|
|
|
ENTRY(__raw_writesw)
|
|
teq r2, #0 @ do we have to check for the zero len?
|
|
reteq lr
|
|
tst r1, #3
|
|
bne .Loutsw_align
|
|
|
|
stmfd sp!, {r4, r5, r6, lr}
|
|
|
|
subs r2, r2, #8
|
|
bmi .Lno_outsw_8
|
|
|
|
.Loutsw_8_lp: ldmia r1!, {r3, r4, r5, r6}
|
|
|
|
mov ip, r3, lsl #16
|
|
orr ip, ip, ip, lsr #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r3, lsr #16
|
|
orr ip, ip, ip, lsl #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r4, lsl #16
|
|
orr ip, ip, ip, lsr #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r4, lsr #16
|
|
orr ip, ip, ip, lsl #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r5, lsl #16
|
|
orr ip, ip, ip, lsr #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r5, lsr #16
|
|
orr ip, ip, ip, lsl #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r6, lsl #16
|
|
orr ip, ip, ip, lsr #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r6, lsr #16
|
|
orr ip, ip, ip, lsl #16
|
|
str ip, [r0]
|
|
|
|
subs r2, r2, #8
|
|
bpl .Loutsw_8_lp
|
|
|
|
tst r2, #7
|
|
ldmeqfd sp!, {r4, r5, r6, pc}
|
|
|
|
.Lno_outsw_8: tst r2, #4
|
|
beq .Lno_outsw_4
|
|
|
|
ldmia r1!, {r3, r4}
|
|
|
|
mov ip, r3, lsl #16
|
|
orr ip, ip, ip, lsr #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r3, lsr #16
|
|
orr ip, ip, ip, lsl #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r4, lsl #16
|
|
orr ip, ip, ip, lsr #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r4, lsr #16
|
|
orr ip, ip, ip, lsl #16
|
|
str ip, [r0]
|
|
|
|
.Lno_outsw_4: tst r2, #2
|
|
beq .Lno_outsw_2
|
|
|
|
ldr r3, [r1], #4
|
|
|
|
mov ip, r3, lsl #16
|
|
orr ip, ip, ip, lsr #16
|
|
str ip, [r0]
|
|
|
|
mov ip, r3, lsr #16
|
|
orr ip, ip, ip, lsl #16
|
|
str ip, [r0]
|
|
|
|
.Lno_outsw_2: tst r2, #1
|
|
|
|
ldrne r3, [r1]
|
|
|
|
movne ip, r3, lsl #16
|
|
orrne ip, ip, ip, lsr #16
|
|
strne ip, [r0]
|
|
|
|
ldmfd sp!, {r4, r5, r6, pc}
|