initgraph, whole lot of refactor

boot/cmdline.c

@@ -1,8 +1,8 @@
 #include <zinnia/cmdline.h>
 #include <zinnia/init.h>
-#include <stddef.h>
 #include <zinnia/stdlib.h>
-#include <zinnia/string.h>
+#include <stddef.h>
+#include <string.h>
 
 // Defined in linker script.
 extern const struct cmdline_option* __ld_cmdline_start[];
@@ -10,17 +10,16 @@ extern const struct cmdline_option* __ld_cmdline_end[];
 
 static char cmdline_buf[0x1000];
 
-[[__init]]
-void cmdline_parse(const char* cmdline) {
-    if (cmdline == nullptr)
-        cmdline = "";
-
-    const size_t len = strnlen(cmdline, sizeof(cmdline_buf) - 1);
+void cmdline_parse_buf(
+    char* cmdline_buf,
+    size_t len,
+    const struct cmdline_option* const* start,
+    const struct cmdline_option* const* end
+) {
     size_t idx = 0;
-    memcpy(cmdline_buf, cmdline, len);
 
     while (1) {
-        const struct cmdline_option** opt = __ld_cmdline_start;
+        const struct cmdline_option* const* opt = start;
         char* name = nullptr;
         char* value = nullptr;
 
@@ -62,7 +61,7 @@ void cmdline_parse(const char* cmdline) {
         }
 
         // Find the corresponding option.
-        while (opt < __ld_cmdline_end) {
+        while (opt < end) {
             const struct cmdline_option* current = *opt;
             if (!strcmp(current->name, name)) {
                 if (value == nullptr)
@@ -105,3 +104,13 @@ void cmdline_parse(const char* cmdline) {
             break;
     }
 }
+
+[[__init]]
+void cmdline_parse(const char* cmdline) {
+    if (cmdline == nullptr)
+        cmdline = "";
+
+    const size_t len = strnlen(cmdline, sizeof(cmdline_buf) - 1);
+    memcpy(cmdline_buf, cmdline, len);
+    cmdline_parse_buf(cmdline_buf, len, __ld_cmdline_start, __ld_cmdline_end);
+}

boot/kernel.ld

@@ -6,6 +6,7 @@ PHDRS {
     data    PT_LOAD     FLAGS(6);
     dynamic PT_DYNAMIC  FLAGS(6);
     percpu  PT_LOAD     FLAGS(6);
+    cmdline 0x60000005;
 }
 
 SECTIONS
@@ -28,7 +29,7 @@ SECTIONS
         __ld_cmdline_start = .;
         KEEP(*(.cmdline))
         __ld_cmdline_end = .;
-    } :rodata
+    } :rodata :cmdline
 
     .rodata : {
         *(.rodata .rodata.*)
@@ -39,6 +40,15 @@ SECTIONS
         KEEP(*(.mod.entry .mod.entry.*))
         __ld_mod_entry_end = .;
 
+        . = ALIGN(8);
+        __ld_initgraph_nodes_start = .;
+        KEEP(*(.initgraph.nodes))
+        __ld_initgraph_nodes_end = .;
+
+        __ld_initgraph_edges_start = .;
+        KEEP(*(.initgraph.edges))
+        __ld_initgraph_edges_end = .;
+
         *(.got .got.*)
 
         __ld_rodata_end = .;
@@ -52,12 +62,6 @@ SECTIONS
         *(.data .data.*)
     } :data
 
-    .console : {
-        __ld_console_start = .;
-        KEEP(*(.console))
-        __ld_console_end = .;
-    } :data
-
     .dynsym : {
         __ld_dynsym_start = .;
         KEEP(*(.dynsym*))

boot/limine/entry.c

@@ -3,8 +3,8 @@
 #include <zinnia/cmdline.h>
 #include <zinnia/init.h>
 #include <zinnia/print.h>
-#include <zinnia/string.h>
 #include <zinnia/utils.h>
+#include <string.h>
 #include "limine.h"
 
 [[__initdata_sorted("limine.0")]]
@@ -53,6 +53,8 @@ void kernel_entry() {
     assert(hhdm_res, "hhdm_request returned no response!");
 
     info.cmdline = exec_file_res->executable_file->string;
+    info.kernel_file.data = (phys_t)((uintptr_t)exec_file_res->executable_file->address - hhdm_res->offset);
+    info.kernel_file.length = exec_file_res->executable_file->size;
 
     info.num_mem_maps = MIN(ARRAY_SIZE(mem), mm_res->entry_count);
     for (size_t i = 0; i < info.num_mem_maps; i++) {

boot/main.c

@@ -6,8 +6,8 @@
 #include <zinnia/console.h>
 #include <zinnia/elf.h>
 #include <zinnia/init.h>
+#include <zinnia/initgraph.h>
 #include <zinnia/irq.h>
-#include <zinnia/module.h>
 #include <zinnia/percpu.h>
 #include <zinnia/print.h>
 #include <zinnia/sched.h>
@@ -17,10 +17,6 @@
 #include <config.h>
 #include <stdint.h>
 
-#if CONFIG_ACPI
-#include <zinnia/acpi.h>
-#endif
-
 static const char zinnia_banner[] = "Zinnia " ZINNIA_VERSION " " CONFIG_KERNEL_FLAVOR " (" ZINNIA_ARCH
                                     ", " ZINNIA_COMPILER_ID ", " ZINNIA_LINKER_ID ")";
 
@@ -30,20 +26,22 @@ static void kernel_main_task(uintptr_t arg0) {
 
     log("main: Hello from main task!\n");
 
-    // Initialize built-in modules.
-    module_init();
+    // Finish the initgraph.
+    initgraph_run(nullptr, info);
+
+    // TODO: Try to run init.
 
     assert(info->num_files >= 1, "No init executable provided");
 
     struct vma* init_space;
-    assert(vma_new(&init_space) == EOK, "");
+    assert(vma_new(&init_space) == 0, "");
 
     struct boot_file* file_data = &info->files[0];
     struct task* init_task = nullptr;
 
     struct paged_vmo* init_file;
     status = vmo_new_phys(&init_file);
-    assert(status == EOK, "Failed to allocate a memory object");
+    assert(status == 0, "Failed to allocate a memory object");
 
     vmo_write(&init_file->object, 0, HHDM_PTR(file_data->data), file_data->length, nullptr);
 
@@ -83,17 +81,8 @@ void kernel_main(struct boot_info* info) {
     kprintf("Command line: %s\n", info->cmdline);
 
     cmdline_parse(info->cmdline);
-    console_init();
-    kprintf("\ec");
 
-    mem_init(info->mem_map, info->num_mem_maps, info->virt_base, info->phys_base, info->hhdm_base);
-
-#if CONFIG_ACPI
-    acpi_init(info);
-#endif
-
-    percpu_init();
-    sched_init(&percpu_get()->sched);
+    initgraph_run(sched_stage, info);
 
     struct task* main_task;
     task_create("main", &kernel_vma, kernel_main_task, (uintptr_t)info, &main_task);