Changeset e3038b4 in mainline for kernel/arch/ppc32

Timestamp:

2010-06-28T22:45:51Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49eb681

Parents:

05e3cb8 (diff), e4a4b44 (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 unified panic architecture (Phase 1).

Note that this is still work in progress as there are the following sharp edges:

• imprecise detection of read/write accesses on some architectures
• missing or imperfect capability to print stack traces on some architectures
• istate_t on some architectures may contain too little valuable information
• basically all trap frames need to be reorganized to look like a normal stack frame on the stack trace so that there are no missing frames
• panic_common() could print more information about the current context such as the task name, thread name, ASID etc.
• functions that call panic_*() should be protected against inlining to avoid missing or confusing stack frames in the stack trace

Location:

kernel/arch/ppc32

Files:

• Makefile.inc (modified) (1 diff)
• include/types.h (modified) (1 diff)
• src/debug/panic.s (deleted)
• src/interrupt.c (modified) (1 diff)
• src/mm/tlb.c (modified) (1 diff)

kernel/arch/ppc32/Makefile.inc

@@ -40 +40 @@
 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/ppc32/include/types.h

@@ -50 +50 @@
 } fncptr_t;
 
-/**< Formats for uintptr_t, size_t */
+/** Formats for uintptr_t, size_t */
 #define PRIp  "x"
 #define PRIs  "u"
 
-/**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
+/** Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
 #define PRId8   "d"
 #define PRId16  "d"

kernel/arch/ppc32/src/interrupt.c

@@ -50 +50 @@
                 :: [dec] "r" (1000)
         );
+}
+
+void istate_decode(istate_t *istate)
+{
+        printf("r0 =%p\tr1 =%p\tr2 =%p\n", istate->r0, istate->sp, istate->r2);
+        printf("r3 =%p\tr4 =%p\tr5 =%p\n", istate->r3, istate->r4, istate->r5);
+        printf("r6 =%p\tr7 =%p\tr8 =%p\n", istate->r6, istate->r7, istate->r8);
+        printf("r9 =%p\tr10=%p\tr11=%p\n",
+            istate->r9, istate->r10, istate->r11);
+        printf("r12=%p\tr13=%p\tr14=%p\n",
+            istate->r12, istate->r13, istate->r14);
+        printf("r15=%p\tr16=%p\tr17=%p\n",
+            istate->r15, istate->r16, istate->r17);
+        printf("r18=%p\tr19=%p\tr20=%p\n",
+            istate->r18, istate->r19, istate->r20);
+        printf("r21=%p\tr22=%p\tr23=%p\n",
+            istate->r21, istate->r22, istate->r23);
+        printf("r24=%p\tr25=%p\tr26=%p\n",
+            istate->r24, istate->r25, istate->r26);
+        printf("r27=%p\tr28=%p\tr29=%p\n",
+            istate->r27, istate->r28, istate->r29);
+        printf("r30=%p\tr31=%p\n", istate->r30, istate->r31);
+        printf("cr =%p\tpc =%p\tlr =%p\n", istate->cr, istate->pc, istate->lr);
+        printf("ctr=%p\txer=%p\tdar=%p\n",
+            istate->ctr, istate->xer, istate->dar);
+        printf("srr1=%p\n", istate->srr1);
 }
 

kernel/arch/ppc32/src/mm/tlb.c

@@ -111 +111 @@
 static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
-        const char *symbol = symtab_fmt_name_lookup(istate->pc);
-        const char *sym2 = symtab_fmt_name_lookup(istate->lr);
-        
-        fault_if_from_uspace(istate,
-            "PHT Refill Exception on %p.", badvaddr);
-        panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr,
-            istate->pc, symbol, sym2);
+        fault_if_from_uspace(istate, "PHT Refill Exception on %p.", badvaddr);
+        panic_memtrap(istate, PF_ACCESS_READ, badvaddr,
+            "PHT Refill Exception.");
 }