Changeset 8e374ea7 in mainline

Timestamp:

2010-06-25T05:02:56Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

62baed17

Parents:

a043e39

Message:

Switch arm32 to use the unified panic architecture.

Location:

kernel/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• include/exception.h (modified) (2 diffs)
• src/exc_handler.S (modified) (2 diffs)
• src/exception.c (modified) (1 diff)
• src/mm/page.c (modified) (1 diff)
• src/mm/page_fault.c (modified) (2 diffs)
• src/panic.S (deleted)

kernel/arch/arm32/Makefile.inc

@@ -46 +46 @@
         arch/$(KARCH)/src/context.S \
         arch/$(KARCH)/src/dummy.S \
-        arch/$(KARCH)/src/panic.S \
         arch/$(KARCH)/src/cpu/cpu.c \
         arch/$(KARCH)/src/ddi/ddi.c \

kernel/arch/arm32/include/exception.h

@@ -28 +28 @@
  */
 
-/** @addtogroup arm32   
+/** @addtogroup arm32
  * @{
  */
@@ -141 +141 @@
 extern void install_exception_handlers(void);
 extern void exception_init(void);
-extern void print_istate(istate_t *istate);
+extern void decode_istate(istate_t *istate);
 extern void reset_exception_entry(void);
 extern void irq_exception_entry(void);

kernel/arch/arm32/src/exc_handler.S

@@ -98 +98 @@
         stmfd r13!, {r13, lr}^
         stmfd r13!, {r2}
+
+        # Stop stack traces here
+        mov fp, #0
+        
         b 2f
 
@@ -123 +127 @@
         stmfd r13!, {r2}
 2:
-        # Stop stack traces here
-        mov fp, #0
 .endm
 

kernel/arch/arm32/src/exception.c

@@ -173 +173 @@
  * @param istate Structure to be printed.
  */
-void print_istate(istate_t *istate)
+void decode_istate(istate_t *istate)
 {
-        printf("istate dump:\n");
-        
-        printf(" r0: %x    r1: %x    r2: %x    r3: %x\n",
+        printf("r0 =%#0.8lx\tr1 =%#0.8lx\tr2 =%#0.8lx\tr3 =%#0.8lx\n",
             istate->r0, istate->r1, istate->r2, istate->r3);
-        printf(" r4: %x    r5: %x    r6: %x    r7: %x\n", 
+        printf("r4 =%#0.8lx\tr5 =%#0.8lx\tr6 =%#0.8lx\tr7 =%#0.8lx\n",
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf(" r8: %x    r8: %x   r10: %x    fp: %x\n", 
+        printf("r8 =%#0.8lx\tr9 =%#0.8lx\tr10=%#0.8lx\tfp =%#0.8lx\n",
             istate->r8, istate->r9, istate->r10, istate->fp);
-        printf(" r12: %x    sp: %x    lr: %x  spsr: %x\n",
+        printf("r12=%#0.8lx\tsp =%#0.8lx\tlr =%#0.8lx\tspsr=%#0.8lx\n",
             istate->r12, istate->sp, istate->lr, istate->spsr);
-        
-        printf(" pc: %x\n", istate->pc);
-
-        stack_trace_istate(istate);
 }
 

kernel/arch/arm32/src/mm/page.c

@@ -27 +27 @@
  */
 
-/** @addtogroup arm32mm 
+/** @addtogroup arm32mm
  * @{
  */

kernel/arch/arm32/src/mm/page_fault.c

@@ -183 +183 @@
         if (ret == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
-                print_istate(istate);
-                printf("page fault - pc: %x, va: %x, status: %x(%x), "
-                    "access:%d\n", istate->pc, badvaddr, fsr.status, fsr,
-                    access);
-                
-                panic("Page fault.");
+                panic_memtrap(istate, access, badvaddr, "Page fault.");
         }
 }
@@ -203 +198 @@
 
         if (ret == AS_PF_FAULT) {
-                printf("prefetch_abort\n");
-                print_istate(istate);
-                panic("page fault - prefetch_abort at address: %x.",
-                    istate->pc);
+                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc,
+                    "Page fault - prefetch_abort.");
         }
 }