mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-12 08:48:48 +00:00
8478132a87
This reverts commit 4dd1837d7589f468ed109556513f476e7a7f9121.
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>
132 lines
2.3 KiB
ArmAsm
132 lines
2.3 KiB
ArmAsm
/*
|
|
* linux/arch/arm/lib/io-readsw-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 pack, rd, hw1, hw2
|
|
#ifndef __ARMEB__
|
|
orr \rd, \hw1, \hw2, lsl #16
|
|
#else
|
|
orr \rd, \hw2, \hw1, lsl #16
|
|
#endif
|
|
.endm
|
|
|
|
.Linsw_align: movs ip, r1, lsl #31
|
|
bne .Linsw_noalign
|
|
ldrh ip, [r0]
|
|
sub r2, r2, #1
|
|
strh ip, [r1], #2
|
|
|
|
ENTRY(__raw_readsw)
|
|
teq r2, #0
|
|
reteq lr
|
|
tst r1, #3
|
|
bne .Linsw_align
|
|
|
|
stmfd sp!, {r4, r5, lr}
|
|
|
|
subs r2, r2, #8
|
|
bmi .Lno_insw_8
|
|
|
|
.Linsw_8_lp: ldrh r3, [r0]
|
|
ldrh r4, [r0]
|
|
pack r3, r3, r4
|
|
|
|
ldrh r4, [r0]
|
|
ldrh r5, [r0]
|
|
pack r4, r4, r5
|
|
|
|
ldrh r5, [r0]
|
|
ldrh ip, [r0]
|
|
pack r5, r5, ip
|
|
|
|
ldrh ip, [r0]
|
|
ldrh lr, [r0]
|
|
pack ip, ip, lr
|
|
|
|
subs r2, r2, #8
|
|
stmia r1!, {r3 - r5, ip}
|
|
bpl .Linsw_8_lp
|
|
|
|
.Lno_insw_8: tst r2, #4
|
|
beq .Lno_insw_4
|
|
|
|
ldrh r3, [r0]
|
|
ldrh r4, [r0]
|
|
pack r3, r3, r4
|
|
|
|
ldrh r4, [r0]
|
|
ldrh ip, [r0]
|
|
pack r4, r4, ip
|
|
|
|
stmia r1!, {r3, r4}
|
|
|
|
.Lno_insw_4: movs r2, r2, lsl #31
|
|
bcc .Lno_insw_2
|
|
|
|
ldrh r3, [r0]
|
|
ldrh ip, [r0]
|
|
pack r3, r3, ip
|
|
str r3, [r1], #4
|
|
|
|
.Lno_insw_2: ldrneh r3, [r0]
|
|
strneh r3, [r1]
|
|
|
|
ldmfd sp!, {r4, r5, pc}
|
|
|
|
#ifdef __ARMEB__
|
|
#define _BE_ONLY_(code...) code
|
|
#define _LE_ONLY_(code...)
|
|
#define push_hbyte0 lsr #8
|
|
#define pull_hbyte1 lsl #24
|
|
#else
|
|
#define _BE_ONLY_(code...)
|
|
#define _LE_ONLY_(code...) code
|
|
#define push_hbyte0 lsl #24
|
|
#define pull_hbyte1 lsr #8
|
|
#endif
|
|
|
|
.Linsw_noalign: stmfd sp!, {r4, lr}
|
|
ldrccb ip, [r1, #-1]!
|
|
bcc 1f
|
|
|
|
ldrh ip, [r0]
|
|
sub r2, r2, #1
|
|
_BE_ONLY_( mov ip, ip, ror #8 )
|
|
strb ip, [r1], #1
|
|
_LE_ONLY_( mov ip, ip, lsr #8 )
|
|
_BE_ONLY_( mov ip, ip, lsr #24 )
|
|
|
|
1: subs r2, r2, #2
|
|
bmi 3f
|
|
_BE_ONLY_( mov ip, ip, lsl #24 )
|
|
|
|
2: ldrh r3, [r0]
|
|
ldrh r4, [r0]
|
|
subs r2, r2, #2
|
|
orr ip, ip, r3, lsl #8
|
|
orr ip, ip, r4, push_hbyte0
|
|
str ip, [r1], #4
|
|
mov ip, r4, pull_hbyte1
|
|
bpl 2b
|
|
|
|
_BE_ONLY_( mov ip, ip, lsr #24 )
|
|
|
|
3: tst r2, #1
|
|
strb ip, [r1], #1
|
|
ldrneh ip, [r0]
|
|
_BE_ONLY_( movne ip, ip, ror #8 )
|
|
strneb ip, [r1], #1
|
|
_LE_ONLY_( movne ip, ip, lsr #8 )
|
|
_BE_ONLY_( movne ip, ip, lsr #24 )
|
|
strneb ip, [r1]
|
|
ldmfd sp!, {r4, pc}
|
|
ENDPROC(__raw_readsw)
|