Changes in / [e3038b4:05e3cb8] in mainline

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• arch/abs32le/src/abs32le.c (modified) (1 diff)
• arch/amd64/include/interrupt.h (modified) (1 diff)
• arch/amd64/include/types.h (modified) (1 diff)
• arch/amd64/src/asm_utils.S (modified) (3 diffs)
• arch/amd64/src/interrupt.c (modified) (5 diffs)
• arch/amd64/src/mm/page.c (modified) (1 diff)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/arm32/include/exception.h (modified) (2 diffs)
• arch/arm32/src/exc_handler.S (modified) (2 diffs)
• arch/arm32/src/exception.c (modified) (1 diff)
• arch/arm32/src/mm/page.c (modified) (1 diff)
• arch/arm32/src/mm/page_fault.c (modified) (2 diffs)
• arch/arm32/src/panic.S (added)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/include/interrupt.h (modified) (1 diff)
• arch/ia32/src/asm.S (modified) (5 diffs)
• arch/ia32/src/debug/panic.s (added)
• arch/ia32/src/interrupt.c (modified) (7 diffs)
• arch/ia32/src/mm/page.c (modified) (1 diff)
• arch/ia64/src/asm.S (modified) (1 diff)
• arch/ia64/src/interrupt.c (modified) (4 diffs)
• arch/ia64/src/mm/tlb.c (modified) (7 diffs)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/mips32/src/exception.c (modified) (4 diffs)
• arch/mips32/src/mm/tlb.c (modified) (2 diffs)
• arch/mips32/src/panic.S (added)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/ppc32/include/types.h (modified) (1 diff)
• arch/ppc32/src/debug/panic.s (added)
• arch/ppc32/src/interrupt.c (modified) (1 diff)
• arch/ppc32/src/mm/tlb.c (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/types.h (modified) (1 diff)
• arch/sparc64/src/mm/sun4u/tlb.c (modified) (7 diffs)
• arch/sparc64/src/mm/sun4v/tlb.c (modified) (6 diffs)
• arch/sparc64/src/panic.S (added)
• arch/sparc64/src/trap/exception.c (modified) (20 diffs)
• generic/include/debug.h (modified) (2 diffs)
• generic/include/interrupt.h (modified) (1 diff)
• generic/include/panic.h (modified) (2 diffs)
• generic/src/debug/panic.c (deleted)
• generic/src/debug/stacktrace.c (modified) (1 diff)

kernel/Makefile

@@ -201 +201 @@
         generic/src/debug/symtab.c \
         generic/src/debug/stacktrace.c \
-        generic/src/debug/panic.c \
         generic/src/interrupt/interrupt.c \
         generic/src/main/main.c \

kernel/arch/abs32le/src/abs32le.c

@@ -114 +114 @@
 }
 
-void istate_decode(istate_t *istate)
+void panic_printf(const char *fmt, ...)
 {
-        (void) istate;
+        va_list args;
+        
+        va_start(args, fmt);
+        vprintf(fmt, args);
+        va_end(args);
+        
+        halt();
 }
 

kernel/arch/amd64/include/interrupt.h

@@ -112 +112 @@
 extern void (* eoi_function)(void);
 
+extern void decode_istate(int n, istate_t *istate);
 extern void interrupt_init(void);
 extern void trap_virtual_enable_irqs(uint16_t irqmask);

kernel/arch/amd64/include/types.h

@@ -50 +50 @@
 } fncptr_t;
 
-/* Formats for uintptr_t, size_t */
+/**< Formats for uintptr_t, size_t */
 #define PRIp  "llx"
 #define PRIs  "llu"
 
