Changeset 0f94c3d in mainline for kernel/arch

Timestamp:

2009-03-01T20:51:26Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

2e079b70

Parents:

0d5a50c

Message:

Read command line for multiboot modules on ia32 and copy it to task name. Other arches will need to initialize task names in the init structure to an empty string.

Location:

kernel/arch

Files:

• amd64/src/boot/boot.S (modified) (1 diff)
• ia32/src/boot/cboot.c (modified) (2 diffs)

kernel/arch/amd64/src/boot/boot.S

@@ -224 +224 @@
                         
                         addl $16, %esi
-                        addq $16, %rdi
+                        addq $48, %rdi
                         
                         loop mods_loop

kernel/arch/ia32/src/boot/cboot.c

@@ -39 +39 @@
 #include <config.h>
 #include <memstr.h>
+#include <func.h>
 
 /* This is a symbol so the type is only dummy. Obtain the value using &. */
@@ -69 +70 @@
                         init.tasks[i].addr = mods[i].start + 0x80000000;
                         init.tasks[i].size = mods[i].end - mods[i].start;
+
+                        /* Copy command line, if available. */
+                        if (mods[i].string) {
+                                strncpy(init.tasks[i].name, mods[i].string,
+                                    CONFIG_TASK_NAME_BUFLEN - 1);
+                                init.tasks[i].name[CONFIG_TASK_NAME_BUFLEN - 1]
+                                    = '\0';
+                        } else {
+                                init.tasks[i].name[0] = '\0';
+                        }
                 }
         } else {