Changeset a35b458 in mainline for kernel/arch/ia64/src/asm.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/ia64/src/asm.S (modified) (8 diffs)

kernel/arch/ia64/src/asm.S

@@ -46 +46 @@
 FUNCTION_BEGIN(memcpy_to_uspace)
         alloc loc0 = ar.pfs, 3, 1, 0, 0
-        
+
         adds r14 = 7, in1
         mov r2 = ar.lc
@@ -53 +53 @@
         cmp.ne p6, p7 = r14, in1
         (p7) br.cond.dpnt 3f ;;
-        
+
         0:
-        
+
                 cmp.ne p6, p7 = 0, in2
                 (p7) br.cond.dpnt 2f ;;
@@ -62 +62 @@
                 (p6) mov r17 = r0 ;;
                 (p6) mov ar.lc = r14
-        
+
         1:
-        
+
                 add r14 = r16, in1
                 add r15 = r16, in0
@@ -72 +72 @@
                 st1 [r15] = r14
                 br.cloop.sptk.few 1b ;;
-        
+
         2:
-        
+
                 mov ar.lc = r2
                 mov ar.pfs = loc0
                 br.ret.sptk.many rp
-        
+
         3:
-        
+
                 adds r14 = 7, in0 ;;
                 and r14 = -8, r14 ;;
@@ -92 +92 @@
                 (p6) mov r17 = r0 ;;
                 (p6) mov ar.lc = r14
-        
+
         4:
-        
+
                 shladd r14 = r16, 3, r0
                 adds r16 = 1, r17 ;;
@@ -103 +103 @@
                 st8 [r14] = r15
                 br.cloop.sptk.few 4b
-        
+
         5:
-        
+
                 and r15 = 7, in2
                 shladd r14 = r18, 3, r0
@@ -116 +116 @@
                 (p6) br.cond.dpnt 2b ;;
                 mov ar.lc = r15
-        
+
         6:
-        
+
                 add r14 = r16, r17
                 add r15 = r16, in0
@@ -155 +155 @@
 FUNCTION_BEGIN(switch_to_userspace)
         alloc loc0 = ar.pfs, 6, 3, 0, 0
-        
+
         /* Disable interruption collection and interrupts */
         rsm (PSR_IC_MASK | PSR_I_MASK)
         srlz.d ;;
         srlz.i ;;
-        
+
         mov cr.ipsr = in4
         mov cr.iip = in0
         mov r12 = in1
-        
+
         xor r1 = r1, r1
-        
+
         /* r2 is defined to hold pcb_ptr - set it to 0 */
         xor r2 = r2, r2
-        
+
         mov loc1 = cr.ifs
         movl loc2 = PFM_MASK ;;
         and loc1 = loc2, loc1 ;;
         mov cr.ifs = loc1 ;;  /* prevent decrementing BSP by rfi */
-        
+
         invala
-        
+
         mov loc1 = ar.rsc ;;
         and loc1 = ~3, loc1 ;;
         mov ar.rsc = loc1 ;;  /* put RSE into enforced lazy mode */
-        
+
         flushrs ;;
-        
+
         mov ar.bspstore = in2 ;;
         mov ar.rsc = in5 ;;
-        
+
         mov r8 = in3
-        
+
         rfi ;;
 FUNCTION_END(switch_to_userspace)