Changes in / [4585bda:fb04cd90] in mainline

Files:

• kernel/generic/include/proc/program.h (modified) (1 diff)
• kernel/generic/src/lib/rd.c (modified) (2 diffs)
• kernel/generic/src/main/kinit.c (modified) (2 diffs)
• kernel/generic/src/proc/program.c (modified) (5 diffs)
• tools/toolchain.sh (modified) (2 diffs)

kernel/generic/include/proc/program.h

@@ -50 +50 @@
         struct task *task;           /**< Program task */
         struct thread *main_thread;  /**< Program main thread */
-        unsigned int loader_status;  /**< Binary loader error status */
 } program_t;
 

kernel/generic/src/lib/rd.c

@@ -38 +38 @@
  */
 
-#include <print.h>
 #include <lib/rd.h>
 #include <mm/frame.h>
@@ -67 +66 @@
         sysinfo_set_item_val("rd.size", NULL, size);
         sysinfo_set_item_val("rd.address.physical", NULL, (sysarg_t) base);
-        
-        printf("RAM disk at %p (size %zu bytes)\n", (void *) base, size);
 }
 

kernel/generic/src/main/kinit.c

@@ -201 +201 @@
                 str_cpy(namebuf + INIT_PREFIX_LEN,
                     TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name);
-                
+
                 /*
                  * Create virtual memory mappings for init task images.
@@ -236 +236 @@
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else
-                        printf("init[%zu]: Init binary load failed "
-                            "(error %d, loader status %u)\n", i, rc,
-                            programs[i].loader_status);
+                        printf("init[%zu]: Init binary load failed (error %d)\n", i, rc);
         }
         

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)
@@ -112 +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.
@@ -128 +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;
                 
@@ -142 +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;
@@ -172 +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;
         }

tools/toolchain.sh

@@ -149 +149 @@
         echo " sparc64    SPARC V9"
         echo " all        build all targets"
-        echo " parallel   same as 'all', but all in parallel"
-        echo " 2-way      same as 'all', but 2-way parallel"
+        echo " parallel   same as 'all', but in parallel"
         echo
         echo "The toolchain will be installed to the directory specified by"
@@ -432 +431 @@
                 wait
                 ;;
-        "2-way")
-                prepare
-                build_target "amd64" "amd64-linux-gnu" &
-                build_target "arm32" "arm-linux-gnueabi" &
-                wait
-                
-                build_target "ia32" "i686-pc-linux-gnu" &
-                build_target "ia64" "ia64-pc-linux-gnu" &
-                wait
-                
-                build_target "mips32" "mipsel-linux-gnu" &
-                build_target "mips32eb" "mips-linux-gnu" &
-                wait
-                
-                build_target "mips64" "mips64el-linux-gnu" &
-                build_target "ppc32" "ppc-linux-gnu" &
-                wait
-                
-                build_target "ppc64" "ppc64-linux-gnu" &
-                build_target "sparc64" "sparc64-linux-gnu" &
-                wait
-                ;;
         *)
                 show_usage