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

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• kernel/arch/arm32/src/debug/stacktrace.c (modified) (1 diff)

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

@@ -68 +68 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }