Changeset ebb1489 in mainline for kernel/generic/src/proc/program.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/generic/src/proc/program.c (modified) (3 diffs)

kernel/generic/src/proc/program.c

@@ -53 +53 @@
 #include <syscall/copy.h>
 #include <proc/program.h>
+#include <userspace.h>
 
 /**
@@ -72 +73 @@
 errno_t program_create(as_t *as, uspace_addr_t entry_addr, char *name, program_t *prg)
 {
-        uspace_arg_t *kernel_uarg = (uspace_arg_t *)
-            malloc(sizeof(uspace_arg_t));
+        uinit_arg_t *kernel_uarg = malloc(sizeof(uinit_arg_t));
         if (!kernel_uarg)
                 return ENOMEM;
@@ -104 +104 @@
         }
 
-        kernel_uarg->uspace_entry = entry_addr;
-        kernel_uarg->uspace_stack = virt;
-        kernel_uarg->uspace_stack_size = STACK_SIZE_USER;
-        kernel_uarg->uspace_thread_function = USPACE_NULL;
-        kernel_uarg->uspace_thread_arg = USPACE_NULL;
-        kernel_uarg->uspace_uarg = USPACE_NULL;
+        kernel_uarg->pc = entry_addr;
+        kernel_uarg->sp = arch_get_initial_sp(virt, STACK_SIZE_USER);
 
         /*