Skip to content

Commit e44fc38

Browse files
agnersRussell King
agners
authored and
Russell King
committed
ARM: 8844/1: use unified assembler in assembly files
Use unified assembler syntax (UAL) in assembly files. Divided syntax is considered deprecated. This will also allow to build the kernel using LLVM's integrated assembler. Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
1 parent c001899 commit e44fc38

31 files changed

+124
-124
lines changed

‎arch/arm/boot/bootp/init.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ _start: add lr, pc, #-0x8 @ lr = current load addr
4444
*/
4545
movne r10, #0 @ terminator
4646
movne r4, #2 @ Size of this entry (2 words)
47-
stmneia r9, {r4, r5, r10} @ Size, ATAG_CORE, terminator
47+
stmiane r9, {r4, r5, r10} @ Size, ATAG_CORE, terminator
4848

4949
/*
5050
* find the end of the tag list, and then add an INITRD tag on the end.

‎arch/arm/boot/compressed/ll_char_wr.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Lrow4bpplp:
7575
tst r1, #7 @ avoid using r7 directly after
7676
str r7, [r0, -r5]!
7777
subne r1, r1, #1
78-
ldrneb r7, [r6, r1]
78+
ldrbne r7, [r6, r1]
7979
bne Lrow4bpplp
8080
ldmfd sp!, {r4 - r7, pc}
8181

@@ -103,7 +103,7 @@ Lrow8bpplp:
103103
sub r0, r0, r5 @ avoid ip
104104
stmia r0, {r4, ip}
105105
subne r1, r1, #1
106-
ldrneb r7, [r6, r1]
106+
ldrbne r7, [r6, r1]
107107
bne Lrow8bpplp
108108
ldmfd sp!, {r4 - r7, pc}
109109

‎arch/arm/include/asm/hardware/entry-macro-iomd.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
ldr \tmp, =irq_prio_h
1717
teq \irqstat, #0
1818
#ifdef IOMD_BASE
19-
ldreqb \irqstat, [\base, #IOMD_DMAREQ] @ get dma
19+
ldrbeq \irqstat, [\base, #IOMD_DMAREQ] @ get dma
2020
addeq \tmp, \tmp, #256 @ irq_prio_h table size
2121
teqeq \irqstat, #0
2222
bne 2406f
2323
#endif
24-
ldreqb \irqstat, [\base, #IOMD_IRQREQA] @ get low priority
24+
ldrbeq \irqstat, [\base, #IOMD_IRQREQA] @ get low priority
2525
addeq \tmp, \tmp, #256 @ irq_prio_d table size
2626
teqeq \irqstat, #0
2727
#ifdef IOMD_IRQREQC
28-
ldreqb \irqstat, [\base, #IOMD_IRQREQC]
28+
ldrbeq \irqstat, [\base, #IOMD_IRQREQC]
2929
addeq \tmp, \tmp, #256 @ irq_prio_l table size
3030
teqeq \irqstat, #0
3131
#endif
3232
#ifdef IOMD_IRQREQD
33-
ldreqb \irqstat, [\base, #IOMD_IRQREQD]
33+
ldrbeq \irqstat, [\base, #IOMD_IRQREQD]
3434
addeq \tmp, \tmp, #256 @ irq_prio_lc table size
3535
teqeq \irqstat, #0
3636
#endif
37-
2406: ldrneb \irqnr, [\tmp, \irqstat] @ get IRQ number
37+
2406: ldrbne \irqnr, [\tmp, \irqstat] @ get IRQ number
3838
.endm
3939

4040
/*

‎arch/arm/include/debug/tegra.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173

174174
.macro senduart, rd, rx
175175
cmp \rx, #0
176-
strneb \rd, [\rx, #UART_TX << UART_SHIFT]
176+
strbne \rd, [\rx, #UART_TX << UART_SHIFT]
177177
1001:
178178
.endm
179179

‎arch/arm/kernel/debug.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ hexbuf_rel: .long hexbuf_addr - .
8686
ENTRY(printascii)
8787
addruart_current r3, r1, r2
8888
1: teq r0, #0
89-
ldrneb r1, [r0], #1
89+
ldrbne r1, [r0], #1
9090
teqne r1, #0
9191
reteq lr
9292
2: teq r1, #'\n'

‎arch/arm/kernel/entry-armv.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ call_fpe:
636636
@ Test if we need to give access to iWMMXt coprocessors
637637
ldr r5, [r10, #TI_FLAGS]
638638
rsbs r7, r8, #(1 << 8) @ CP 0 or 1 only
639-
movcss r7, r5, lsr #(TIF_USING_IWMMXT + 1)
639+
movscs r7, r5, lsr #(TIF_USING_IWMMXT + 1)
640640
bcs iwmmxt_task_enable
641641
#endif
642642
ARM( add pc, pc, r8, lsr #6 )
@@ -872,7 +872,7 @@ __kuser_cmpxchg64: @ 0xffff0f60
872872
smp_dmb arm
873873
1: ldrexd r0, r1, [r2] @ load current val
874874
eors r3, r0, r4 @ compare with oldval (1)
875-
eoreqs r3, r1, r5 @ compare with oldval (2)
875+
eorseq r3, r1, r5 @ compare with oldval (2)
876876
strexdeq r3, r6, r7, [r2] @ store newval if eq
877877
teqeq r3, #1 @ success?
878878
beq 1b @ if no then retry
@@ -896,8 +896,8 @@ __kuser_cmpxchg64: @ 0xffff0f60
896896
ldmia r1, {r6, lr} @ load new val
897897
1: ldmia r2, {r0, r1} @ load current val
898898
eors r3, r0, r4 @ compare with oldval (1)
899-
eoreqs r3, r1, r5 @ compare with oldval (2)
900-
2: stmeqia r2, {r6, lr} @ store newval if eq
899+
eorseq r3, r1, r5 @ compare with oldval (2)
900+
2: stmiaeq r2, {r6, lr} @ store newval if eq
901901
rsbs r0, r3, #0 @ set return val and C flag
902902
ldmfd sp!, {r4, r5, r6, pc}
903903

@@ -911,7 +911,7 @@ kuser_cmpxchg64_fixup:
911911
mov r7, #0xffff0fff
912912
sub r7, r7, #(0xffff0fff - (0xffff0f60 + (1b - __kuser_cmpxchg64)))
913913
subs r8, r4, r7
914-
rsbcss r8, r8, #(2b - 1b)
914+
rsbscs r8, r8, #(2b - 1b)
915915
strcs r7, [sp, #S_PC]
916916
#if __LINUX_ARM_ARCH__ < 6
917917
bcc kuser_cmpxchg32_fixup
@@ -969,7 +969,7 @@ kuser_cmpxchg32_fixup:
969969
mov r7, #0xffff0fff
970970
sub r7, r7, #(0xffff0fff - (0xffff0fc0 + (1b - __kuser_cmpxchg)))
971971
subs r8, r4, r7
972-
rsbcss r8, r8, #(2b - 1b)
972+
rsbscs r8, r8, #(2b - 1b)
973973
strcs r7, [sp, #S_PC]
974974
ret lr
975975
.previous

‎arch/arm/kernel/entry-common.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ sys_syscall:
373373
movhs scno, #0
374374
csdb
375375
#endif
376-
stmloia sp, {r5, r6} @ shuffle args
376+
stmialo sp, {r5, r6} @ shuffle args
377377
movlo r0, r1
378378
movlo r1, r2
379379
movlo r2, r3

‎arch/arm/kernel/entry-header.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,17 +388,17 @@
388388
badr lr, \ret @ return address
389389
.if \reload
390390
add r1, sp, #S_R0 + S_OFF @ pointer to regs
391-
ldmccia r1, {r0 - r6} @ reload r0-r6
392-
stmccia sp, {r4, r5} @ update stack arguments
391+
ldmiacc r1, {r0 - r6} @ reload r0-r6
392+
stmiacc sp, {r4, r5} @ update stack arguments
393393
.endif
394394
ldrcc pc, [\table, \tmp, lsl #2] @ call sys_* routine
395395
#else
396396
cmp \nr, #NR_syscalls @ check upper syscall limit
397397
badr lr, \ret @ return address
398398
.if \reload
399399
add r1, sp, #S_R0 + S_OFF @ pointer to regs
400-
ldmccia r1, {r0 - r6} @ reload r0-r6
401-
stmccia sp, {r4, r5} @ update stack arguments
400+
ldmiacc r1, {r0 - r6} @ reload r0-r6
401+
stmiacc sp, {r4, r5} @ update stack arguments
402402
.endif
403403
ldrcc pc, [\table, \nr, lsl #2] @ call sys_* routine
404404
#endif

‎arch/arm/lib/clear_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ UNWIND(.save {r1, lr})
4444
strusr r2, r0, 1, ne, rept=2
4545
tst r1, #1 @ x1 x0 x1 x0 x1 x0 x1
4646
it ne @ explicit IT needed for the label
47-
USER( strnebt r2, [r0])
47+
USER( strbtne r2, [r0])
4848
mov r0, #0
4949
ldmfd sp!, {r1, pc}
5050
UNWIND(.fnend)

‎arch/arm/lib/copy_page.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ ENTRY(copy_page)
3939
.endr
4040
subs r2, r2, #1 @ 1
4141
stmia r0!, {r3, r4, ip, lr} @ 4
42-
ldmgtia r1!, {r3, r4, ip, lr} @ 4
42+
ldmiagt r1!, {r3, r4, ip, lr} @ 4
4343
bgt 1b @ 1
44-
PLD( ldmeqia r1!, {r3, r4, ip, lr} )
44+
PLD( ldmiaeq r1!, {r3, r4, ip, lr} )
4545
PLD( beq 2b )
4646
ldmfd sp!, {r4, pc} @ 3
4747
ENDPROC(copy_page)

‎arch/arm/lib/copy_template.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
CALGN( ands ip, r0, #31 )
101101
CALGN( rsb r3, ip, #32 )
102-
CALGN( sbcnes r4, r3, r2 ) @ C is always set here
102+
CALGN( sbcsne r4, r3, r2 ) @ C is always set here
103103
CALGN( bcs 2f )
104104
CALGN( adr r4, 6f )
105105
CALGN( subs r2, r2, r3 ) @ C gets set
@@ -204,7 +204,7 @@
204204

205205
CALGN( ands ip, r0, #31 )
206206
CALGN( rsb ip, ip, #32 )
207-
CALGN( sbcnes r4, ip, r2 ) @ C is always set here
207+
CALGN( sbcsne r4, ip, r2 ) @ C is always set here
208208
CALGN( subcc r2, r2, ip )
209209
CALGN( bcc 15f )
210210

‎arch/arm/lib/csumpartial.S

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ td3 .req lr
4040
/* we must have at least one byte. */
4141
tst buf, #1 @ odd address?
4242
movne sum, sum, ror #8
43-
ldrneb td0, [buf], #1
43+
ldrbne td0, [buf], #1
4444
subne len, len, #1
45-
adcnes sum, sum, td0, put_byte_1
45+
adcsne sum, sum, td0, put_byte_1
4646