-/* Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
+/**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
 #define PRId8   "d"
 #define PRId16  "d"

kernel/arch/amd64/src/asm_utils.S

@@ -51 +51 @@
 .global interrupt_handlers
 .global syscall_entry
+.global panic_printf
+
+panic_printf:
+        movabsq $halt, %rax
+        movq %rax, (%rsp)
+        jmp printf
+
 .global cpuid
 .global has_cpuid
@@ -227 +234 @@
         save_all_gpr
         cld
-
-        #
-        # Stop stack traces here if we came from userspace.
-        #
-        movq %cs, %rax
-        xorq %rdx, %rdx
-        cmpq %rax, IREGISTER_SPACE+16(%rsp)
-        cmovneq %rdx, %rbp
-
-        movq $(\i), %rdi        # %rdi - first parameter
-        movq %rsp, %rsi         # %rsi - pointer to istate
-        call exc_dispatch       # exc_dispatch(i, istate)
+        
+        # Stop stack traces here
+        xorq %rbp, %rbp
+        
+        movq $(\i), %rdi    # %rdi - first parameter
+        movq %rsp, %rsi     # %rsi - pointer to istate
+        call exc_dispatch   # exc_dispatch(i, istate)
         
         restore_all_gpr
@@ -288 +290 @@
         pushq %rcx
         pushq %r11
-        pushq %rbp
-
-        xorq %rbp, %rbp         # stop the stack traces here
-
-        movq %r10, %rcx         # Copy the 4th argument where it is expected 
+        
+        movq %r10, %rcx   # Copy the 4th argument where it is expected 
         pushq %rax
         call syscall_handler
         addq $8, %rsp
-                
-        popq %rbp
+        
         popq %r11
         popq %rcx

kernel/arch/amd64/src/interrupt.c

@@ -63 +63 @@
 void (* eoi_function)(void) = NULL;
 
-void istate_decode(istate_t *istate)
-{
-        printf("error_word=%#llx\n", istate->error_word);
-        printf("cs =%#0.16llx\trflags=%#0.16llx\n", istate->cs,
-            istate->rflags);
-        printf("rax=%#0.16llx\trbx=%#0.16llx\trcx=%#0.16llx\n", istate->rax,
+void decode_istate(int n, istate_t *istate)
+{
+        const char *symbol = symtab_fmt_name_lookup(istate->rip);
+        
+        printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);
+        printf("%%rip: %#llx (%s)\n", istate->rip, symbol);
+        printf("ERROR_WORD=%#llx\n", istate->error_word);
+        printf("%%cs=%#llx, rflags=%#llx, %%cr0=%#llx\n", istate->cs,
+            istate->rflags, read_cr0());
+        printf("%%rax=%#llx, %%rcx=%#llx, %%rdx=%#llx\n", istate->rax,
             istate->rcx, istate->rdx);
-        printf("rsi=%#0.16llx\trdi=%#0.16llx\tr8 =%#0.16llx\n", istate->rsi,
+        printf("%%rsi=%#llx, %%rdi=%#llx, %%r8=%#llx\n", istate->rsi,
             istate->rdi, istate->r8);
-        printf("r9 =%#0.16llx\tr10=%#0.16llx\tr11=%#0.16llx\n", istate->r9,
+        printf("%%r9=%#llx, %%r10=%#llx, %%r11=%#llx\n", istate->r9,
             istate->r10, istate->r11);
+        printf("%%rsp=%#llx\n", &istate->stack[0]);
+        
+        stack_trace_istate(istate);
 }
 
@@ -88 +95 @@
 {
         fault_if_from_uspace(istate, "Unserviced interrupt: %u.", n);
-        panic_badtrap(istate, n, "Unserviced interrupt.");
+        decode_istate(n, istate);
+        panic("Unserviced interrupt.");
 }
 
@@ -94 +102 @@
 {
         fault_if_from_uspace(istate, "Divide error.");
-        panic_badtrap(istate, n, "Divide error.");
+        decode_istate(n, istate);
+        panic("Divide error.");
 }
 
@@ -120 +129 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-        panic_badtrap(istate, n, "General protection fault.");
+        
+        decode_istate(n, istate);
+        panic("General protection fault.");
 }
 
@@ -126 +137 @@
 {
         fault_if_from_uspace(istate, "Stack fault.");
-        panic_badtrap(istate, n, "Stack fault.");
+        decode_istate(n, istate);
+        panic("Stack fault.");
 }
 

kernel/arch/amd64/src/mm/page.c

@@ -89 +89 @@
         
         if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault: %#x.", page);
-                panic_memtrap(istate, access, page, "Page fault.");
+                fault_if_from_uspace(istate, "Page fault: %p.", page);
+                decode_istate(n, istate);
+                panic("Page fault: %p", page);
         }
 }

kernel/arch/arm32/Makefile.inc

@@ -46 +46 @@
         arch/$(KARCH)/src/context.S \
         arch/$(KARCH)/src/dummy.S \
+        arch/$(KARCH)/src/panic.S \
         arch/$(KARCH)/src/cpu/cpu.c \
         arch/$(KARCH)/src/ddi/ddi.c \

kernel/arch/arm32/include/exception.h

@@ -28 +28 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup arm32   
  * @{
  */
@@ -141 +141 @@
 extern void install_exception_handlers(void);
 extern void exception_init(void);
+extern void print_istate(istate_t *istate);
 extern void reset_exception_entry(void);
 extern void irq_exception_entry(void);

kernel/arch/arm32/src/exc_handler.S

