Changeset e1e4192 in mainline for kernel/generic/src

Timestamp:

2012-06-03T20:45:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

90478727

Parents:

f7e69f5 (diff), 3123d2a (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 mainline changes

Location:

kernel/generic/src

Files:

• ipc/sysipc.c (modified) (3 diffs)
• lib/rd.c (modified) (2 diffs)
• main/kinit.c (modified) (2 diffs)
• proc/program.c (modified) (5 diffs)
• synch/spinlock.c (modified) (1 diff)

kernel/generic/src/ipc/sysipc.c

@@ -597 +597 @@
         if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) {
                 int phoneid = phone_alloc(TASK);
-                if (phoneid < 0) { /* Failed to allocate phone */
+                if (phoneid < 0) {  /* Failed to allocate phone */
                         IPC_SET_RETVAL(call->data, ELIMIT);
                         ipc_answer(box, call);
@@ -883 +883 @@
         
         /*
-         * Userspace is not allowed to change interface and method of system
+         * User space is not allowed to change interface and method of system
          * methods on forward, allow changing ARG1, ARG2, ARG3 and ARG4 by
-         * means of method, arg1, arg2 and arg3.
+         * means of imethod, arg1, arg2 and arg3.
          * If the interface and method is immutable, don't change anything.
          */
@@ -897 +897 @@
                         IPC_SET_ARG3(call->data, arg2);
                         
-                        if (slow) {
+                        if (slow)
                                 IPC_SET_ARG4(call->data, arg3);
-                                /*
-                                 * For system methods we deliberately don't
-                                 * overwrite ARG5.
-                                 */
-                        }
+                        
+                        /*
+                         * For system methods we deliberately don't
+                         * overwrite ARG5.
+                         */
                 } else {
                         IPC_SET_IMETHOD(call->data, imethod);

kernel/generic/src/lib/rd.c

@@ -38 +38 @@
  */
 
+#include <print.h>
 #include <lib/rd.h>
 #include <mm/frame.h>
@@ -66 +67 @@
         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)\n", i, rc);
+                        printf("init[%zu]: Init binary load failed "
+                            "(error %d, loader status %u)\n", i, rc,
+                            programs[i].loader_status);
         }
         

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;
         }

kernel/generic/src/synch/spinlock.c

@@ -262 +262 @@
         int rc = spinlock_trylock(&(lock->lock));
         
-        ASSERT_IRQ_SPINLOCK(!rc || !lock->guard, lock);
+        ASSERT_IRQ_SPINLOCK((!rc) || (!lock->guard), lock);
         return rc;
 }