4747
.Lless4: tst len, #6
4848
beq .Lless8_byte
@@ -68,8 +68,8 @@ td3 .req lr
6868
bne .Lless8_wordlp
6969

7070
.Lless8_byte: tst len, #1 @ odd number of bytes
71-
ldrneb td0, [buf], #1 @ include last byte
72-
adcnes sum, sum, td0, put_byte_0 @ update checksum
71+
ldrbne td0, [buf], #1 @ include last byte
72+
adcsne sum, sum, td0, put_byte_0 @ update checksum
7373

7474
.Ldone: adc r0, sum, #0 @ collect up the last carry
7575
ldr td0, [sp], #4
@@ -78,25 +78,25 @@ td3 .req lr
7878
ldr pc, [sp], #4 @ return
7979

8080
.Lnot_aligned: tst buf, #1 @ odd address
81-
ldrneb td0, [buf], #1 @ make even
81+
ldrbne td0, [buf], #1 @ make even
8282
subne len, len, #1
83-
adcnes sum, sum, td0, put_byte_1 @ update checksum
83+
adcsne sum, sum, td0, put_byte_1 @ update checksum
8484

8585
tst buf, #2 @ 32-bit aligned?
8686
#if __LINUX_ARM_ARCH__ >= 4
87-
ldrneh td0, [buf], #2 @ make 32-bit aligned
87+
ldrhne td0, [buf], #2 @ make 32-bit aligned
8888
subne len, len, #2
8989
#else
90-
ldrneb td0, [buf], #1
91-
ldrneb ip, [buf], #1
90+
ldrbne td0, [buf], #1
91+
ldrbne ip, [buf], #1
9292
subne len, len, #2
9393
#ifndef __ARMEB__
9494
orrne td0, td0, ip, lsl #8
9595
#else
9696
orrne td0, ip, td0, lsl #8
9797
#endif
9898
#endif
99-
adcnes sum, sum, td0 @ update checksum
99+
adcsne sum, sum, td0 @ update checksum
100100
ret lr
101101