@@ -98 +98 @@
         stmfd r13!, {r13, lr}^
         stmfd r13!, {r2}
-
-        # Stop stack traces here
-        mov fp, #0
-        
         b 2f
 
@@ -127 +123 @@
         stmfd r13!, {r2}
 2:
+        # Stop stack traces here
+        mov fp, #0
 .endm
 

kernel/arch/arm32/src/exception.c

@@ -173 +173 @@
  * @param istate Structure to be printed.
  */
-void istate_decode(istate_t *istate)
+void print_istate(istate_t *istate)
 {
-        printf("r0 =%#0.8lx\tr1 =%#0.8lx\tr2 =%#0.8lx\tr3 =%#0.8lx\n",
+        printf("istate dump:\n");
+        
+        printf(" r0: %x    r1: %x    r2: %x    r3: %x\n",
             istate->r0, istate->r1, istate->r2, istate->r3);
-        printf("r4 =%#0.8lx\tr5 =%#0.8lx\tr6 =%#0.8lx\tr7 =%#0.8lx\n",
+        printf(" r4: %x    r5: %x    r6: %x    r7: %x\n", 
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf("r8 =%#0.8lx\tr9 =%#0.8lx\tr10=%#0.8lx\tfp =%#0.8lx\n",
+        printf(" r8: %x    r8: %x   r10: %x    fp: %x\n", 
             istate->r8, istate->r9, istate->r10, istate->fp);
-        printf("r12=%#0.8lx\tsp =%#0.8lx\tlr =%#0.8lx\tspsr=%#0.8lx\n",
+        printf(" r12: %x    sp: %x    lr: %x  spsr: %x\n",
             istate->r12, istate->sp, istate->lr, istate->spsr);
+        
+        printf(" pc: %x\n", istate->pc);
+
+        stack_trace_istate(istate);
 }
 

kernel/arch/arm32/src/mm/page.c

@@ -27 +27 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup arm32mm 
  * @{
  */

kernel/arch/arm32/src/mm/page_fault.c

@@ -183 +183 @@
         if (ret == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
-                panic_memtrap(istate, access, badvaddr, "Page fault.");
+                print_istate(istate);
+                printf("page fault - pc: %x, va: %x, status: %x(%x), "
+                    "access:%d\n", istate->pc, badvaddr, fsr.status, fsr,
+                    access);
+                
+                panic("Page fault.");
         }
 }
@@ -198 +203 @@
 
         if (ret == AS_PF_FAULT) {
-                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc,
-                    "Page fault - prefetch_abort.");
+                printf("prefetch_abort\n");
+                print_istate(istate);
+                panic("page fault - prefetch_abort at address: %x.",
+                    istate->pc);
         }
 }

kernel/arch/ia32/Makefile.inc

@@ -76 +76 @@
 ARCH_SOURCES = \
         arch/$(KARCH)/src/context.S \
+        arch/$(KARCH)/src/debug/panic.s \
         arch/$(KARCH)/src/debug/stacktrace.c \
         arch/$(KARCH)/src/debug/stacktrace_asm.S \

kernel/arch/ia32/include/interrupt.h

@@ -113 +113 @@
 extern void (* eoi_function)(void);
 
+extern void decode_istate(istate_t *istate);
 extern void interrupt_init(void);
 extern void trap_virtual_enable_irqs(uint16_t irqmask);

kernel/arch/ia32/src/asm.S

@@ -163 +163 @@
         pushl %edi      # remember return user address
 
-        xorl %ebp, %ebp # stop stack traces here
-
         pushl %gs       # remember TLS
 
@@ -198 +196 @@
 # and call exc_dispatch().
 #
-#define INTERRUPT_ALIGN 128 
+#define INTERRUPT_ALIGN 64
 .macro handler i n
         
@@ -226 +224 @@
                 movw %ax, %ds
                 movw %ax, %es
-        
-                xorl %ebp, %ebp
-
+                
                 cld
                 sti
@@ -234 +230 @@
                 call syscall_handler
                 cli
-
-                movl 20(%esp), %ebp     # restore EBP
-                addl $28, %esp          # clean-up of parameters
+                addl $28, %esp         # clean-up of parameters
                 
                 popl %gs
@@ -286 +280 @@
                 movw %ax, %es
                 
-                # stop stack traces here if we came from userspace
-                cmpl $8, 40(%esp)
-                jz 0f
+                # stop stack traces here
                 xorl %ebp, %ebp
-
-0:              
+                
                 pushl %esp          # *istate
                 pushl $(\i)         # intnum

kernel/arch/ia32/src/interrupt.c

@@ -63 +63 @@
 void (* eoi_function)(void) = NULL;
 
-void istate_decode(istate_t *istate)
-{
-        printf("error_word=%#lx\n", istate->error_word);
-        printf("cs =%#0.8lx\teflags=%#0.8lx\n", istate->cs, istate->eflags);
-        printf("eax=%#0.8lx\tecx=%#0.8lx\tedx=%#0.8lx\n",
-            istate->eax, istate->ecx, istate->edx);
+void decode_istate(istate_t *istate)
+{
+        const char *symbol = symtab_fmt_name_lookup(istate->eip);
+        
+        if (CPU)
+                printf("----------------EXCEPTION OCCURED (cpu%u)----------------\n", CPU->id);
+        else
+                printf("----------------EXCEPTION OCCURED----------------\n");
+        
+        printf("%%eip: %#lx (%s)\n", istate->eip, symbol);
+        printf("ERROR_WORD=%#lx\n", istate->error_word);
+        printf("%%cs=%#lx,flags=%#lx\n", istate->cs, istate->eflags);
+        printf("%%eax=%#lx, %%ecx=%#lx, %%edx=%#lx, %%esp=%p\n", istate->eax, istate->ecx, istate->edx, &istate->stack[0]);
+        printf("stack: %#lx, %#lx, %#lx, %#lx\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
+        printf("       %#lx, %#lx, %#lx, %#lx\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
+        
+        stack_trace_istate(istate);
 }
 
@@ -83 +94 @@
 {
         fault_if_from_uspace(istate, "Unserviced interrupt: %u.", n);
-        panic_badtrap(istate, n, "Unserviced interrupt: %u.", n);
+        
+        decode_istate(istate);
+        panic("Unserviced interrupt: %u.", n);
 }
 
@@ -89 +102 @@
 {
         fault_if_from_uspace(istate, "Divide error.");
-        panic_badtrap(istate, n, "Divide error.");
+        
+        decode_istate(istate);
+        panic("Divide error.");
 }
 
@@ -113 +128 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-        panic_badtrap(istate, n, "General protection fault.");
+        
+        decode_istate(istate);
+        panic("General protection fault.");
 }
 
@@ -119 +136 @@
 {
         fault_if_from_uspace(istate, "Stack fault.");
-        panic_badtrap(istate, n, "Stack fault.");
+        
+        decode_istate(istate);
+        panic("Stack fault.");
 }
 
@@ -130 +149 @@
         );
         
-        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0.8x.",
+        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx.",
             (unative_t) mxcsr);
-        panic_badtrap(istate, n, "SIMD FP exception, MXCSR=%#0.8x");
+        
+        decode_istate(istate);
+        printf("MXCSR: %#lx\n", mxcsr);
+        panic("SIMD FP exception(19).");
 }
 
@@ -142 +164 @@
 #else
         fault_if_from_uspace(istate, "FPU fault.");
-        panic_badtrap(istate, n, "FPU fault.");
+        panic("FPU fault.");
 #endif
 }

kernel/arch/ia32/src/mm/page.c

@@ -115 +115 @@
         if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault: %#x.", page);
-                panic_memtrap(istate, access, page, "Page fault.");
+                
+                decode_istate(istate);
+                printf("page fault address: %#lx\n", page);
+                panic("Page fault.");
         }
 }

