Changes in kernel/arch/arm32/src/userspace.c [3fcea34:5a5269d] in mainline

File:

• kernel/arch/arm32/src/userspace.c (modified) (2 diffs)

kernel/arch/arm32/src/userspace.c

@@ -61 +61 @@
 } ustate_t;
 
-uintptr_t arch_get_initial_sp(uintptr_t stack_base, uintptr_t stack_size)
-{
-        return stack_base + stack_size;
-}
-
 /** Change processor mode
  *
@@ -71 +66 @@
  *
  */
-void userspace(uintptr_t pc, uintptr_t sp)
+void userspace(uspace_arg_t *kernel_uarg)
 {
-        volatile ustate_t ustate = { };
+        volatile ustate_t ustate;
+
+        /* set first parameter */
+        ustate.r0 = kernel_uarg->uspace_uarg;
+
+        /* %r1 is defined to hold pcb_ptr - set it to 0 */
+        ustate.r1 = 0;
 
         /* pass the RAS page address in %r2 */
         ustate.r2 = (uintptr_t) ras_page;
 
-        ustate.sp = sp;
-        ustate.pc = pc;
+        /* clear other registers */
+        ustate.r3 = 0;
+        ustate.r4 = 0;
+        ustate.r5 = 0;
+        ustate.r6 = 0;
+        ustate.r7 = 0;
+        ustate.r8 = 0;
+        ustate.r9 = 0;
+        ustate.r10 = 0;
+        ustate.r11 = 0;
+        ustate.r12 = 0;
+        ustate.lr = 0;
+
+        /* set user stack */
+        ustate.sp = kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size;
+
+        /* set where uspace execution starts */
+        ustate.pc = kernel_uarg->uspace_entry;
 
         /* status register in user mode */