Changeset dc5c303 in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2023-12-28T13:59:23Z (7 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• kernel/generic/src/main/kinit.c (modified) (5 diffs)

kernel/generic/src/main/kinit.c

@@ -61 +61 @@
 #include <stdio.h>
 #include <log.h>
-#include <mem.h>
+#include <memw.h>
 #include <console/console.h>
 #include <interrupt.h>
@@ -69 +69 @@
 #include <ipc/ipc.h>
 #include <str.h>
+#include <str_error.h>
 #include <sysinfo/stats.h>
 #include <sysinfo/sysinfo.h>
 #include <align.h>
 #include <stdlib.h>
+#include <debug/register.h>
 
 #ifdef CONFIG_SMP
@@ -182 +184 @@
          */
         size_t i;
-        program_t programs[CONFIG_INIT_TASKS];
+        program_t programs[CONFIG_INIT_TASKS] = { };
 
         // FIXME: do not propagate arguments through sysinfo
@@ -237 +239 @@
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
                 assert(page);
+
+                if (str_cmp(name, "kernel.dbg") == 0) {
+                        /*
+                         * Not an actual init task, but rather debug sections extracted
+                         * from the kernel ELF file and handed to us here so we can use
+                         * it for debugging.
+                         */
+
+                        register_debug_data((void *) page, init.tasks[i].size);
+                        programs[i].task = NULL;
+                        continue;
+                }
 
                 if (str_cmp(name, "loader") == 0) {
@@ -254 +268 @@
                 }
 
-                errno_t rc = program_create_from_image((void *) page, namebuf,
+                errno_t rc = program_create_from_image((void *) page, init.tasks[i].size, namebuf,
                     &programs[i]);