Changeset b3b7e14 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2010-06-11T15:31:03Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

214ec25c

Parents:

be06914

Message:

distinguish between "hot" and "cold" exceptions
display only "hot" exceptions by default
add top to help

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -61 +61 @@
 /** Register exception handler
  *
- * @param n       Exception number
- * @param name    Description
- * @param handler Exception handler
- *
- */
-iroutine exc_register(int n, const char *name, iroutine handler)
-{
+ * @param n       Exception number.
+ * @param name    Description.
+ * @param hot     Whether the exception is actually handled
+ *                in any meaningful way.
+ * @param handler New exception handler.
+ *
+ * @return Previously registered exception handler.
+ *
+ */
+iroutine_t exc_register(unsigned int n, const char *name, bool hot,
+    iroutine_t handler)
+{
+#if (IVT_ITEMS > 0)
         ASSERT(n < IVT_ITEMS);
+#endif
         
         irq_spinlock_lock(&exctbl_lock, true);
         
-        iroutine old = exc_table[n].f;
-        exc_table[n].f = handler;
+        iroutine_t old = exc_table[n].handler;
+        exc_table[n].handler = handler;
         exc_table[n].name = name;
+        exc_table[n].hot = hot;
         exc_table[n].cycles = 0;
         exc_table[n].count = 0;
@@ -89 +97 @@
  *
  */
-void exc_dispatch(int n, istate_t *istate)
-{
+void exc_dispatch(unsigned int n, istate_t *istate)
+{
+#if (IVT_ITEMS > 0)
         ASSERT(n < IVT_ITEMS);
+#endif
         
         uint64_t begin_cycle = get_cycle();
@@ -107 +117 @@
 #endif
         
-        exc_table[n].f(n + IVT_FIRST, istate);
+        exc_table[n].handler(n + IVT_FIRST, istate);
         
 #ifdef CONFIG_UDEBUG
@@ -185 +195 @@
 #ifdef CONFIG_KCONSOLE
 
+static char flag_buf[MAX_CMDLINE + 1];
+
 /** Print all exceptions
  *
@@ -190 +202 @@
 static int cmd_exc_print(cmd_arg_t *argv)
 {
+        bool excs_all;
+        
+        if (str_cmp(flag_buf, "-a") == 0)
+                excs_all = true;
+        else if (str_cmp(flag_buf, "") == 0)
+                excs_all = false;
+        else {
+                printf("Unknown argument \"%s\".\n", flag_buf);
+                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     Handler    Symbol\n");
-        printf("--- -------------------- ---------- ---------- ---------- --------\n");
+        printf("[exc   ] [description       ] [count   ] [cycles  ]"
+            " [handler ] [symbol\n");
+        rows = 1;
 #endif
         
 #ifdef __64_BITS__
-        printf("Exc Description          Count      Cycles     Handler            Symbol\n");
-        printf("--- -------------------- ---------- ---------- ------------------ --------\n");
+        printf("[exc   ] [description       ] [count   ] [cycles  ]"
+            " [handler         ]\n");
+        printf("         [symbol\n");
+        rows = 2;
 #endif
         
         for (i = 0; i < IVT_ITEMS; i++) {
+                if ((!excs_all) && (!exc_table[i].hot))
+                        continue;
+                
                 uint64_t count;
                 char count_suffix;
@@ -217 +247 @@
                 
                 const char *symbol =
-                    symtab_fmt_name_lookup((unative_t) exc_table[i].f);
+                    symtab_fmt_name_lookup((unative_t) exc_table[i].handler);
                 
 #ifdef __32_BITS__
-                printf("%-3u %-20s %9" PRIu64 "%c %9" PRIu64 "%c %10p %s\n",
+                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].f, symbol);
+                    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("%-3u %-20s %9" PRIu64 "%c %9" PRIu64 "%c %18p %s\n",
+                printf("%-8u %-20s %9" PRIu64 "%c %9" PRIu64 "%c %18p\n",
                     i + IVT_FIRST, exc_table[i].name, count, count_suffix,
-                    cycles, cycles_suffix, exc_table[i].f, symbol);
-#endif
-                
-                if (((i + 1) % 20) == 0) {
-                        printf(" -- Press any key to continue -- ");
-                        irq_spinlock_unlock(&exctbl_lock, true);
-                        indev_pop_character(stdin);
-                        irq_spinlock_lock(&exctbl_lock, true);
-                        printf("\n");
-                }
+                    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);
-#endif
+#else /* (IVT_ITEMS > 0) */
+        
+        printf("No exception table%s.\n", excs_all ? " (showing all exceptions)" : "");
+        
+#endif /* (IVT_ITEMS > 0) */
         
         return 1;
 }
+
+static cmd_arg_t exc_argv = {
+        .type = ARG_TYPE_STRING_OPTIONAL,
+        .buffer = flag_buf,
+        .len = sizeof(flag_buf)
+};
 
 static cmd_info_t exc_info = {
         .name = "exc",
-        .description = "Print exception table.",
+        .description = "Print exception table (use -a for all exceptions).",
         .func = cmd_exc_print,
         .help = NULL,
-        .argc = 0,
-        .argv = NULL
+        .argc = 1,
+        .argv = &exc_argv
 };
 
@@ -268 +307 @@
         
         for (i = 0; i < IVT_ITEMS; i++)
-                exc_register(i, "undef", (iroutine) exc_undef);
+                exc_register(i, "undef", false, (iroutine_t) exc_undef);
 #endif