kernel/arch/ia64/src/asm.S

@@ -137 +137 @@
         br cpu_halt
 
+.global panic_printf
+panic_printf:
+        {
+                br.call.sptk.many b0=printf
+        }
+        br halt
+
 /** Switch to userspace - low level code.
  *

kernel/arch/ia64/src/interrupt.c

@@ -133 +133 @@
 }
 
-void istate_decode(istate_t *istate)
-{
+static void dump_interrupted_context(istate_t *istate)
+{
+        putchar('\n');
+        printf("Interrupted context dump:\n");
         printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp,
             istate->ar_bspstore);
@@ -181 +183 @@
         
         fault_if_from_uspace(istate, "General Exception (%s).", desc);
-        panic_badtrap(istate, vector, "General Exception (%s).", desc);
+        
+        dump_interrupted_context(istate);
+        panic("General Exception (%s).", desc);
 }
 
@@ -191 +195 @@
         fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
             (uint16_t) vector, vector_to_string(vector));
-        panic_badtrap(istate, vector, "Interruption: %#hx (%s).",
-            (uint16_t) vector, vector_to_string(vector));
+        dump_interrupted_context(istate);
+        panic("Interruption: %#hx (%s).", (uint16_t) vector,
+            vector_to_string(vector));
 #endif
 }
@@ -221 +226 @@
         fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
             (uint16_t) vector, vector_to_string(vector));
-        panic_badtrap(istate, vector, "Interruption: %#hx (%s).",
-            (uint16_t) vector, vector_to_string(vector));
+        dump_interrupted_context(istate);
+        panic("Interruption: %#hx (%s).", (uint16_t) vector,
+            vector_to_string(vector));
 }
 

kernel/arch/ia64/src/mm/tlb.c

@@ -500 +500 @@
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_EXEC, va,
-                            "Page fault.");
+                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
+                            istate->cr_iip);
                 }
         }
@@ -622 +622 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_READ, va,
-                            "Page fault.");
+                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
+                            istate->cr_iip);
                 }
         }
@@ -671 +671 @@
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_WRITE, va,
-                            "Page fault.");
+                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
+                            istate->cr_iip);
                 }
         }
@@ -708 +708 @@
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_EXEC, va,
-                            "Page fault.");
+                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
+                            istate->cr_iip);
                 }
         }
@@ -745 +745 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_READ, va,
-                            "Page fault.");
+                        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
+                            istate->cr_iip);
                 }
         }
@@ -778 +778 @@
         if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault at %p.", va);
-                panic_memtrap(istate, PF_ACCESS_WRITE, va, "Page fault.");
+                panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
+                    istate->cr_iip);
         }
         page_table_unlock(AS, true);
@@ -818 +819 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic_memtrap(istate, PF_ACCESS_READ, va,
-                            "Page fault.");
+                        panic("%s: va=%p, rid=%d.", __func__, va, rid);
                 }
         }

kernel/arch/mips32/Makefile.inc

@@ -54 +54 @@
         arch/$(KARCH)/src/start.S \
         arch/$(KARCH)/src/context.S \
+        arch/$(KARCH)/src/panic.S \
         arch/$(KARCH)/src/mips32.c \
         arch/$(KARCH)/src/asm.S \

kernel/arch/mips32/src/exception.c

@@ -72 +72 @@
 };
 
-void istate_decode(istate_t *istate)
+static void print_regdump(istate_t *istate)
 {
-        printf("at=%p\tv0=%p\tv1=%p\n", istate->at, istate->v0, istate->v1);
-        printf("a0=%p\ta1=%p\ta2=%p\n", istate->a0, istate->a1, istate->a2);
-        printf("a3=%p\tt0=%p\tt1=%p\n", istate->a3, istate->t0, istate->t1);
-        printf("t2=%p\tt3=%p\tt4=%p\n", istate->t2, istate->t3, istate->t4);
-        printf("t5=%p\tt6=%p\tt7=%p\n", istate->t5, istate->t6, istate->t7);
-        printf("t8=%p\tt9=%p\tgp=%p\n", istate->t8, istate->t9, istate->gp);
-        printf("sp=%p\tra=%p\t\n", istate->sp, istate->ra);
-        printf("lo=%p\thi=%p\t\n", istate->lo, istate->hi);
-        printf("cp0_status=%p\tcp0_epc=%p\tk1=%p\n",
-            istate->status, istate->epc, istate->k1);
+        printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc,
+            symtab_fmt_name_lookup(istate->epc), istate->ra,
+            symtab_fmt_name_lookup(istate->ra), istate->sp);
 }
 
@@ -89 +82 @@
 {
         fault_if_from_uspace(istate, "Unhandled exception %s.", exctable[n]);
-        panic_badtrap(istate, n, "Unhandled exception %s.", exctable[n]);
+        
+        print_regdump(istate);
+        panic("Unhandled exception %s.", exctable[n]);
 }
 
@@ -130 +125 @@
                 scheduler_fpu_lazy_request();
         else {
-                fault_if_from_uspace(istate,
-                    "Unhandled Coprocessor Unusable Exception.");
-                panic_badtrap(istate, n,
-                    "Unhandled Coprocessor Unusable Exception.");
+                fault_if_from_uspace(istate, "Unhandled Coprocessor Unusable Exception.");
+                panic("Unhandled Coprocessor Unusable Exception.");
         }
 }
@@ -169 +162 @@
 static void syscall_exception(unsigned int n, istate_t *istate)
 {
-        fault_if_from_uspace(istate, "Syscall is handled through shortcut.");
+        panic("Syscall is handled through shortcut.");
 }
 

kernel/arch/mips32/src/mm/tlb.c

@@ -321 +321 @@
 void tlb_refill_fail(istate_t *istate)
 {
-        uintptr_t va = cp0_badvaddr_read();
-        
-        fault_if_from_uspace(istate, "TLB Refill Exception on %p.", va);
-        panic_memtrap(istate, PF_ACCESS_READ, va, "TLB Refill Exception.");
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        const char *sym2 = symtab_fmt_name_lookup(istate->ra);
+        
+        fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
+            cp0_badvaddr_read());
+        panic("%x: TLB Refill Exception at %x (%s<-%s).", cp0_badvaddr_read(),
+            istate->epc, symbol, sym2);
 }
 
@@ -330 +333 @@
 void tlb_invalid_fail(istate_t *istate)
 {
-        uintptr_t va = cp0_badvaddr_read();
-        
-        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.", va);
-        panic_memtrap(istate, PF_ACCESS_READ, va, "TLB Invalid Exception.");
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        
+        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
+            cp0_badvaddr_read());
+        panic("%x: TLB Invalid Exception at %x (%s).", cp0_badvaddr_read(),
+            istate->epc, symbol);
 }
 
 void tlb_modified_fail(istate_t *istate)
 {
-        uintptr_t va = cp0_badvaddr_read();
-        
-        fault_if_from_uspace(istate, "TLB Modified Exception on %p.", va);
-        panic_memtrap(istate, PF_ACCESS_WRITE, va, "TLB Modified Exception.");
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        
+        fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
+            cp0_badvaddr_read());
+        panic("%x: TLB Modified Exception at %x (%s).", cp0_badvaddr_read(),
+            istate->epc, symbol);
 }
 

kernel/arch/ppc32/Makefile.inc

@@ -40 +40 @@
 ARCH_SOURCES = \
         arch/$(KARCH)/src/context.S \
+        arch/$(KARCH)/src/debug/panic.s \
         arch/$(KARCH)/src/debug/stacktrace.c \
         arch/$(KARCH)/src/debug/stacktrace_asm.S \

kernel/arch/ppc32/include/types.h

@@ -50 +50 @@
 } fncptr_t;
 
-/** Formats for uintptr_t, size_t */
+/**< Formats for uintptr_t, size_t */
 #define PRIp  "x"
 #define PRIs  "u"
 