102102
ENTRY(csum_partial)

‎arch/arm/lib/csumpartialcopygeneric.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ FN_ENTRY
148148
strb r5, [dst], #1
149149
mov r5, r4, get_byte_2
150150
.Lexit: tst len, #1
151-
strneb r5, [dst], #1
151+
strbne r5, [dst], #1
152152
andne r5, r5, #255
153-
adcnes sum, sum, r5, put_byte_0
153+
adcsne sum, sum, r5, put_byte_0
154154

155155
/*
156156
* If the dst pointer was not 16-bit aligned, we

‎arch/arm/lib/csumpartialcopyuser.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
add r2, r2, r1
9696
mov r0, #0 @ zero the buffer
9797
9002: teq r2, r1
98-
strneb r0, [r1], #1
98+
strbne r0, [r1], #1
9999
bne 9002b
100100
load_regs
101101
.popsection

‎arch/arm/lib/div64.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ UNWIND(.fnstart)
8888
@ Break out early if dividend reaches 0.
8989
2: cmp xh, yl
9090
orrcs yh, yh, ip
91-
subcss xh, xh, yl
92-
movnes ip, ip, lsr #1
91+
subscs xh, xh, yl
92+
movsne ip, ip, lsr #1
9393
mov yl, yl, lsr #1
9494
bne 2b
9595

‎arch/arm/lib/floppydma.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
.global floppy_fiqin_end
1515
ENTRY(floppy_fiqin_start)
1616
subs r9, r9, #1
17-
ldrgtb r12, [r11, #-4]
18-
ldrleb r12, [r11], #0
17+
ldrbgt r12, [r11, #-4]
18+
ldrble r12, [r11], #0
1919
strb r12, [r10], #1
2020
subs pc, lr, #4
2121
floppy_fiqin_end:
2222

2323
.global floppy_fiqout_end
2424
ENTRY(floppy_fiqout_start)
2525
subs r9, r9, #1
26-
ldrgeb r12, [r10], #1
26+
ldrbge r12, [r10], #1
2727
movlt r12, #0
28-
strleb r12, [r11], #0
29-
subles pc, lr, #4
28+
strble r12, [r11], #0
29+
subsle pc, lr, #4
3030
strb r12, [r11, #-4]
3131
subs pc, lr, #4
3232
floppy_fiqout_end:

‎arch/arm/lib/io-readsb.S

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
cmp ip, #2
1717
ldrb r3, [r0]
1818
strb r3, [r1], #1
19-
ldrgeb r3, [r0]
20-
strgeb r3, [r1], #1
21-
ldrgtb r3, [r0]
22-
strgtb r3, [r1], #1
19+
ldrbge r3, [r0]
20+
strbge r3, [r1], #1
21+
ldrbgt r3, [r0]
22+
strbgt r3, [r1], #1
2323
subs r2, r2, ip
2424
bne .Linsb_aligned
2525

@@ -72,7 +72,7 @@ ENTRY(__raw_readsb)
7272
bpl .Linsb_16_lp
7373

7474
tst r2, #15
75-
ldmeqfd sp!, {r4 - r6, pc}
75+
ldmfdeq sp!, {r4 - r6, pc}
7676

7777
.Linsb_no_16: tst r2, #8
7878
beq .Linsb_no_8
@@ -109,15 +109,15 @@ ENTRY(__raw_readsb)
109109
str r3, [r1], #4
110110

111111
.Linsb_no_4: ands r2, r2, #3
112-
ldmeqfd sp!, {r4 - r6, pc}
112+
ldmfdeq sp!, {r4 - r6, pc}
113113

114114
cmp r2, #2
115115
ldrb r3, [r0]
116116
strb r3, [r1], #1
117-
ldrgeb r3, [r0]
118-
strgeb r3, [r1], #1
119-
ldrgtb r3, [r0]
120-
strgtb r3, [r1]
117+
ldrbge r3, [r0]
118+
strbge r3, [r1], #1
119+
ldrbgt r3, [r0]
120+
strbgt r3, [r1]
121121

122122
ldmfd sp!, {r4 - r6, pc}
123123
ENDPROC(__raw_readsb)

‎arch/arm/lib/io-readsl.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ENTRY(__raw_readsl)
3030
2: movs r2, r2, lsl #31
3131
ldrcs r3, [r0, #0]
3232
ldrcs ip, [r0, #0]
33-
stmcsia r1!, {r3, ip}
33+
stmiacs r1!, {r3, ip}
3434
ldrne r3, [r0, #0]
3535
strne r3, [r1, #0]
3636
ret lr

‎arch/arm/lib/io-readsw-armv3.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ENTRY(__raw_readsw)
6868
bpl .Linsw_8_lp
6969

7070
tst r2, #7
71-
ldmeqfd sp!, {r4, r5, r6, pc}
71+
ldmfdeq sp!, {r4, r5, r6, pc}
7272

7373
.Lno_insw_8: tst r2, #4
7474
beq .Lno_insw_4
@@ -97,9 +97,9 @@ ENTRY(__raw_readsw)
9797

9898
.Lno_insw_2: tst r2, #1
9999
ldrne r3, [r0]
100-
strneb r3, [r1], #1
100+
strbne r3, [r1], #1
101101
movne r3, r3, lsr #8
102-
strneb r3, [r1]
102+
strbne r3, [r1]
103103

104104
ldmfd sp!, {r4, r5, r6, pc}
105105

0 commit comments

Comments
 (0)