Changeset a35b458 in mainline for kernel/arch/sparc64/src/trap

Timestamp:

2018-03-02T20:10:49Z (8 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.

Location:

kernel/arch/sparc64/src/trap

Files:

• exception.c (modified) (2 diffs)
• sun4u/interrupt.c (modified) (5 diffs)
• sun4u/trap_table.S (modified) (7 diffs)
• sun4v/trap_table.S (modified) (5 diffs)

kernel/arch/sparc64/src/trap/exception.c

@@ -48 +48 @@
         const char *tpcs = symtab_fmt_name_lookup(istate->tpc);
         const char *tnpcs = symtab_fmt_name_lookup(istate->tnpc);
-        
+
         printf("TSTATE=%#" PRIx64 "\n", istate->tstate);
         printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, tpcs);
@@ -100 +100 @@
 {
         fprs_reg_t fprs;
-        
+
         fprs.value = fprs_read();
         if (!fprs.fef) {

kernel/arch/sparc64/src/trap/sun4u/interrupt.c

@@ -58 +58 @@
         if (status & (!INTR_DISPATCH_STATUS_BUSY))
                 panic("Interrupt Dispatch Status busy bit not set\n");
-        
+
         uint64_t intrcv = asi_u64_read(ASI_INTR_RECEIVE, 0);
 #if defined (US)
@@ -65 +65 @@
         uint64_t data0 = asi_u64_read(ASI_INTR_R, VA_INTR_R_DATA_0);
 #endif
-        
+
         irq_t *irq = irq_dispatch_and_lock(data0);
         if (irq) {
@@ -72 +72 @@
                  */
                 irq->handler(irq);
-                
+
                 /*
                  * See if there is a clear-interrupt-routine and call it.
@@ -78 +78 @@
                 if (irq->cir)
                         irq->cir(irq->cir_arg, irq->inr);
-                
+
                 irq_spinlock_unlock(&irq->lock, false);
         } else if (data0 > config.base) {
@@ -103 +103 @@
 #endif
         }
-        
+
         membar();
         asi_u64_write(ASI_INTR_RECEIVE, 0, 0);

kernel/arch/sparc64/src/trap/sun4u/trap_table.S

@@ -502 +502 @@
 .if NOT(\is_syscall)
         rdpr %tstate, %g3
-        
+
         /*
          * One of the ways this handler can be invoked is after a nested MMU trap from
@@ -576 +576 @@
          */
         wrpr %g0, WSTATE_OTHER(0) | WSTATE_NORMAL(0), %wstate
-        
+
         /*
          * Copy arguments.
@@ -605 +605 @@
          */
         stx %g4, [%sp + STACK_BIAS + ISTATE_OFFSET_Y]
-        
+
         wrpr %g0, 0, %tl
         wrpr %g0, PSTATE_PRIV_BIT | PSTATE_PEF_BIT, %pstate
         SAVE_GLOBALS
-        
+
 .if NOT(\is_syscall)
         /*
@@ -629 +629 @@
         wrpr %g0, PSTATE_AG_BIT | PSTATE_PRIV_BIT, %pstate
         wrpr %g0, 1, %tl
-        
+
         /*
          * Read TSTATE, TPC and TNPC from saved copy.
@@ -742 +742 @@
         rd %pc, %g1
         flush %g1
-        
+
         rdpr %cwp, %g1
         rdpr %otherwin, %g2
@@ -800 +800 @@
         mov NWINDOWS - 2, %g1                   ! use dealy slot for both cases
         sub %g1, %g2, %g1
-        
+
         wrpr %g0, 0, %otherwin
         wrpr %g1, 0, %cansave                   ! NWINDOWS - 2 - CANRESTORE
@@ -845 +845 @@
         and %g1, NWINDOWS - 1, %g1
         wrpr %g1, 0, %cwp                       ! CWP--
-        
+
 .if \is_syscall
         done

kernel/arch/sparc64/src/trap/sun4v/trap_table.S

@@ -606 +606 @@
         and \tmpreg1, NWINDOWS - 1, \tmpreg1            ! modulo NWINDOWS
         wrpr \tmpreg1, %cwp
-        
+
         ! spill to kernel stack
         stx %l0, [%sp + STACK_BIAS + L0_OFFSET]
@@ -766 +766 @@
         ldx [%sp + STACK_BIAS + ISTATE_OFFSET_Y], %g4
         wr %g4, %y
-        
+
         /* If TSTATE.CWP + 1 == CWP, then we do not have to fix CWP. */
         and %g1, TSTATE_CWP_MASK, %l0
@@ -871 +871 @@
         and \tmpreg1, NWINDOWS - 1, \tmpreg1            ! modulo NWINDOWS
         wrpr \tmpreg1, %cwp
-        
+
         ! spill to userspace window buffer
         SAVE_TO_USPACE_WBUF \tmpreg3, \tmpreg1
@@ -1028 +1028 @@
         mov NWINDOWS - 2, %g1                   ! use dealy slot for both cases
         sub %g1, %g2, %g1
-        
+
         wrpr %g0, 0, %otherwin
         wrpr %g1, 0, %cansave                   ! NWINDOWS - 2 - CANRESTORE
@@ -1073 +1073 @@
         and %g1, NWINDOWS - 1, %g1
         wrpr %g1, 0, %cwp                       ! CWP--
-        
+
 .if \is_syscall
         done