Changeset 383ddd6 in mainline for kernel/arch/arm32/src/exception.c

Timestamp:

2010-01-20T20:33:55Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

975e7e9

Parents:

6c01702 (diff), 3c081d0e (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/arm32/src/exception.c (modified) (2 diffs)

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);
 }