Changeset cefb126 in mainline for kernel/arch/ia32/src/interrupt.c

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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:

Merge mainline changes.

File:

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

kernel/arch/ia32/src/interrupt.c

@@ -63 +63 @@
 void (* eoi_function)(void) = NULL;
 
-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);
+void istate_decode(istate_t *istate)
+{
+        printf("error_word=%p\n", istate->error_word);
+        printf("eflags=%p\n", istate->eflags);
+
+        printf("cs =%p\tds =%p\tes =%p\n", istate->cs, istate->ds, istate->es);
+        printf("fs =%p\tgs =%p", istate->fs, istate->gs);
+        if (istate_from_uspace(istate))
+                printf("\tss =%p\n", istate->ss);
+        else
+                printf("\n");
+
+        printf("eax=%p\tebx=%p\tecx=%p\n", istate->eax, istate->ebx,
+            istate->ecx);
+        printf("edx=%p\tedi=%p\tesi=%p\n", istate->edx, istate->edi,
+            istate->esi);
+        printf("ebp=%p\tesp=%p\teip=%p\n", istate->ebp,
+            istate_from_uspace(istate) ? istate->esp : (uintptr_t) &istate->esp,
+            istate->eip);
 }
 
@@ -94 +96 @@
 {
         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 +102 @@
 {
         fault_if_from_uspace(istate, "Divide error.");
-        
-        decode_istate(istate);
-        panic("Divide error.");
+        panic_badtrap(istate, n, "Divide error.");
 }
 
@@ -128 +126 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-        
-        decode_istate(istate);
-        panic("General protection fault.");
+        panic_badtrap(istate, n, "General protection fault.");
 }
 
@@ -136 +132 @@
 {
         fault_if_from_uspace(istate, "Stack fault.");
-        
-        decode_istate(istate);
-        panic("Stack fault.");
+        panic_badtrap(istate, n, "Stack fault.");
 }
 
@@ -149 +143 @@
         );
         
-        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 +155 @@
 #else
         fault_if_from_uspace(istate, "FPU fault.");
-        panic("FPU fault.");
+        panic_badtrap(istate, n, "FPU fault.");
 #endif
 }