-/** Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
+/**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
 #define PRId8   "d"
 #define PRId16  "d"

kernel/arch/ppc32/src/interrupt.c

@@ -50 +50 @@
                 :: [dec] "r" (1000)
         );
-}
-
-void istate_decode(istate_t *istate)
-{
-        printf("r0 =%p\tr1 =%p\tr2 =%p\n", istate->r0, istate->sp, istate->r2);
-        printf("r3 =%p\tr4 =%p\tr5 =%p\n", istate->r3, istate->r4, istate->r5);
-        printf("r6 =%p\tr7 =%p\tr8 =%p\n", istate->r6, istate->r7, istate->r8);
-        printf("r9 =%p\tr10=%p\tr11=%p\n",
-            istate->r9, istate->r10, istate->r11);
-        printf("r12=%p\tr13=%p\tr14=%p\n",
-            istate->r12, istate->r13, istate->r14);
-        printf("r15=%p\tr16=%p\tr17=%p\n",
-            istate->r15, istate->r16, istate->r17);
-        printf("r18=%p\tr19=%p\tr20=%p\n",
-            istate->r18, istate->r19, istate->r20);
-        printf("r21=%p\tr22=%p\tr23=%p\n",
-            istate->r21, istate->r22, istate->r23);
-        printf("r24=%p\tr25=%p\tr26=%p\n",
-            istate->r24, istate->r25, istate->r26);
-        printf("r27=%p\tr28=%p\tr29=%p\n",
-            istate->r27, istate->r28, istate->r29);
-        printf("r30=%p\tr31=%p\n", istate->r30, istate->r31);
-        printf("cr =%p\tpc =%p\tlr =%p\n", istate->cr, istate->pc, istate->lr);
-        printf("ctr=%p\txer=%p\tdar=%p\n",
-            istate->ctr, istate->xer, istate->dar);
-        printf("srr1=%p\n", istate->srr1);
 }
 

kernel/arch/ppc32/src/mm/tlb.c

@@ -111 +111 @@
 static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
-        fault_if_from_uspace(istate, "PHT Refill Exception on %p.", badvaddr);
-        panic_memtrap(istate, PF_ACCESS_READ, badvaddr,
-            "PHT Refill Exception.");
+        const char *symbol = symtab_fmt_name_lookup(istate->pc);
+        const char *sym2 = symtab_fmt_name_lookup(istate->lr);
+        
+        fault_if_from_uspace(istate,
+            "PHT Refill Exception on %p.", badvaddr);
+        panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr,
+            istate->pc, symbol, sym2);
 }
 

kernel/arch/sparc64/Makefile.inc

@@ -64 +64 @@
         arch/$(KARCH)/src/asm.S \
         arch/$(KARCH)/src/$(USARCH)/asm.S \
+        arch/$(KARCH)/src/panic.S \
         arch/$(KARCH)/src/console.c \
         arch/$(KARCH)/src/context.S \

kernel/arch/sparc64/include/types.h

@@ -52 +52 @@
 typedef uint8_t asi_t;
 
-/** Formats for uintptr_t, size_t */
+/**< Formats for uintptr_t, size_t */
 #define PRIp  "llx"
 #define PRIs  "llu"
 
