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

File:

• kernel/arch/amd64/src/userspace.c (modified) (4 diffs)

kernel/arch/amd64/src/userspace.c

@@ -39 +39 @@
 #include <stdint.h>
 #include <arch.h>
+#include <abi/proc/uarg.h>
 #include <mm/as.h>
-
-uintptr_t arch_get_initial_sp(uintptr_t stack_base, uintptr_t stack_size)
-{
-        return stack_base + stack_size;
-}
 
 /** Enter userspace
@@ -51 +47 @@
  *
  */
-void userspace(uintptr_t pc, uintptr_t sp)
+void userspace(uspace_arg_t *kernel_uarg)
 {
         uint64_t rflags = read_rflags();
@@ -64 +60 @@
             "pushq %[utext_des]\n"
             "pushq %[entry]\n"
+            "movq %[uarg], %%rax\n"
 
             /* %rdi is defined to hold pcb_ptr - set it to 0 */
@@ -69 +66 @@
             "iretq\n"
             :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-              [stack_top] "r" (sp),
+              [stack_top] "r" (kernel_uarg->uspace_stack +
+              kernel_uarg->uspace_stack_size),
               [rflags] "r" (rflags),
               [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
-              [entry] "r" (pc)
+              [entry] "r" (kernel_uarg->uspace_entry),
+              [uarg] "r" (kernel_uarg->uspace_uarg)
+            : "rax"
         );