Changeset 62baed17 in mainline

Timestamp:

2010-06-26T12:00:12Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

38e5675b

Parents:

8e374ea7

Message:

Switch ia32 to use the unified panic architecture.

Location:

kernel/arch/ia32

Files:

• Makefile.inc (modified) (1 diff)
• src/asm.S (modified) (5 diffs)
• src/debug/panic.s (deleted)
• src/interrupt.c (modified) (7 diffs)
• src/mm/page.c (modified) (1 diff)

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/src/asm.S

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

kernel/arch/ia32/src/interrupt.c

@@ -65 +65 @@
 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);
+        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);
 }
 
@@ -94 +83 @@
 {
         fault_if_from_uspace(istate, "Unserviced interrupt: %u.", n);
-        
-        decode_istate(istate);
-        panic("Unserviced interrupt: %u.", n);
+        panic_badtrap(istate, n, "Unserviced interrupt: %u.", n);
 }
 
@@ -102 +89 @@
 {
         fault_if_from_uspace(istate, "Divide error.");
-        
-        decode_istate(istate);
-        panic("Divide error.");
+        panic_badtrap(istate, n, "Divide error.");
 }
 
@@ -128 +113 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-        
-        decode_istate(istate);
-        panic("General protection fault.");
+        panic_badtrap(istate, n, "General protection fault.");
 }
 
@@ -136 +119 @@
 {
         fault_if_from_uspace(istate, "Stack fault.");
-        
-        decode_istate(istate);
-        panic("Stack fault.");
+        panic_badtrap(istate, n, "Stack fault.");
 }
 
@@ -149 +130 @@
         );
         
-        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx.",
+        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0.8x.",
             (unative_t) mxcsr);
-        
-        decode_istate(istate);
-        printf("MXCSR: %#lx\n", mxcsr);
-        panic("SIMD FP exception(19).");
+        panic_badtrap(istate, n, "SIMD FP exception, MXCSR=%#0.8x");
 }
 
@@ -164 +142 @@
 #else
         fault_if_from_uspace(istate, "FPU fault.");
-        panic("FPU fault.");
+        panic_badtrap(istate, n, "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);
-                
-                decode_istate(istate);
-                printf("page fault address: %#lx\n", page);
-                panic("Page fault.");
+                panic_memtrap(istate, access, page, "Page fault.");
         }
 }