Changeset 65737d4 in mainline for kernel/arch/arm32/src

Timestamp:

2010-01-13T20:39:42Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

711e1f32

Parents:

9245413 (diff), fd608dc (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.

Location:

kernel/arch/arm32/src

Files:

• debug/stacktrace.c (added)
• debug/stacktrace_asm.S (added)
• exc_handler.S (modified) (1 diff)
• exception.c (modified) (2 diffs)
• mm/page.c (modified) (1 diff)
• mm/page_fault.c (modified) (2 diffs)
• start.S (modified) (1 diff)

kernel/arch/arm32/src/exc_handler.S

@@ -123 +123 @@
         stmfd r13!, {r2}
 2:
+        # Stop stack traces here
+        mov fp, #0
 .endm
 

kernel/arch/arm32/src/exception.c

@@ -42 +42 @@
 #include <print.h>
 #include <syscall/syscall.h>
+#include <stacktrace.h>
 
 #ifdef MACHINE_testarm
@@ -183 +184 @@
         printf(" r4: %x    r5: %x    r6: %x    r7: %x\n", 
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf(" r8: %x    r8: %x   r10: %x   r11: %x\n", 
-            istate->r8, istate->r9, istate->r10, istate->r11);
+        printf(" r8: %x    r8: %x   r10: %x    fp: %x\n", 
+            istate->r8, istate->r9, istate->r10, istate->fp);
         printf(" r12: %x    sp: %x    lr: %x  spsr: %x\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

@@ -88 +88 @@
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) {
                 panic("Unable to map physical memory %p (%d bytes).",
-                    physaddr, size)
+                    physaddr, size);
         }
         

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

@@ -181 +181 @@
 
         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), "
@@ -186 +187 @@
                     access);
                 
-                fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
                 panic("Page fault.");
         }

kernel/arch/arm32/src/start.S

@@ -69 +69 @@
         bl arch_pre_main
         
+        #
+        # Create the first stack frame.
+        #
+        mov fp, #0
+        mov ip, sp
+        push {fp, ip, lr, pc}
+        sub fp, ip, #4
+
         bl main_bsp