Changeset 99de22b in mainline for kernel/generic/include

Timestamp:

2010-01-15T18:30:25Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

eeb643d

Parents:

387416b (diff), 563d6077 (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.

Message:

Merged latest trunk changes.

Location:

kernel/generic/include

Files:

• debug.h (modified) (2 diffs)
• interrupt.h (modified) (2 diffs)
• panic.h (modified) (1 diff)
• stacktrace.h (added)
• symtab.h (modified) (1 diff)

kernel/generic/include/debug.h

@@ -75 +75 @@
 #       define LOG(format, ...) \
                 printf("%s() at %s:%u: " format "\n", __func__, __FILE__, \
-                        __LINE__, ##__VA_ARGS__);
+                    __LINE__, ##__VA_ARGS__);
 #else
 #       define LOG(format, ...)
@@ -92 +92 @@
                 { \
                         printf("%s() at %s:%u: " #fnc "\n", __func__, __FILE__, \
-                        __LINE__); \
+                            __LINE__); \
                         fnc; \
                 }

kernel/generic/include/interrupt.h

@@ -42 +42 @@
 #include <arch.h>
 #include <ddi/irq.h>
+#include <stacktrace.h>
 
 typedef void (* iroutine)(int n, istate_t *istate);
@@ -49 +50 @@
         if (istate_from_uspace(istate)) { \
                 task_t *task = TASK; \
-                printf("Task %s (%" PRIu64 ") killed due to an exception at %p: ", task->name, task->taskid, istate_get_pc(istate)); \
-                printf(fmt "\n", ##__VA_ARGS__); \
+                printf("Task %s (%" PRIu64 ") killed due to an exception at " \
+                    "program counter %p.\n", task->name, task->taskid, istate_get_pc(istate)); \
+                stack_trace_istate(istate); \
+                printf("Kill message: " fmt "\n", ##__VA_ARGS__); \
                 task_kill(task->taskid); \
                 thread_exit(); \

kernel/generic/include/panic.h

@@ -36 +36 @@
 #define KERN_PANIC_H_
 
+#include <stacktrace.h>
+#include <print.h>
+
 #ifdef CONFIG_DEBUG
 #       define panic(format, ...) \
-                panic_printf("Kernel panic in %s() at %s:%u: " format "\n", \
-                __func__, __FILE__, __LINE__, ##__VA_ARGS__);
+                do { \
+                        printf("Kernel panic in %s() at %s:%u.\n", \
+                            __func__, __FILE__, __LINE__); \
+                        stack_trace(); \
+                        panic_printf("Panic message: " format "\n", \
+                            ##__VA_ARGS__);\
+                } while (0)
 #else
 #       define panic(format, ...) \

kernel/generic/include/symtab.h

@@ -45 +45 @@
 };
 
-extern int symtab_name_lookup(unative_t addr, char **name);
-extern char *symtab_fmt_name_lookup(unative_t addr);
-extern int symtab_addr_lookup(const char *name, uintptr_t *addr);
-extern void symtab_print_search(const char *name);
-extern int symtab_compl(char *input, size_t size);
+extern int symtab_name_lookup(uintptr_t, char **, uintptr_t *);
+extern char *symtab_fmt_name_lookup(uintptr_t);
+extern int symtab_addr_lookup(const char *, uintptr_t *);
+extern void symtab_print_search(const char *);
+extern int symtab_compl(char *, size_t);
 
 #ifdef CONFIG_SYMTAB