Changeset 38e5675b in mainline

Timestamp:

2010-06-28T18:12:48Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ac11ac7

Parents:

62baed17

Message:

Switch ia64 to use the unified panic architecture. No stack traces so far.

Location:

kernel/arch/ia64

Files:

• include/interrupt.h (modified) (1 diff)
• src/interrupt.c (modified) (4 diffs)
• src/mm/tlb.c (modified) (7 diffs)

kernel/arch/ia64/include/interrupt.h

@@ -165 +165 @@
 extern void trap_virtual_enable_irqs(uint16_t irqmask);
 
+extern void decode_istate(istate_t *);
+
 #endif
 

kernel/arch/ia64/src/interrupt.c

@@ -133 +133 @@
 }
 
-static void dump_interrupted_context(istate_t *istate)
-{
-        putchar('\n');
-        printf("Interrupted context dump:\n");
+void decode_istate(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));
 }
 

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("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_EXEC, va,
+                            "Page fault.");
                 }
         }
@@ -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("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_READ, va,
+                            "Page fault.");
                 }
         }
@@ -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("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_WRITE, va,
+                            "Page fault.");
                 }
         }
@@ -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("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_EXEC, va,
+                            "Page fault.");
                 }
         }
@@ -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("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                            istate->cr_iip);
+                        panic_memtrap(istate, PF_ACCESS_READ, va,
+                            "Page fault.");
                 }
         }
@@ -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("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
-                    istate->cr_iip);
+                panic_memtrap(istate, PF_ACCESS_WRITE, va, "Page fault.");
         }
         page_table_unlock(AS, true);
@@ -819 +818 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate, "Page fault at %p.", va);
-                        panic("%s: va=%p, rid=%d.", __func__, va, rid);
+                        panic_memtrap(istate, PF_ACCESS_READ, va,
+                            "Page fault.");
                 }
         }