Changeset 3e828ea in mainline for kernel/arch/arm32/src

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

kernel/arch/arm32/src

Files:

• debug/stacktrace.c (modified) (1 diff)
• userspace.c (modified) (2 diffs)

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

kernel/arch/arm32/src/userspace.c

@@ -71 +71 @@
 
         /* set first parameter */
-        ustate.r0 = (uintptr_t) kernel_uarg->uspace_uarg;
+        ustate.r0 = kernel_uarg->uspace_uarg;
 
         /* %r1 is defined to hold pcb_ptr - set it to 0 */
@@ -93 +93 @@
 
         /* set user stack */
-        ustate.sp = ((uint32_t) kernel_uarg->uspace_stack) +
+        ustate.sp = kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size;
 
         /* set where uspace execution starts */
-        ustate.pc = (uintptr_t) kernel_uarg->uspace_entry;
+        ustate.pc = kernel_uarg->uspace_entry;
 
         /* status register in user mode */