WebSVN – HelenOS – Diff – /branches/dd/kernel/generic/src/interrupt/interrupt.c

 /*
  * Copyright (c) 2005 Ondrej Palkovsky
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * - Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  * - The name of the author may not be used to endorse or promote products
  *   derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup genericinterrupt
  * @{
  */
 /**
  * @file
  * @brief   Interrupt redirector.
+ *
  * This file provides means of registering interrupt handlers
  * by kernel functions and calling the handlers when interrupts
  * occur.
  */
 #include <interrupt.h>
 #include <debug.h>
 #include <console/kconsole.h>
 #include <console/console.h>
 #include <console/chardev.h>
 #include <console/cmd.h>
 #include <panic.h>
 #include <print.h>
 #include <symtab.h>
 static struct {
     const char *name;
     iroutine f;
 } exc_table[IVT_ITEMS];
 SPINLOCK_INITIALIZE(exctbl_lock);
 /** Register exception handler
+ *
  * @param n Exception number
  * @param name Description
  * @param f Exception handler
  */
 iroutine exc_register(int n, const char *name, iroutine f)
+{
     ASSERT(n < IVT_ITEMS);
     iroutine old;
     spinlock_lock(&exctbl_lock);
     old = exc_table[n].f;
     exc_table[n].f = f;
     exc_table[n].name = name;
     spinlock_unlock(&exctbl_lock);
     return old;
+}
 /** Dispatch exception according to exception table
+ *
  * Called directly from the assembler code.
  * CPU is interrupts_disable()'d.
  */
 void exc_dispatch(int n, istate_t *istate)
+{
     ASSERT(n < IVT_ITEMS);
+#ifdef CONFIG_UDEBUG
+    if (THREAD) THREAD->udebug.uspace_state = istate;
+#endif
     exc_table[n].f(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();
+}
 /** Default 'null' exception handler */
 static void exc_undef(int n, istate_t *istate)
+{
     fault_if_from_uspace(istate, "Unhandled exception %d.", n);
     panic("Unhandled exception %d.", n);
+}
+#ifdef CONFIG_KCONSOLE
 /** kconsole cmd - print all exceptions */
-static int exc_print_cmd(cmd_arg_t *argv)
+static int cmd_exc_print(cmd_arg_t *argv)
+{
 #if (IVT_ITEMS > 0)
     unsigned int i;
     char *symbol;
     spinlock_lock(&exctbl_lock);
-    if (sizeof(void *) == 4) {
+#ifdef __32_BITS__
-        printf("Exc Description          Handler    Symbol\n");
+    printf("Exc Description          Handler    Symbol\n");
-        printf("--- -------------------- ---------- --------\n");
+    printf("--- -------------------- ---------- --------\n");
-    } else {
+#endif
+#ifdef __64_BITS__
-        printf("Exc Description          Handler            Symbol\n");
+    printf("Exc Description          Handler            Symbol\n");
-        printf("--- -------------------- ------------------ --------\n");
+    printf("--- -------------------- ------------------ --------\n");
-    }
+#endif
     for (i = 0; i < IVT_ITEMS; i++) {
         symbol = get_symtab_entry((unative_t) exc_table[i].f);
         if (!symbol)
             symbol = "not found";
-        if (sizeof(void *) == 4)
+#ifdef __32_BITS__
-            printf("%-3u %-20s %#10zx %s\n", i + IVT_FIRST, exc_table[i].name,
+        printf("%-3u %-20s %10p %s\n", i + IVT_FIRST, exc_table[i].name,
-                exc_table[i].f, symbol);
+            exc_table[i].f, symbol);
-        else
+#endif
+#ifdef __64_BITS__
-            printf("%-3u %-20s %#18zx %s\n", i + IVT_FIRST, exc_table[i].name,
+        printf("%-3u %-20s %18p %s\n", i + IVT_FIRST, exc_table[i].name,
-                exc_table[i].f, symbol);
+            exc_table[i].f, symbol);
+#endif
         if (((i + 1) % 20) == 0) {
             printf(" -- Press any key to continue -- ");
             spinlock_unlock(&exctbl_lock);
             getc(stdin);
             spinlock_lock(&exctbl_lock);
             printf("\n");
+        }
+    }
     spinlock_unlock(&exctbl_lock);
 #endif
     return 1;
+}
 static cmd_info_t exc_info = {
     .name = "exc",
     .description = "Print exception table.",
-    .func = exc_print_cmd,
+    .func = cmd_exc_print,
     .help = NULL,
     .argc = 0,
     .argv = NULL
 };
+#endif
 /** Initialize generic exception handling support */
 void exc_init(void)
+{
     int i;
-    for (i=0;i < IVT_ITEMS; i++)
+    for (i = 0; i < IVT_ITEMS; i++)
         exc_register(i, "undef", (iroutine) exc_undef);
+#ifdef CONFIG_KCONSOLE
     cmd_initialize(&exc_info);
     if (!cmd_register(&exc_info))
-        panic("could not register command %s\n", exc_info.name);
+        printf("Cannot register command %s\n", exc_info.name);
+#endif
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dd/kernel/generic/src/interrupt/interrupt.c – Rev 3022 → 4055