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

File:

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

kernel/arch/ia32/src/userspace.c

@@ -38 +38 @@
 #include <stdint.h>
 #include <arch.h>
+#include <abi/proc/uarg.h>
 #include <mm/as.h>
 #include <arch/cpu.h>
 #include <arch/asm.h>
-
-uintptr_t arch_get_initial_sp(uintptr_t stack_base, uintptr_t stack_size)
-{
-        return stack_base + stack_size;
-}
 
 /** Enter userspace
@@ -52 +48 @@
  *
  */
-void userspace(uintptr_t pc, uintptr_t sp)
+void userspace(uspace_arg_t *kernel_uarg)
 {
         uint32_t eflags = read_eflags();
@@ -65 +61 @@
             "pushl %[utext_des]\n"
             "pushl %[entry]\n"
+            "movl %[uarg], %%eax\n"
 
             /* %edi is defined to hold pcb_ptr - set it to 0 */
@@ -73 +70 @@
             : [eflags_mask] "i" (~EFLAGS_NT),
               [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),
               [eflags] "r" ((eflags & ~(EFLAGS_NT)) | EFLAGS_IF),
               [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
-              [entry] "r" (pc),
+              [entry] "r" (kernel_uarg->uspace_entry),
+              [uarg] "r" (kernel_uarg->uspace_uarg),
               [vreg_des] "r" (GDT_SELECTOR(VREG_DES))
             : "eax");