Changeset a35b458 in mainline for kernel/arch/ppc32/src/exception.S

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• kernel/arch/ppc32/src/exception.S (modified) (22 diffs)

kernel/arch/ppc32/src/exception.S

@@ -38 +38 @@
 
 .macro CONTEXT_STORE
-        
+
         # save r12 in SPRG1, backup CR in r12
         # save SP in SPRG2
-        
+
         mtsprg1 r12
         mfcr r12
         mtsprg2 sp
-        
+
         # check whether the previous mode was user or kernel
-        
+
         mfsrr1 sp # use sp as a temporary register to hold SRR1
         andi. sp, sp, MSR_PR
         bne 1f
                 # previous mode was kernel
-                
+
                 mfsprg2 sp
                 subis sp, sp, 0x8000
         b 2f
-        
+
         1:
                 # previous mode was user
-                
+
                 mfsprg0 sp
         2:
-        
+
         subi sp, sp, ALIGN_UP(ISTATE_SIZE, STACK_ALIGNMENT)
         stw r0, ISTATE_OFFSET_R0(sp)
@@ -94 +94 @@
         stw r30, ISTATE_OFFSET_R30(sp)
         stw r31, ISTATE_OFFSET_R31(sp)
-        
+
         stw r12, ISTATE_OFFSET_CR(sp)
-        
+
         mfsrr0 r12
         stw r12, ISTATE_OFFSET_PC(sp)
-        
+
         mfsrr1 r12
         stw r12, ISTATE_OFFSET_SRR1(sp)
-        
+
         mflr r12
         stw r12, ISTATE_OFFSET_LR(sp)
-        
+
         mfctr r12
         stw r12, ISTATE_OFFSET_CTR(sp)
-        
+
         mfxer r12
         stw r12, ISTATE_OFFSET_XER(sp)
-        
+
         mfdar r12
         stw r12, ISTATE_OFFSET_DAR(sp)
-        
+
         mfsprg1 r12
         stw r12, ISTATE_OFFSET_R12(sp)
-        
+
         mfsprg2 r12
         stw r12, ISTATE_OFFSET_SP(sp)
@@ -129 +129 @@
 SYMBOL(exc_system_reset)
         CONTEXT_STORE
-        
+
         li r3, 0
         b jump_to_kernel
@@ -136 +136 @@
 SYMBOL(exc_machine_check)
         CONTEXT_STORE
-        
+
         li r3, 1
         b jump_to_kernel
@@ -143 +143 @@
 SYMBOL(exc_data_storage)
         CONTEXT_STORE
-        
+
         li r3, 2
         b jump_to_kernel
@@ -150 +150 @@
 SYMBOL(exc_instruction_storage)
         CONTEXT_STORE
-        
+
         li r3, 3
         b jump_to_kernel
@@ -157 +157 @@
 SYMBOL(exc_external)
         CONTEXT_STORE
-        
+
         li r3, 4
         b jump_to_kernel
@@ -164 +164 @@
 SYMBOL(exc_alignment)
         CONTEXT_STORE
-        
+
         li r3, 5
         b jump_to_kernel
@@ -171 +171 @@
 SYMBOL(exc_program)
         CONTEXT_STORE
-        
+
         li r3, 6
         b jump_to_kernel
@@ -178 +178 @@
 SYMBOL(exc_fp_unavailable)
         CONTEXT_STORE
-        
+
         li r3, 7
         b jump_to_kernel
@@ -185 +185 @@
 SYMBOL(exc_decrementer)
         CONTEXT_STORE
-        
+
         li r3, 8
         b jump_to_kernel
@@ -192 +192 @@
 SYMBOL(exc_reserved0)
         CONTEXT_STORE
-        
+
         li r3, 9
         b jump_to_kernel
@@ -199 +199 @@
 SYMBOL(exc_reserved1)
         CONTEXT_STORE
-        
+
         li r3, 10
         b jump_to_kernel
@@ -206 +206 @@
 SYMBOL(exc_syscall)
         CONTEXT_STORE
-        
+
         b jump_to_kernel_syscall
 
@@ -212 +212 @@
 SYMBOL(exc_trace)
         CONTEXT_STORE
-        
+
         li r3, 12
         b jump_to_kernel
@@ -219 +219 @@
 SYMBOL(exc_itlb_miss)
         CONTEXT_STORE
-        
+
         li r3, 13
         b jump_to_kernel
@@ -226 +226 @@
 SYMBOL(exc_dtlb_miss_load)
         CONTEXT_STORE
-        
+
         li r3, 14
         b jump_to_kernel
@@ -233 +233 @@
 SYMBOL(exc_dtlb_miss_store)
         CONTEXT_STORE
-        
+
         li r3, 15
         b jump_to_kernel
@@ -244 +244 @@
                 # Previous mode was kernel.
                 # We can construct a proper frame linkage.
-                
+
                 mfsrr0 r12
                 stw r12, ISTATE_OFFSET_LR_FRAME(sp)
@@ -265 +265 @@
         ori r12, r12, (MSR_IR | MSR_DR)
         mtsrr1 r12
-        
+
         addis sp, sp, 0x8000
         mr r4, sp
-        
+
         rfi
 
@@ -275 +275 @@
         addi r12, r12, syscall_handler@l
         mtsrr0 r12
-        
+
         lis r12, iret_syscall@ha
         addi r12, r12, iret_syscall@l
@@ -286 +286 @@
         ori r12, r12, (MSR_IR | MSR_DR | MSR_EE)
         mtsrr1 r12
-        
+
         addis sp, sp, 0x8000
         rfi