Changeset c621f4aa in mainline for kernel/arch/arm32/src/debug/stacktrace.c

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/arch/arm32/src/debug/stacktrace.c (modified) (4 diffs)

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

@@ -35 +35 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
@@ -41 +40 @@
 #define FRAME_OFFSET_RA         -1
 
-bool kernel_frame_pointer_validate(uintptr_t fp)
+bool kernel_stack_trace_context_validate(stack_trace_context_t *ctx)
 {
-        return fp != 0;
+        return ctx->fp != 0;
 }
 
-bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
+bool kernel_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        uint32_t *stack = (void *) fp;
+        uint32_t *stack = (void *) ctx->fp;
 
         *prev = stack[FRAME_OFFSET_FP_PREV];
@@ -54 +53 @@
 }
 
-bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra)
+bool kernel_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        uint32_t *stack = (void *) fp;
+        uint32_t *stack = (void *) ctx->fp;
 
         *ra = stack[FRAME_OFFSET_RA];
@@ -62 +61 @@
 }
 
-bool uspace_frame_pointer_validate(uintptr_t fp)
+bool uspace_stack_trace_context_validate(stack_trace_context_t *ctx)
 {
-        return fp != 0;
+        return ctx->fp != 0;
 }
 
-bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
+bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
         return !copy_from_uspace((void *) prev,
-            (uint32_t *) fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+            (uint32_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
-bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra)
+bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra, (uint32_t *) fp + FRAME_OFFSET_RA,
-            sizeof(*ra));
+        return !copy_from_uspace((void *) ra,
+            (uint32_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
 }