Changeset 8565a42 in mainline for kernel/generic/src/interrupt

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

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

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (13 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -78 +78 @@
         assert(n < IVT_ITEMS);
 #endif
-        
+
         irq_spinlock_lock(&exctbl_lock, true);
-        
+
         iroutine_t old = exc_table[n].handler;
         exc_table[n].handler = handler;
@@ -87 +87 @@
         exc_table[n].cycles = 0;
         exc_table[n].count = 0;
-        
+
         irq_spinlock_unlock(&exctbl_lock, true);
-        
+
         return old;
 }
@@ -104 +104 @@
         assert(n < IVT_ITEMS);
 #endif
-        
+
         /* Account user cycles */
         if (THREAD) {
@@ -111 +111 @@
                 irq_spinlock_unlock(&THREAD->lock, false);
         }
-        
+
         /* Account CPU usage if it woke up from sleep */
         if (CPU && CPU->idle) {
@@ -121 +121 @@
                 irq_spinlock_unlock(&CPU->lock, false);
         }
-        
+
         uint64_t begin_cycle = get_cycle();
-        
+
 #ifdef CONFIG_UDEBUG
         if (THREAD)
                 THREAD->udebug.uspace_state = istate;
 #endif
-        
+
         exc_table[n].handler(n + IVT_FIRST, istate);
-        
+
 #ifdef CONFIG_UDEBUG
         if (THREAD)
                 THREAD->udebug.uspace_state = NULL;
 #endif
-        
+
         /* This is a safe place to exit exiting thread */
         if ((THREAD) && (THREAD->interrupted) && (istate_from_uspace(istate)))
                 thread_exit();
-        
+
         /* Account exception handling */
         uint64_t end_cycle = get_cycle();
-        
+
         irq_spinlock_lock(&exctbl_lock, false);
         exc_table[n].cycles += end_cycle - begin_cycle;
         exc_table[n].count++;
         irq_spinlock_unlock(&exctbl_lock, false);
-        
+
         /* Do not charge THREAD for exception cycles */
         if (THREAD) {
@@ -171 +171 @@
             "program counter %p.\n", TASK->name, TASK->taskid,
             (void *) istate_get_pc(istate));
-        
+
         istate_decode(istate);
         stack_trace_istate(istate);
-        
+
         printf("Kill message: ");
         vprintf(fmt, args);
         printf("\n");
-        
+
         task_kill_self(true);
 }
@@ -201 +201 @@
         if (!istate_from_uspace(istate))
                 return;
-        
+
         va_list args;
         va_start(args, fmt);
@@ -236 +236 @@
 {
         bool excs_all;
-        
+
         if (str_cmp(flag_buf, "-a") == 0)
                 excs_all = true;
@@ -245 +245 @@
                 return 1;
         }
-        
+
 #if (IVT_ITEMS > 0)
         unsigned int i;
         unsigned int rows;
-        
+
         irq_spinlock_lock(&exctbl_lock, true);
-        
+
 #ifdef __32_BITS__
         printf("[exc   ] [description       ] [count   ] [cycles  ]"
@@ -257 +257 @@
         rows = 1;
 #endif
-        
+
 #ifdef __64_BITS__
         printf("[exc   ] [description       ] [count   ] [cycles  ]"
@@ -264 +264 @@
         rows = 2;
 #endif
-        
+
         for (i = 0; i < IVT_ITEMS; i++) {
                 if ((!excs_all) && (!exc_table[i].hot))
                         continue;
-                
+
                 uint64_t count;
                 char count_suffix;
-                
+
                 order_suffix(exc_table[i].count, &count, &count_suffix);
-                
+
                 uint64_t cycles;
                 char cycles_suffix;
-                
+
                 order_suffix(exc_table[i].cycles, &cycles, &cycles_suffix);
-                
+
                 const char *symbol =
                     symtab_fmt_name_lookup((sysarg_t) exc_table[i].handler);
-                
+
 #ifdef __32_BITS__
                 printf("%-8u %-20s %9" PRIu64 "%c %9" PRIu64 "%c %10p %s\n",
                     i + IVT_FIRST, exc_table[i].name, count, count_suffix,
                     cycles, cycles_suffix, exc_table[i].handler, symbol);
-                
+
                 PAGING(rows, 1, irq_spinlock_unlock(&exctbl_lock, true),
                     irq_spinlock_lock(&exctbl_lock, true));
 #endif
-                
+
 #ifdef __64_BITS__
                 printf("%-8u %-20s %9" PRIu64 "%c %9" PRIu64 "%c %18p\n",
@@ -296 +296 @@
                     cycles, cycles_suffix, exc_table[i].handler);
                 printf("         %s\n", symbol);
-                
+
                 PAGING(rows, 2, irq_spinlock_unlock(&exctbl_lock, true),
                     irq_spinlock_lock(&exctbl_lock, true));
 #endif
         }
-        
+
         irq_spinlock_unlock(&exctbl_lock, true);
 #else /* (IVT_ITEMS > 0) */
-        
+
         printf("No exception table%s.\n", excs_all ? " (showing all exceptions)" : "");
-        
+
 #endif /* (IVT_ITEMS > 0) */
-        
+
         return 1;
 }
@@ -335 +335 @@
 {
         (void) exc_undef;
-        
+
 #if (IVT_ITEMS > 0)
         unsigned int i;
-        
+
         for (i = 0; i < IVT_ITEMS; i++)
                 exc_register(i, "undef", false, (iroutine_t) exc_undef);
 #endif
-        
+
 #ifdef CONFIG_KCONSOLE
         cmd_initialize(&exc_info);