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

kernel/arch/ia64/src/interrupt.c

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