Changes in kernel/generic/src/proc/program.c [3fcea34:f8fb03b] in mainline

File:

• kernel/generic/src/proc/program.c (modified) (8 diffs)

kernel/generic/src/proc/program.c

@@ -49 +49 @@
 #include <lib/elf_load.h>
 #include <str.h>
-#include <str_error.h>
 #include <log.h>
 #include <syscall/copy.h>
 #include <proc/program.h>
-#include <userspace.h>
 
 /**
@@ -73 +71 @@
 errno_t program_create(as_t *as, uspace_addr_t entry_addr, char *name, program_t *prg)
 {
-        uinit_arg_t *kernel_uarg = malloc(sizeof(uinit_arg_t));
+        uspace_arg_t *kernel_uarg = (uspace_arg_t *)
+            malloc(sizeof(uspace_arg_t));
         if (!kernel_uarg)
                 return ENOMEM;
@@ -99 +98 @@
         if (!area) {
                 free(kernel_uarg);
-                task_release(prg->task);
+                task_destroy(prg->task);
                 prg->task = NULL;
                 return ENOMEM;
         }
 
-        kernel_uarg->pc = entry_addr;
-        kernel_uarg->sp = arch_get_initial_sp(virt, STACK_SIZE_USER);
+        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;
 
         /*
@@ -115 +118 @@
                 free(kernel_uarg);
                 as_area_destroy(as, virt);
-                task_release(prg->task);
+                task_destroy(prg->task);
                 prg->task = NULL;
                 return ELIMIT;
@@ -139 +142 @@
  *
  */
-errno_t program_create_from_image(void *image_addr, size_t image_size, char *name, program_t *prg)
+errno_t program_create_from_image(void *image_addr, char *name, program_t *prg)
 {
         as_t *as = as_create(0);
@@ -153 +156 @@
         }
 
-        errno_t rc = program_create(as, ((elf_header_t *) image_addr)->e_entry,
+        return program_create(as, ((elf_header_t *) image_addr)->e_entry,
             name, prg);
-
-        if (rc == EOK) {
-                prg->task->debug_sections = calloc(1, sizeof(debug_sections_t));
-                if (prg->task->debug_sections != NULL)
-                        *prg->task->debug_sections = get_debug_sections(image_addr, image_size);
-        }
-
-        return rc;
 }
 
@@ -208 +203 @@
 void program_ready(program_t *prg)
 {
-        thread_start(prg->main_thread);
-        thread_detach(prg->main_thread);
-        prg->main_thread = NULL;
+        thread_ready(prg->main_thread);
 }
 
@@ -248 +241 @@
         program_ready(&prg);
 
-        task_release(prg.task);
-
         return EOK;
 }