Changeset afd0106 in mainline

Timestamp:

2010-01-13T16:47:53Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1298da25

Parents:

405f759

Message:

Add support for kernel stack traces on arm32.

Location:

kernel/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• src/debug/stacktrace.c (modified) (1 diff)
• src/debug/stacktrace_asm.S (modified) (1 diff)

kernel/arch/arm32/Makefile.inc

@@ -38 +38 @@
 ATSIGN = %
 
-GCC_CFLAGS += -fno-zero-initialized-in-bss
+GCC_CFLAGS += -fno-zero-initialized-in-bss -mapcs-frame
 
 BITS = 32

kernel/arch/arm32/src/debug/stacktrace.c

@@ -38 +38 @@
 #include <typedefs.h>
 
+#define FRAME_OFFSET_FP_PREV    -3
+#define FRAME_OFFSET_RA         -1
+
 bool kernel_frame_pointer_validate(uintptr_t fp)
 {
-        return false;
+        return fp != 0;
 }
 
 bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
 {
-        return false;
+        uint32_t *stack = (void *) fp;
+
+        *prev = stack[FRAME_OFFSET_FP_PREV];
+        return true;
 }
 
 bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra)
 {
-        return false;
+        uint32_t *stack = (void *) fp;
+
+        *ra = stack[FRAME_OFFSET_RA];
+        return true;
 }
 
 bool uspace_frame_pointer_validate(uintptr_t fp)
 {
-        return false;
+        return fp != 0;
 }
 
 bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
 {
-        return false;
+        return !copy_from_uspace((void *) prev,
+            (uint32_t *) fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra)
 {
-        return false;
+        return !copy_from_uspace((void *) ra, (uint32_t *) fp + FRAME_OFFSET_RA,
+            sizeof(*ra));
 }
 

kernel/arch/arm32/src/debug/stacktrace_asm.S

@@ -33 +33 @@
 
 frame_pointer_get:
+        mov r0, fp
         mov pc, lr
 
 program_counter_get:
+        mov r0, lr
         mov pc, lr