Skip to content

Commit

Permalink
arch/arm: Minor style fix
Browse files Browse the repository at this point in the history
Signed-off-by: Xiang Xiao <[email protected]>
  • Loading branch information
xiaoxiang781216 authored and davids5 committed Apr 5, 2021
1 parent 39fc932 commit 807d449
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions arch/arm/src/armv7-a/arm_vectors.S
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ arm_vectorirq:
* USER mode r13(sp) and r14(lr).
*/

and r1, r4, #PSR_MODE_MASK /* Interrupted mode */
and r1, r4, #PSR_MODE_MASK /* Interrupted mode */
cmp r1, #PSR_MODE_USR /* User mode? */
bne .Lirqentersvc /* Branch if not user mode */

Expand Down Expand Up @@ -301,7 +301,7 @@ arm_vectorirq:
* values of USER mode r13(sp) and r14(lr).
*/

and r2, r1, #PSR_MODE_MASK /* Interrupted mode */
and r2, r1, #PSR_MODE_MASK /* Interrupted mode */
cmp r2, #PSR_MODE_USR /* User mode? */
bne .Lirqleavesvc /* Branch if not user mode */

Expand All @@ -310,7 +310,7 @@ arm_vectorirq:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -448,7 +448,7 @@ arm_vectorsvc:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -592,7 +592,7 @@ arm_vectordata:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -738,7 +738,7 @@ arm_vectorprefetch:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -879,7 +879,7 @@ arm_vectorundefinsn:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -945,7 +945,7 @@ arm_vectorfiq:
* USER mode rr13(sp) and r14(lr).
*/

and r1, r4, #PSR_MODE_MASK /* Interrupted mode */
and r1, r4, #PSR_MODE_MASK /* Interrupted mode */
cmp r1, #PSR_MODE_USR /* User mode? */
bne .Lfiqentersvc /* Branch if not user mode */

Expand Down Expand Up @@ -1021,7 +1021,7 @@ arm_vectorfiq:
* values of USER mode r13(sp) and r14(lr).
*/

and r2, r1, #PSR_MODE_MASK /* Interrupted mode */
and r2, r1, #PSR_MODE_MASK /* Interrupted mode */
cmp r2, #PSR_MODE_USR /* User mode? */
bne .Lfiqleavesvc /* Branch if not user mode */

Expand All @@ -1030,7 +1030,7 @@ arm_vectorfiq:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down
20 changes: 10 additions & 10 deletions arch/arm/src/armv7-r/arm_vectors.S
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ arm_vectorirq:
* USER mode r13(sp) and r14(lr).
*/

and r1, r4, #PSR_MODE_MASK /* Interrupted mode */
and r1, r4, #PSR_MODE_MASK /* Interrupted mode */
cmp r1, #PSR_MODE_USR /* User mode? */
bne .Lirqentersvc /* Branch if not user mode */

Expand Down Expand Up @@ -201,7 +201,7 @@ arm_vectorirq:
* values of USER mode r13(sp) and r14(lr).
*/

and r2, r1, #PSR_MODE_MASK /* Interrupted mode */
and r2, r1, #PSR_MODE_MASK /* Interrupted mode */
cmp r2, #PSR_MODE_USR /* User mode? */
bne .Lirqleavesvc /* Branch if not user mode */

Expand All @@ -210,7 +210,7 @@ arm_vectorirq:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -341,7 +341,7 @@ arm_vectorsvc:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -485,7 +485,7 @@ arm_vectordata:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -631,7 +631,7 @@ arm_vectorprefetch:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -772,7 +772,7 @@ arm_vectorundefinsn:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down Expand Up @@ -838,7 +838,7 @@ arm_vectorfiq:
* USER mode rr13(sp) and r14(lr).
*/

and r1, r4, #PSR_MODE_MASK /* Interrupted mode */
and r1, r4, #PSR_MODE_MASK /* Interrupted mode */
cmp r1, #PSR_MODE_USR /* User mode? */
bne .Lfiqentersvc /* Branch if not user mode */

Expand Down Expand Up @@ -914,7 +914,7 @@ arm_vectorfiq:
* values of USER mode r13(sp) and r14(lr).
*/

and r2, r1, #PSR_MODE_MASK /* Interrupted mode */
and r2, r1, #PSR_MODE_MASK /* Interrupted mode */
cmp r2, #PSR_MODE_USR /* User mode? */
bne .Lfiqleavesvc /* Branch if not user mode */

Expand All @@ -923,7 +923,7 @@ arm_vectorfiq:
*/

mov r13, r0 /* (SVC) R13=Register storage area */
ldmia r13, {r0-R12} /* Restore common R0-R12 */
ldmia r13, {r0-r12} /* Restore common R0-R12 */
add r14, r13, #(4*REG_R13) /* (SVC) R14=address of R13/R14 storage */
ldmia r14, {r13, r14}^ /* Restore user mode R13/R14 */
add r14, r13, #(4*REG_R15) /* (SVC) R14=address of R15 storage */
Expand Down

0 comments on commit 807d449

Please sign in to comment.