-/** Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
+/**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
 #define PRId8   "d"
 #define PRId16  "d"

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup sparc64mm       
  * @{
  */
@@ -58 +58 @@
 static void dtlb_pte_copy(pte_t *, size_t, bool);
 static void itlb_pte_copy(pte_t *, size_t);
-static void do_fast_instruction_access_mmu_miss_fault(istate_t *, uintptr_t,
-    const char *);
+static void do_fast_instruction_access_mmu_miss_fault(istate_t *, const char *);
 static void do_fast_data_access_mmu_miss_fault(istate_t *, tlb_tag_access_reg_t,
     const char *);
@@ -223 +222 @@
                  * Forward the page fault to the address space page fault
                  * handler.
-                 */
+                 */             
                 page_table_unlock(AS, true);
                 if (as_page_fault(page_16k, PF_ACCESS_EXEC, istate) ==
                     AS_PF_FAULT) {
                         do_fast_instruction_access_mmu_miss_fault(istate,
-                            istate->tpc, __func__);
+                            __func__);
                 }
         }
@@ -259 +258 @@
                         /* NULL access in kernel */
                         do_fast_data_access_mmu_miss_fault(istate, tag,
-                            "Dereferencing NULL pointer");
+                            __func__);
                 } else if (page_8k >= end_of_identity) {
                         /*
@@ -439 +438 @@
 
 void do_fast_instruction_access_mmu_miss_fault(istate_t *istate,
-    uintptr_t va, const char *str)
-{
-        fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
-        panic_memtrap(istate, PF_ACCESS_EXEC, va, "%s.", str);
+    const char *str)
+{
+        fault_if_from_uspace(istate, "%s.", str);
+        dump_istate(istate);
+        panic("%s.", str);
 }
 
@@ -451 +451 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-            tag.context);
-        panic_memtrap(istate, PF_ACCESS_READ, va, "%s.", str);
+        if (tag.context) {
+                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
+                    tag.context);
+        }
+        dump_istate(istate);
+        printf("Faulting page: %p, ASID=%d.\n", va, tag.context);
+        panic("%s.", str);
 }
 
@@ -462 +466 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-            tag.context);
-        panic_memtrap(istate, PF_ACCESS_WRITE, va, "%s.", str);
+
+        if (tag.context) {
+                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
+                    tag.context);
+        }
+        printf("Faulting page: %p, ASID=%d\n", va, tag.context);
+        dump_istate(istate);
+        panic("%s.", str);
 }
 

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -28 +28 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup sparc64mm       
  * @{
  */
@@ -62 +62 @@
 static void itlb_pte_copy(pte_t *);
 static void dtlb_pte_copy(pte_t *, bool);
-static void do_fast_instruction_access_mmu_miss_fault(istate_t *, uintptr_t,
-    const char *);
+static void do_fast_instruction_access_mmu_miss_fault(istate_t *, const char *);
 static void do_fast_data_access_mmu_miss_fault(istate_t *, uint64_t,
     const char *);
@@ -236 +235 @@
                  * Forward the page fault to the address space page fault
                  * handler.
-                 */
+                 */             
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         do_fast_instruction_access_mmu_miss_fault(istate,
-                            istate->tpc, __func__);
+                            __func__);
                 }
         }
