Changes in kernel/generic/src/proc/program.c [6eef3c4:c0699467] in mainline

File:

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

kernel/generic/src/proc/program.c

@@ -71 +71 @@
 int program_create(as_t *as, uintptr_t entry_addr, char *name, program_t *prg)
 {
-        prg->loader_status = EE_OK;
+        uspace_arg_t *kernel_uarg;
+        
+        kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
+        kernel_uarg->uspace_entry = (void *) entry_addr;
+        kernel_uarg->uspace_stack = (void *) USTACK_ADDRESS;
+        kernel_uarg->uspace_thread_function = NULL;
+        kernel_uarg->uspace_thread_arg = NULL;
+        kernel_uarg->uspace_uarg = NULL;
+        
         prg->task = task_create(as, name);
         if (!prg->task)
@@ -79 +87 @@
          * Create the stack address space area.
          */
-        uintptr_t virt = USTACK_ADDRESS;
         as_area_t *area = as_area_create(as,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
-            STACK_SIZE, AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, 0);
-        if (!area) {
-                task_destroy(prg->task);
+            STACK_SIZE, USTACK_ADDRESS, AS_AREA_ATTR_NONE,
+            &anon_backend, NULL);
+        if (!area)
                 return ENOMEM;
-        }
-        
-        uspace_arg_t *kernel_uarg = (uspace_arg_t *)
-            malloc(sizeof(uspace_arg_t), 0);
-        
-        kernel_uarg->uspace_entry = (void *) entry_addr;
-        kernel_uarg->uspace_stack = (void *) virt;
-        kernel_uarg->uspace_stack_size = STACK_SIZE;
-        kernel_uarg->uspace_thread_function = NULL;
-        kernel_uarg->uspace_thread_arg = NULL;
-        kernel_uarg->uspace_uarg = NULL;
         
         /*
@@ -102 +98 @@
          */
         prg->main_thread = thread_create(uinit, kernel_uarg, prg->task,
-            THREAD_FLAG_USPACE, "uinit");
-        if (!prg->main_thread) {
-                free(kernel_uarg);
-                as_area_destroy(as, virt);
-                task_destroy(prg->task);
+            THREAD_FLAG_USPACE, "uinit", false);
+        if (!prg->main_thread)
                 return ELIMIT;
-        }
         
         return EOK;
@@ -119 +111 @@
  * executable image. The task is returned in *task.
  *
- * @param[in]  image_addr Address of an executable program image.
- * @param[in]  name       Name to set for the program's task.
- * @param[out] prg        Buffer for storing program info.
- *                        If image_addr points to a loader image,
- *                        prg->task will be set to NULL and EOK
- *                        will be returned.
+ * @param image_addr Address of an executable program image.
+ * @param name       Name to set for the program's task.
+ * @param prg        Buffer for storing program info. If image_addr
+ *                   points to a loader image, p->task will be set to
+ *                   NULL and EOK will be returned.
  *
  * @return EOK on success or negative error code.
@@ -135 +126 @@
                 return ENOMEM;
         
-        prg->loader_status = elf_load((elf_header_t *) image_addr, as, 0);
-        if (prg->loader_status != EE_OK) {
+        unsigned int rc = elf_load((elf_header_t *) image_addr, as, 0);
+        if (rc != EE_OK) {
                 as_destroy(as);
                 prg->task = NULL;
                 prg->main_thread = NULL;
                 
-                if (prg->loader_status != EE_LOADER)
+                if (rc != EE_LOADER)
                         return ENOTSUP;
                 
@@ -149 +140 @@
                 
                 program_loader = image_addr;
-                printf("Program loader at %p\n", (void *) image_addr);
+                LOG("Registered program loader at %p",
+                    (void *) image_addr);
                 
                 return EOK;
@@ -179 +171 @@
         }
         
-        prg->loader_status = elf_load((elf_header_t *) program_loader, as,
+        unsigned int rc = elf_load((elf_header_t *) program_loader, as,
             ELD_F_LOADER);
-        if (prg->loader_status != EE_OK) {
+        if (rc != EE_OK) {
                 as_destroy(as);
-                printf("Cannot spawn loader (%s)\n",
-                    elf_error(prg->loader_status));
+                printf("Cannot spawn loader (%s)\n", elf_error(rc));
                 return ENOENT;
         }