Changeset 4585bda in mainline for kernel/generic/src/proc/program.c

Timestamp:

2012-06-01T09:09:32Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

79b5bc9

Parents:

fb04cd90 (diff), db675dd (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.

Message:

Merge with mainline

File:

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

kernel/generic/src/proc/program.c

@@ -80 +80 @@
         kernel_uarg->uspace_uarg = NULL;
         
+        prg->loader_status = EE_OK;
         prg->task = task_create(as, name);
         if (!prg->task)
@@ -111 +112 @@
  * executable image. The task is returned in *task.
  *
- * @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.
+ * @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.
  *
  * @return EOK on success or negative error code.
@@ -126 +128 @@
                 return ENOMEM;
         
-        unsigned int rc = elf_load((elf_header_t *) image_addr, as, 0);
-        if (rc != EE_OK) {
+        prg->loader_status = elf_load((elf_header_t *) image_addr, as, 0);
+        if (prg->loader_status != EE_OK) {
                 as_destroy(as);
                 prg->task = NULL;
                 prg->main_thread = NULL;
                 
-                if (rc != EE_LOADER)
+                if (prg->loader_status != EE_LOADER)
                         return ENOTSUP;
                 
@@ -140 +142 @@
                 
                 program_loader = image_addr;
-                LOG("Registered program loader at %p",
-                    (void *) image_addr);
+                printf("Program loader at %p\n", (void *) image_addr);
                 
                 return EOK;
@@ -171 +172 @@
         }
         
-        unsigned int rc = elf_load((elf_header_t *) program_loader, as,
+        prg->loader_status = elf_load((elf_header_t *) program_loader, as,
             ELD_F_LOADER);
-        if (rc != EE_OK) {
+        if (prg->loader_status != EE_OK) {
                 as_destroy(as);
-                printf("Cannot spawn loader (%s)\n", elf_error(rc));
+                printf("Cannot spawn loader (%s)\n",
+                    elf_error(prg->loader_status));
                 return ENOENT;
         }