@@ -355 +354 @@
 }
 
-void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, uintptr_t va,
+void do_fast_instruction_access_mmu_miss_fault(istate_t *istate,
     const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
-        panic_memtrap(istate, PF_ACCESS_EXEC, va, "%s.", str);
+        fault_if_from_uspace(istate, "%s.", str);
+        dump_istate(istate);
+        panic("%s.", str);
 }
 
@@ -365 +365 @@
     uint64_t page_and_ctx, const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
-            DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        panic_memtrap(istate, PF_ACCESS_READ, DMISS_ADDRESS(page_and_ctx),
-            "%s.");
+        if (DMISS_CONTEXT(page_and_ctx)) {
+                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, DMISS_ADDRESS(page_and_ctx),
+                    DMISS_CONTEXT(page_and_ctx));
+        }
+        dump_istate(istate);
+        printf("Faulting page: %p, ASID=%d\n", DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
+        panic("%s\n", str);
 }
 
@@ -374 +377 @@
     uint64_t page_and_ctx, const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
-            DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
-            "%s.");
+        if (DMISS_CONTEXT(page_and_ctx)) {
+                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, DMISS_ADDRESS(page_and_ctx),
+                    DMISS_CONTEXT(page_and_ctx));
+        }
+        printf("Faulting page: %p, ASID=%d\n", DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
+        dump_istate(istate);
+        panic("%s\n", str);
 }
 

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

