Changeset cefb126 in mainline for kernel/arch/amd64/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/amd64/src/interrupt.c (modified) (6 diffs)

kernel/arch/amd64/src/interrupt.c

@@ -63 +63 @@
 void (* eoi_function)(void) = NULL;
 
-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,
+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,
             istate->rcx, istate->rdx);
-        printf("%%rsi=%#llx, %%rdi=%#llx, %%r8=%#llx\n", istate->rsi,
+        printf("rsi=%#0.16llx\trdi=%#0.16llx\tr8 =%#0.16llx\n", istate->rsi,
             istate->rdi, istate->r8);
-        printf("%%r9=%#llx, %%r10=%#llx, %%r11=%#llx\n", istate->r9,
+        printf("r9 =%#0.16llx\tr10=%#0.16llx\tr11=%#0.16llx\n", istate->r9,
             istate->r10, istate->r11);
-        printf("%%rsp=%#llx\n", &istate->stack[0]);
-        
-        stack_trace_istate(istate);
 }
 
@@ -95 +88 @@
 {
         fault_if_from_uspace(istate, "Unserviced interrupt: %u.", n);
-        decode_istate(n, istate);
-        panic("Unserviced interrupt.");
+        panic_badtrap(istate, n, "Unserviced interrupt.");
 }
 
@@ -102 +94 @@
 {
         fault_if_from_uspace(istate, "Divide error.");
-        decode_istate(n, istate);
-        panic("Divide error.");
+        panic_badtrap(istate, n, "Divide error.");
 }
 
@@ -129 +120 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-        
-        decode_istate(n, istate);
-        panic("General protection fault.");
+        panic_badtrap(istate, n, "General protection fault.");
 }
 
@@ -137 +126 @@
 {
         fault_if_from_uspace(istate, "Stack fault.");
-        decode_istate(n, istate);
-        panic("Stack fault.");
+        panic_badtrap(istate, n, "Stack fault.");
 }
 
@@ -214 +202 @@
         exc_register(12, "ss_fault", true, (iroutine_t) ss_fault);
         exc_register(13, "gp_fault", true, (iroutine_t) gp_fault);
-        exc_register(14, "ident_mapper", true, (iroutine_t) ident_page_fault);
         
 #ifdef CONFIG_SMP