mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-13 23:34:05 +08:00
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>
101 lines
1.7 KiB
ArmAsm
101 lines
1.7 KiB
ArmAsm
/*
|
|
* linux/arch/arm/lib/io-writesw-armv4.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__
|
|
strh \rd, [r0]
|
|
mov \rd, \rd, lsr #16
|
|
strh \rd, [r0]
|
|
#else
|
|
mov lr, \rd, lsr #16
|
|
strh lr, [r0]
|
|
strh \rd, [r0]
|
|
#endif
|
|
.endm
|
|
|
|
.Loutsw_align: movs ip, r1, lsl #31
|
|
bne .Loutsw_noalign
|
|
|
|
ldrh r3, [r1], #2
|
|
sub r2, r2, #1
|
|
strh r3, [r0]
|
|
|
|
ENTRY(__raw_writesw)
|
|
teq r2, #0
|
|
reteq lr
|
|
ands r3, r1, #3
|
|
bne .Loutsw_align
|
|
|
|
stmfd sp!, {r4, r5, lr}
|
|
|
|
subs r2, r2, #8
|
|
bmi .Lno_outsw_8
|
|
|
|
.Loutsw_8_lp: ldmia r1!, {r3, r4, r5, ip}
|
|
subs r2, r2, #8
|
|
outword r3
|
|
outword r4
|
|
outword r5
|
|
outword ip
|
|
bpl .Loutsw_8_lp
|
|
|
|
.Lno_outsw_8: tst r2, #4
|
|
beq .Lno_outsw_4
|
|
|
|
ldmia r1!, {r3, ip}
|
|
outword r3
|
|
outword ip
|
|
|
|
.Lno_outsw_4: movs r2, r2, lsl #31
|
|
bcc .Lno_outsw_2
|
|
|
|
ldr r3, [r1], #4
|
|
outword r3
|
|
|
|
.Lno_outsw_2: ldrneh r3, [r1]
|
|
strneh r3, [r0]
|
|
|
|
ldmfd sp!, {r4, r5, pc}
|
|
|
|
#ifdef __ARMEB__
|
|
#define pull_hbyte0 lsl #8
|
|
#define push_hbyte1 lsr #24
|
|
#else
|
|
#define pull_hbyte0 lsr #24
|
|
#define push_hbyte1 lsl #8
|
|
#endif
|
|
|
|
.Loutsw_noalign:
|
|
ARM( ldr r3, [r1, -r3]! )
|
|
THUMB( rsb r3, r3, #0 )
|
|
THUMB( ldr r3, [r1, r3] )
|
|
THUMB( sub r1, r3 )
|
|
subcs r2, r2, #1
|
|
bcs 2f
|
|
subs r2, r2, #2
|
|
bmi 3f
|
|
|
|
1: mov ip, r3, lsr #8
|
|
strh ip, [r0]
|
|
2: mov ip, r3, pull_hbyte0
|
|
ldr r3, [r1, #4]!
|
|
subs r2, r2, #2
|
|
orr ip, ip, r3, push_hbyte1
|
|
strh ip, [r0]
|
|
bpl 1b
|
|
|
|
tst r2, #1
|
|
3: movne ip, r3, lsr #8
|
|
strneh ip, [r0]
|
|
ret lr
|
|
ENDPROC(__raw_writesw)
|