@@ -44 +44 @@
 #include <symtab.h>
 
-void istate_decode(istate_t *istate)
+void dump_istate(istate_t *istate)
 {
         const char *tpcs = symtab_fmt_name_lookup(istate->tpc);
@@ -58 +58 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -65 +66 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -72 +74 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -79 +82 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -86 +90 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -93 +98 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -112 +118 @@
 #else
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 #endif
 }
@@ -120 +127 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -127 +135 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -134 +143 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -141 +151 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -148 +159 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        describe_dmmu_fault();
+        panic("%s.", __func__);
 }
 
@@ -155 +168 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -162 +176 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -169 +184 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -176 +192 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -183 +200 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -190 +208 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 
@@ -197 +216 @@
 {
         fault_if_from_uspace(istate, "%s.", __func__);
-        panic_badtrap(istate, n, "%s.", __func__);
+        dump_istate(istate);
+        panic("%s.", __func__);
 }
 

kernel/generic/include/debug.h

@@ -55 +55 @@
         do { \
                 if (!(expr)) \
-                        panic_assert("%s", #expr); \
+                        panic("Assertion failed (%s)", #expr); \
         } while (0)
 
@@ -72 +72 @@
         do { \
                 if (!(expr)) \
-                        panic_assert("%s, %s", #expr, msg); \
+                        panic("Assertion failed (%s, %s)", #expr, msg); \
         } while (0)
 

kernel/generic/include/interrupt.h

@@ -64 +64 @@
 extern void irq_initialize_arch(irq_t *);
 
-extern void istate_decode(istate_t *);
-
 #endif
 

kernel/generic/include/panic.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jakub Jermar
+ * Copyright (c) 2001-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <stacktrace.h>
+#include <print.h>
 
-#define panic(fmt, ...) \
-        panic_common(PANIC_OTHER, NULL, 0, 0, fmt, ##__VA_ARGS__)
+#ifdef CONFIG_DEBUG
 
-#define panic_assert(fmt, ...) \
-        panic_common(PANIC_ASSERT, NULL, 0, 0, fmt, ##__VA_ARGS__)
+#define panic(format, ...) \
+        do { \
+                silent = false; \
+                printf("Kernel panic in %s() at %s:%u\n", \
+                    __func__, __FILE__, __LINE__); \
+                stack_trace(); \
+                panic_printf("Panic message: " format "\n", \
+                    ##__VA_ARGS__);\
+        } while (0)
 
-#define panic_badtrap(istate, n, fmt, ...) \
-        panic_common(PANIC_BADTRAP, istate, 0, n, fmt, ##__VA_ARGS__)
+#else /* CONFIG_DEBUG */
 
-#define panic_memtrap(istate, access, addr, fmt, ...) \
-        panic_common(PANIC_MEMTRAP, istate, access, addr, fmt, ##__VA_ARGS__)
+#define panic(format, ...) \
+        do { \
+                silent = false; \
+                panic_printf("Kernel panic: " format "\n", ##__VA_ARGS__); \
+                stack_trace(); \
+        } while (0)
 
-typedef enum {
-        PANIC_OTHER,
-        PANIC_ASSERT,
-        PANIC_BADTRAP,
-        PANIC_MEMTRAP
-} panic_category_t;
-
-struct istate;
+#endif /* CONFIG_DEBUG */
 
 extern bool silent;
 
-extern void panic_common(panic_category_t, struct istate *, int,
-    uintptr_t, const char *, ...) __attribute__ ((noreturn));
+extern void panic_printf(const char *fmt, ...) __attribute__((noreturn));
 
 #endif

kernel/generic/src/debug/stacktrace.c

@@ -37 +37 @@
 #include <typedefs.h>
 #include <symtab.h>
-#include <print.h>
 
 #define STACK_FRAMES_MAX        20