Changeset a35b458 in mainline for kernel/arch/mips32/src/start.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/mips32/src/start.S (modified) (13 diffs)

kernel/arch/mips32/src/start.S

@@ -89 +89 @@
         sw $s7, ISTATE_OFFSET_S7(\r)
         sw $s8, ISTATE_OFFSET_S8(\r)
-        
+
         mflo $at
         sw $at, ISTATE_OFFSET_LO(\r)
         mfhi $at
         sw $at, ISTATE_OFFSET_HI(\r)
-        
+
         sw $gp, ISTATE_OFFSET_GP(\r)
         sw $ra, ISTATE_OFFSET_RA(\r)
         sw $k0, ISTATE_OFFSET_KT0(\r)
         sw $k1, ISTATE_OFFSET_KT1(\r)
-        
+
         mfc0 $t0, $status
         mfc0 $t1, $epc
-        
+
         /* save only KSU, EXL, ERL, IE */
         and $t2, $t0, REG_SAVE_MASK
-        
+
         /* clear KSU, EXL, ERL, IE */
         li $t3, ~(REG_SAVE_MASK)
         and $t0, $t0, $t3
-        
+
         sw $t2, ISTATE_OFFSET_STATUS(\r)
         sw $t1, ISTATE_OFFSET_EPC(\r)
@@ -122 +122 @@
         mfc0 $t0, $status
         lw $t1, ISTATE_OFFSET_STATUS(\r)
-        
+
         /* mask UM, EXL, ERL, IE */
         li $t2, ~REG_SAVE_MASK
         and $t0, $t0, $t2
-        
+
         /* copy UM, EXL, ERL, IE from saved status */
         or $t0, $t0, $t1
         mtc0 $t0, $status
-        
+
         lw $v0, ISTATE_OFFSET_V0(\r)
         lw $v1, ISTATE_OFFSET_V1(\r)
@@ -147 +147 @@
         lw $t8, ISTATE_OFFSET_T8(\r)
         lw $t9, ISTATE_OFFSET_T9(\r)
-        
+
         lw $gp, ISTATE_OFFSET_GP(\r)
         lw $ra, ISTATE_OFFSET_RA(\r)
         lw $k1, ISTATE_OFFSET_KT1(\r)
-        
+
         lw $at, ISTATE_OFFSET_LO(\r)
         mtlo $at
         lw $at, ISTATE_OFFSET_HI(\r)
         mthi $at
-        
+
         lw $at, ISTATE_OFFSET_EPC(\r)
         mtc0 $at, $epc
-        
+
         lw $at, ISTATE_OFFSET_AT(\r)
         lw $sp, ISTATE_OFFSET_SP(\r)
@@ -172 +172 @@
         mfc0 $k0, $status
         andi $k0, 0x10
-        
+
         beq $k0, $0, 1f
         move $k0, $sp
-        
+
         /* move $k0 pointer to kernel stack */
         la $k0, supervisor_sp
-        
+
         /* move $k0 (supervisor_sp) */
         lw $k0, ($k0)
-        
+
         1:
 .endm
@@ -190 +190 @@
         lui $sp, %hi(end_stack)
         ori $sp, $sp, %lo(end_stack)
-        
+
         /* not sure about this, but might be needed for PIC code */
         lui $gp, 0x8000
-        
+
         /* $a1 contains physical address of bootinfo_t */
         jal mips32_pre_main
         addiu $sp, -ABI_STACK_FRAME
-        
+
         j main_bsp
         nop
@@ -219 +219 @@
 exception_handler:
         KERNEL_STACK_TO_K0
-        
+
         sub $k0, ISTATE_SIZE
         sw $sp, ISTATE_OFFSET_SP($k0)
         move $sp, $k0
-        
+
         mfc0 $k0, $cause
-        
+
         sra $k0, $k0, 0x2    /* cp0_exc_cause() part 1 */
         andi $k0, $k0, 0x1f  /* cp0_exc_cause() part 2 */
         sub $k0, 8           /* 8 = SYSCALL */
-        
+
         beqz $k0, syscall_shortcut
         add $k0, 8           /* revert $k0 back to correct exc number */
-        
+
         REGISTERS_STORE_AND_EXC_RESET $sp
-        
+
         move $a1, $sp
         move $a0, $k0
@@ -240 +240 @@
         addiu $sp, -ABI_STACK_FRAME
         addiu $sp, ABI_STACK_FRAME
-        
+
         REGISTERS_LOAD $sp
         /* the $sp is automatically restored to former value */
@@ -265 +265 @@
         sw $t3, ISTATE_OFFSET_EPC($sp)  /* save EPC */
         sw $k1, ISTATE_OFFSET_KT1($sp)  /* save $k1 not saved on context switch */
-        
+
         and $t4, $t2, REG_SAVE_MASK  /* save only KSU, EXL, ERL, IE */
         li $t5, ~(0x1f)
         and $t2, $t2, $t5  /* clear KSU, EXL, ERL */
         ori $t2, $t2, 0x1  /* set IE */
-        
+
         sw $t4, ISTATE_OFFSET_STATUS($sp)
         mtc0 $t2, $status
-        
+
         /*
          * Call the higher level system call handler.
@@ -280 +280 @@
         sw $t0, ISTATE_OFFSET_T0($sp)  /* save the 5th argument on the stack */
         sw $t1, ISTATE_OFFSET_T1($sp)  /* save the 6th argument on the stack */
-        
+
         jal syscall_handler
         sw $v0, ISTATE_OFFSET_V0($sp)  /* save the syscall number on the stack */
-        
+
         /* restore status */
         mfc0 $t2, $status
         lw $t3, ISTATE_OFFSET_STATUS($sp)
-        
+
         /*
          * Change back to EXL = 1 (from last exception), otherwise
@@ -297 +297 @@
         or $t2, $t2, $t3  /* copy saved UM, EXL, ERL, IE */
         mtc0 $t2, $status
-        
+
         /* restore epc + 4 */
         lw $t2, ISTATE_OFFSET_EPC($sp)
@@ -303 +303 @@
         addi $t2, $t2, 4
         mtc0 $t2, $epc
-        
+
         lw $sp, ISTATE_OFFSET_SP($sp)  /* restore $sp */
         eret
@@ -314 +314 @@
         sw $sp, ISTATE_OFFSET_SP($k0)
         move $sp, $k0
-        
+
         move $a0, $sp
         jal tlb_refill
         addiu $sp, -ABI_STACK_FRAME
         addiu $sp, ABI_STACK_FRAME
-        
+
         REGISTERS_LOAD $sp
         eret
@@ -330 +330 @@
         sw $sp, ISTATE_OFFSET_SP($k0)
         move $sp, $k0
-        
+
         move $a0, $sp
         jal cache_error
         addiu $sp, -ABI_STACK_FRAME
         addiu $sp, ABI_STACK_FRAME
-        
+
         REGISTERS_LOAD $sp
         eret