Commit bb839439 authored by Russell King's avatar Russell King Committed by Linus Torvalds

[ARM] [4/4] Reformat assembly code to be consistent.

parent 2db1b65b
...@@ -127,7 +127,8 @@ preempt_return: ...@@ -127,7 +127,8 @@ preempt_return:
.ltorg .ltorg
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
svc_preempt: teq r9, #0 @ was preempt count = 0 svc_preempt:
teq r9, #0 @ was preempt count = 0
ldreq r6, .LCirq_stat ldreq r6, .LCirq_stat
movne pc, lr @ no movne pc, lr @ no
ldr r0, [r6, #4] @ local_irq_count ldr r0, [r6, #4] @ local_irq_count
...@@ -177,15 +178,21 @@ __pabt_svc: ...@@ -177,15 +178,21 @@ __pabt_svc:
ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr
.align 5 .align 5
.LCirq: .word __temp_irq .LCirq:
.LCund: .word __temp_und .word __temp_irq
.LCabt: .word __temp_abt .LCund:
.word __temp_und
.LCabt:
.word __temp_abt
#ifdef MULTI_ABORT #ifdef MULTI_ABORT
.LCprocfns: .word processor .LCprocfns:
.word processor
#endif #endif
.LCfp: .word fp_enter .LCfp:
.word fp_enter
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
.LCirq_stat: .word irq_stat .LCirq_stat:
.word irq_stat
#endif #endif
/* /*
...@@ -333,7 +340,8 @@ call_fpe: ...@@ -333,7 +340,8 @@ call_fpe:
mov pc, lr @ CP#14 (Debug) mov pc, lr @ CP#14 (Debug)
mov pc, lr @ CP#15 (Control) mov pc, lr @ CP#15 (Control)
do_fpe: ldr r4, .LCfp do_fpe:
ldr r4, .LCfp
add r10, r10, #TI_FPSTATE @ r10 = workspace add r10, r10, #TI_FPSTATE @ r10 = workspace
ldr pc, [r4] @ Call FP module USR entry point ldr pc, [r4] @ Call FP module USR entry point
...@@ -351,7 +359,8 @@ ENTRY(fp_enter) ...@@ -351,7 +359,8 @@ ENTRY(fp_enter)
.word fpundefinstr .word fpundefinstr
.text .text
fpundefinstr: mov r0, sp fpundefinstr:
mov r0, sp
adrsvc al, lr, ret_from_exception adrsvc al, lr, ret_from_exception
b do_undefinstr b do_undefinstr
...@@ -361,7 +370,7 @@ __pabt_usr: ...@@ -361,7 +370,7 @@ __pabt_usr:
alignment_trap r7, r0, __temp_abt alignment_trap r7, r0, __temp_abt
zero_fp zero_fp
enable_irq r0 @ Enable interrupts enable_irq r0 @ Enable interrupts
mov r0, r5 @ address (pc) mov r0, r2 @ address (pc)
mov r1, sp @ regs mov r1, sp @ regs
bl do_PrefetchAbort @ call abort handler bl do_PrefetchAbort @ call abort handler
/* fall through */ /* fall through */
...@@ -541,7 +550,8 @@ __stubs_start: ...@@ -541,7 +550,8 @@ __stubs_start:
* other mode than FIQ... Ok you can switch to another mode, but you can't * other mode than FIQ... Ok you can switch to another mode, but you can't
* get out of that mode without clobbering one register. * get out of that mode without clobbering one register.
*/ */
vector_fiq: disable_fiq vector_fiq:
disable_fiq
subs pc, lr, #4 subs pc, lr, #4
/*============================================================================= /*=============================================================================
...@@ -560,17 +570,22 @@ vector_addrexcptn: ...@@ -560,17 +570,22 @@ vector_addrexcptn:
*/ */
.align 5 .align 5
.LCvswi: .word vector_swi .LCvswi:
.word vector_swi
.LCsirq: .word __temp_irq .LCsirq:
.LCsund: .word __temp_und .word __temp_irq
.LCsabt: .word __temp_abt .LCsund:
.word __temp_und
.LCsabt:
.word __temp_abt
__stubs_end: __stubs_end:
.equ __real_stubs_start, .LCvectors + 0x200 .equ __real_stubs_start, .LCvectors + 0x200
.LCvectors: swi SYS_ERROR0 .LCvectors:
swi SYS_ERROR0
b __real_stubs_start + (vector_und - __stubs_start) b __real_stubs_start + (vector_und - __stubs_start)
ldr pc, __real_stubs_start + (.LCvswi - __stubs_start) ldr pc, __real_stubs_start + (.LCvswi - __stubs_start)
b __real_stubs_start + (vector_pabt - __stubs_start) b __real_stubs_start + (vector_pabt - __stubs_start)
...@@ -603,13 +618,16 @@ ENTRY(__trap_init) ...@@ -603,13 +618,16 @@ ENTRY(__trap_init)
* Do not reorder these, and do not insert extra data between... * Do not reorder these, and do not insert extra data between...
*/ */
__temp_irq: .word 0 @ saved lr_irq __temp_irq:
.word 0 @ saved lr_irq
.word 0 @ saved spsr_irq .word 0 @ saved spsr_irq
.word -1 @ old_r0 .word -1 @ old_r0
__temp_und: .word 0 @ Saved lr_und __temp_und:
.word 0 @ Saved lr_und
.word 0 @ Saved spsr_und .word 0 @ Saved spsr_und
.word -1 @ old_r0 .word -1 @ old_r0
__temp_abt: .word 0 @ Saved lr_abt __temp_abt:
.word 0 @ Saved lr_abt
.word 0 @ Saved spsr_abt .word 0 @ Saved spsr_abt
.word -1 @ old_r0 .word -1 @ old_r0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment