Changeset ebb1489 in mainline for kernel/arch/arm32/src/userspace.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

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
  *
@@ -66 +71 @@
  *
  */
-void userspace(uspace_arg_t *kernel_uarg)
+void userspace(uintptr_t pc, uintptr_t sp)
 {
-        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;
+        volatile ustate_t ustate = { };
 
         /* pass the RAS page address in %r2 */
         ustate.r2 = (uintptr_t) ras_page;
 
-        /* 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;
+        ustate.sp = sp;
+        ustate.pc = pc;
 
         /* status register in user mode */