Changeset a35b458 in mainline for boot/arch/sparc64/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:

• boot/arch/sparc64/src/asm.S (modified) (5 diffs)

boot/arch/sparc64/src/asm.S

@@ -65 +65 @@
 1:
         ! Disable interrupts and disable address masking.
-        
+
         wrpr %g0, PSTATE_PRIV_BIT, %pstate
-        
+
         wrpr %g0, NWINDOWS - 2, %cansave   ! Set maximum saveable windows
         wrpr %g0, 0, %canrestore           ! Get rid of windows we will never need again
         wrpr %g0, 0, %otherwin             ! Make sure the window state is consistent
         wrpr %g0, NWINDOWS - 1, %cleanwin  ! Prevent needless clean_window traps for kernel
-        
+
         set initial_stack, %sp
         add %sp, -STACK_BIAS, %sp
-        
+
         set ofw_cif, %l0
-        
+
         ! Initialize OpenFirmware
-        
+
         call ofw_init
         stx %o4, [%l0]
-        
+
         ba %xcc, bootstrap
         nop
@@ -105 +105 @@
          * 3. Flush instruction pipeline.
          */
-        
+
         /*
          * US3 processors have a write-invalidate cache, so explicitly
@@ -115 +115 @@
         be %xcc, 1f
         nop
-        
+
         0:
                 call icache_flush
                 nop
-        
+
         1:
                 membar #StoreStore
-        
+
         /*
          * Flush the instruction pipeline.
          */
         flush %i7
-        
+
         ! Jump to kernel
         jmp %o3
@@ -138 +138 @@
         set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
         stxa %g0, [%g1] ASI_ICACHE_TAG
-        
+
         0:
                 membar #Sync
                 subcc %g1, ICACHE_LINE_SIZE, %g1
                 bnz,pt %xcc, 0b
-        
+
         stxa %g0, [%g1] ASI_ICACHE_TAG
         membar #Sync
         retl
-        
+
         ! SF Erratum #51
-        
+
         nop
 #else
@@ -161 +161 @@
         set ofw_cif, %l0
         ldx [%l0], %l0
-        
+
         rdpr %pstate, %l1
         and %l1, ~PSTATE_AM_BIT, %l2
         wrpr %l2, 0, %pstate
-        
+
         jmpl %l0, %o7
         mov %i0, %o0
-        
+
         wrpr %l1, 0, %pstate
-        
+
         ret
         restore %o0, 0, %o0