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

Timestamp:

2024-10-13T08:23:40Z (8 weeks 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/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
@@ -48 +52 @@
  *
  */
-void userspace(uspace_arg_t *kernel_uarg)
+void userspace(uintptr_t pc, uintptr_t sp)
 {
         uint32_t eflags = read_eflags();
@@ -61 +65 @@
             "pushl %[utext_des]\n"
             "pushl %[entry]\n"
-            "movl %[uarg], %%eax\n"
 
             /* %edi is defined to hold pcb_ptr - set it to 0 */
@@ -70 +73 @@
             : [eflags_mask] "i" (~EFLAGS_NT),
               [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-              [stack_top] "r" (kernel_uarg->uspace_stack +
-              kernel_uarg->uspace_stack_size),
+              [stack_top] "r" (sp),
               [eflags] "r" ((eflags & ~(EFLAGS_NT)) | EFLAGS_IF),
               [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
-              [entry] "r" (kernel_uarg->uspace_entry),
-              [uarg] "r" (kernel_uarg->uspace_uarg),
+              [entry] "r" (pc),
               [vreg_des] "r" (GDT_SELECTOR(VREG_DES))
             : "eax");