![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>
95 lines
1.6 KiB
ArmAsm
95 lines
1.6 KiB
ArmAsm
/*
|
|
* linux/arch/arm/lib/io-writesb.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>
|
|
|
|
.macro outword, rd
|
|
#ifndef __ARMEB__
|
|
strb \rd, [r0]
|
|
mov \rd, \rd, lsr #8
|
|
strb \rd, [r0]
|
|
mov \rd, \rd, lsr #8
|
|
strb \rd, [r0]
|
|
mov \rd, \rd, lsr #8
|
|
strb \rd, [r0]
|
|
#else
|
|
mov lr, \rd, lsr #24
|
|
strb lr, [r0]
|
|
mov lr, \rd, lsr #16
|
|
strb lr, [r0]
|
|
mov lr, \rd, lsr #8
|
|
strb lr, [r0]
|
|
strb \rd, [r0]
|
|
#endif
|
|
.endm
|
|
|
|
.Loutsb_align: rsb ip, ip, #4
|
|
cmp ip, r2
|
|
movgt ip, r2
|
|
cmp ip, #2
|
|
ldrb r3, [r1], #1
|
|
strb r3, [r0]
|
|
ldrgeb r3, [r1], #1
|
|
strgeb r3, [r0]
|
|
ldrgtb r3, [r1], #1
|
|
strgtb r3, [r0]
|
|
subs r2, r2, ip
|
|
bne .Loutsb_aligned
|
|
|
|
ENTRY(__raw_writesb)
|
|
teq r2, #0 @ do we have to check for the zero len?
|
|
reteq lr
|
|
ands ip, r1, #3
|
|
bne .Loutsb_align
|
|
|
|
.Loutsb_aligned:
|
|
stmfd sp!, {r4, r5, lr}
|
|
|
|
subs r2, r2, #16
|
|
bmi .Loutsb_no_16
|
|
|
|
.Loutsb_16_lp: ldmia r1!, {r3, r4, r5, ip}
|
|
outword r3
|
|
outword r4
|
|
outword r5
|
|
outword ip
|
|
subs r2, r2, #16
|
|
bpl .Loutsb_16_lp
|
|
|
|
tst r2, #15
|
|
ldmeqfd sp!, {r4, r5, pc}
|
|
|
|
.Loutsb_no_16: tst r2, #8
|
|
beq .Loutsb_no_8
|
|
|
|
ldmia r1!, {r3, r4}
|
|
outword r3
|
|
outword r4
|
|
|
|
.Loutsb_no_8: tst r2, #4
|
|
beq .Loutsb_no_4
|
|
|
|
ldr r3, [r1], #4
|
|
outword r3
|
|
|
|
.Loutsb_no_4: ands r2, r2, #3
|
|
ldmeqfd sp!, {r4, r5, pc}
|
|
|
|
cmp r2, #2
|
|
ldrb r3, [r1], #1
|
|
strb r3, [r0]
|
|
ldrgeb r3, [r1], #1
|
|
strgeb r3, [r0]
|
|
ldrgtb r3, [r1]
|
|
strgtb r3, [r0]
|
|
|
|
ldmfd sp!, {r4, r5, pc}
|
|
ENDPROC(__raw_writesb)
|