Changeset 65914ac in mainline

Timestamp:

2010-07-16T09:20:46Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e314a12

Parents:

63bdde6

Message:

Fix amd64 build.

File:

• kernel/arch/amd64/src/debug/stacktrace.c (modified) (3 diffs)

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

@@ -40 +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)
 {
-        uint64_t *stack = (void *) fp;
+        uint64_t *stack = (void *) ctx->fp;
         *prev = stack[FRAME_OFFSET_FP_PREV];
         
@@ -53 +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)
 {
-        uint64_t *stack = (void *) fp;
+        uint64_t *stack = (void *) ctx->fp;
         *ra = stack[FRAME_OFFSET_RA];
         
@@ -61 +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,
-            (uint64_t *) fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+            (uint64_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, (uint64_t *) fp + FRAME_OFFSET_RA,
-            sizeof(*ra));
+        return !copy_from_uspace((void *) ra,
+            (uint64_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
 }