opstart: Migrated to C++ modules.

Author: sleepy-monax

src/kernel/opstart/arch.cpp

@@ -0,0 +1,25 @@
+module;
+
+#include <hal/vmm.h>
+#include <vaerk-handover/spec.h>
+
+export module Opstart:arch;
+
+import Karm.Core;
+
+using namespace Karm;
+
+extern "C" void __enterKernel(usize entry, usize payload, usize stack, usize vmm);
+
+namespace Opstart::Arch {
+
+export void enterKernel(usize entry, Handover::Payload& payload, usize stack, Hal::Vmm& vmm) {
+    __enterKernel(
+        entry,
+        reinterpret_cast<usize>(&payload) + Handover::KERNEL_BASE,
+        stack,
+        vmm.root()
+    );
+}
+
+} // namespace Opstart::Arch

src/kernel/opstart/loader.h src/kernel/opstart/config.cppsrc/kernel/opstart/loader.h renamed to src/kernel/opstart/config.cpp

@@ -1,21 +1,19 @@
-#pragma once
+module;
 
 #include <karm/macros>
 
-import Mdi;
-import Karm.Ui;
+export module Opstart:config;
+
 import Karm.Core;
-import Karm.Image;
-import Karm.Sys;
 import Karm.Ref;
 import Karm.Gfx;
-import Karm.Logger;
+import Karm.Image;
 
 using namespace Karm;
 
 namespace Opstart {
 
-struct Blob {
+export struct Blob {
     Ref::Url url;
     Serde::Value props;
 
@@ -43,7 +41,7 @@ struct Blob {
     }
 };
 
-struct Entry {
+export struct Entry {
     Union<None, Gfx::Icon, Rc<Gfx::Surface>> icon = NONE;
     String name;
     Blob kernel;
@@ -84,7 +82,7 @@ struct Entry {
     }
 };
 
-struct Configs {
+export struct Configs {
     Opt<String> title;
     Opt<String> subtitle;
     Vec<Entry> entries;
@@ -113,8 +111,4 @@ struct Configs {
     }
 };
 
-Async::Task<> showMenuAsync(Sys::Env& env, Configs const& c, Async::CancellationToken ct);
-
-Res<> loadEntry(Entry const&);
-
-} // namespace Opstart
+} // namespace Opstart

src/kernel/opstart/entry.cpp

@@ -1,37 +1,14 @@
-import Karm.Core;
+module;
 
 #include <hal-x86_64/vmm.h>
-#include <opstart/fw.h>
 #include <vaerk-efi/base.h>
+#include <vaerk-handover/builder.h>
 
-namespace Opstart::Fw {
-
-struct EfiPmm : public Hal::Pmm {
-    Res<Hal::PmmRange> allocRange(usize size, Flags<Hal::PmmFlags>) override {
-        usize paddr = 0;
-        try$(Efi::bs()->allocatePages(Efi::AllocateType::ANY_PAGES, Efi::MemoryType::LOADER_DATA, size / Hal::PAGE_SIZE, &paddr));
-        return Ok(Hal::PmmRange{paddr, size});
-    }
-
-    Res<> used(Hal::PmmRange range, Flags<Hal::PmmFlags>) override {
-        usize paddr = range.start;
-        try$(Efi::bs()->allocatePages(Efi::AllocateType::ADDRESS, Efi::MemoryType::LOADER_DATA, paddr / Hal::PAGE_SIZE, &paddr));
-        return Ok();
-    }
+export module Opstart:handover;
 
-    Res<> free(Hal::PmmRange range) override {
-        try$(Efi::bs()->freePages((u64)range.start, range.size / Hal::PAGE_SIZE));
-        return Ok();
-    }
-};
+import Karm.Core;
 
-static EfiPmm pmm{};
-
-Res<Arc<Hal::Vmm>> createVmm() {
-    usize upper = try$(pmm.allocRange(Hal::PAGE_SIZE, {})).start;
-    std::memset((void*)upper, 0, Hal::PAGE_SIZE);
-    return Ok(makeArc<x86_64::Vmm<>>(pmm, (x86_64::Pml<4>*)upper));
-}
+namespace Opstart {
 
 Res<> parseGop(Handover::Builder& builder) {
     auto* gop = try$(Efi::locateProtocol<Efi::GraphicsOutputProtocol>());
@@ -136,18 +113,4 @@ Res<> finalizeHandover(Handover::Builder& builder) {
     return Ok();
 }
 
-Hal::PmmRange imageRange() {
-    return {
-        Hal::pageAlignDown((usize)Efi::li()->imageBase),
-        Hal::pageAlignUp((usize)Efi::li()->imageSize),
-    };
-}
-
-// Implemented in kernel-entry.s
-extern "C" void __enterKernel(usize entry, usize payload, usize stack, usize vmm);
-
-void enterKernel(usize entry, Handover::Payload& payload, usize stack, Hal::Vmm& vmm) {
-    __enterKernel(entry, (usize)&payload + Handover::KERNEL_BASE, stack, vmm.root());
-}
-
-} // namespace Opstart::Fw
+} // namespace Opstart

src/kernel/opstart/fw.h

@@ -1,21 +1,29 @@
+module;
+
+#include <hal/mem.h>
+#include <hal/vmm.h>
+#include <karm/macros>
+#include <vaerk-handover/builder.h>
+
+export module Opstart:loader;
+
 import Karm.Core;
 import Karm.Sys;
 import Karm.Logger;
 import Karm.Dl.Elf;
 
-#include <hal/mem.h>
-#include <vaerk-handover/builder.h>
-
-#include "fw.h"
-#include "loader.h"
+import :config;
+import :arch;
+import :mem;
+import :handover;
 
 using namespace Karm::Literals;
 
 namespace Opstart {
 
 void enterKernel(usize entry, usize payload, usize stack, usize vmm);
 
-Res<> loadEntry(Entry const& entry) {
+export Res<> loadEntry(Entry const& entry) {
     logInfo("opstart: preparing payload...");
     auto payloadMem = try$(Sys::mutMmap(NONE, {.size = 16_KiB}));
     logInfo("opstart: payload at vaddr: {p} paddr: {p}", payloadMem.vaddr(), payloadMem.paddr());
@@ -92,7 +100,7 @@ Res<> loadEntry(Entry const& entry) {
         logInfo(" - {}", request.name());
     }
 
-    auto vmm = try$(Fw::createVmm());
+    auto vmm = try$(createVmm());
 
     logInfo("opstart: mapping kernel...");
     try$(vmm->mapRange(
@@ -109,7 +117,7 @@ Res<> loadEntry(Entry const& entry) {
     ));
 
     logInfo("opstart: mapping boot-agent image...");
-    auto loaderImage = Fw::imageRange();
+    auto loaderImage = imageRange();
 
     try$(vmm->mapRange(
         Hal::identityMapped(loaderImage),
@@ -123,8 +131,8 @@ Res<> loadEntry(Entry const& entry) {
     usize sp = Handover::KERNEL_BASE + (usize)stackMap.mutBytes().end();
     logInfo("opstart: ip:{x} sp:{x} payload:{}", ip, sp, (usize)&payload.finalize());
 
-    try$(Fw::finalizeHandover(payload));
-    Fw::enterKernel(ip, payload.finalize(), sp, *vmm);
+    try$(finalizeHandover(payload));
+    Arch::enterKernel(ip, payload.finalize(), sp, *vmm);
 
     unreachable();
 }

src/kernel/opstart/efi/fw.cpp src/kernel/opstart/handover.cppsrc/kernel/opstart/efi/fw.cpp renamed to src/kernel/opstart/handover.cpp

@@ -0,0 +1,31 @@
+#include <karm/entry>
+
+import Karm.Logger;
+import Opstart;
+
+using namespace Karm;
+using namespace Karm::Literals;
+using namespace Karm::Ref::Literals;
+
+Async::Task<> entryPointAsync(Sys::Env& env, Async::CancellationToken ct) {
+    logInfo("opstart " stringify$(__ck_version_value));
+
+    logInfo("loading configs...");
+    auto file = co_try$(Sys::File::open("file:/loader.json"_url));
+
+    logInfo("parsing configs...");
+    auto fileStr = co_try$(Io::readAllUtf8(file));
+    auto json = co_try$(Json::parse(fileStr));
+
+    logInfo("validating configs...");
+    logInfo("configs: {}", json);
+
+    auto configs = co_try$(Opstart::Configs::fromJson(json));
+
+    if (configs.entries.len() > 1 or configs.entries.len() == 0)
+        co_return co_await Opstart::showMenuAsync(env, configs, ct);
+    else
+        co_try$(splashScreen(configs.entries[0]));
+
+    co_return Opstart::loadEntry(configs.entries[0]);
+}

src/kernel/opstart/loader.cpp

@@ -11,7 +11,7 @@
     "requires": [
         "karm-kira",
         "karm-sys",
-        "opstart-impl",
-        "karm-dl.elf"
+        "karm-dl.elf",
+        "opstart.arch"
     ]
 }

src/kernel/opstart/main.cpp

@@ -0,0 +1,44 @@
+module;
+
+#include <hal-x86_64/vmm.h>
+#include <vaerk-efi/base.h>
+
+export module Opstart:mem;
+
+namespace Opstart {
+
+struct EfiPmm : Hal::Pmm {
+    Res<Hal::PmmRange> allocRange(usize size, Flags<Hal::PmmFlags>) override {
+        usize paddr = 0;
+        try$(Efi::bs()->allocatePages(Efi::AllocateType::ANY_PAGES, Efi::MemoryType::LOADER_DATA, size / Hal::PAGE_SIZE, &paddr));
+        return Ok(Hal::PmmRange{paddr, size});
+    }
+
+    Res<> used(Hal::PmmRange range, Flags<Hal::PmmFlags>) override {
+        usize paddr = range.start;
+        try$(Efi::bs()->allocatePages(Efi::AllocateType::ADDRESS, Efi::MemoryType::LOADER_DATA, paddr / Hal::PAGE_SIZE, &paddr));
+        return Ok();
+    }
+
+    Res<> free(Hal::PmmRange range) override {
+        try$(Efi::bs()->freePages(range.start, range.size / Hal::PAGE_SIZE));
+        return Ok();
+    }
+};
+
+static EfiPmm pmm{};
+
+export Res<Arc<Hal::Vmm>> createVmm() {
+    usize upper = try$(pmm.allocRange(Hal::PAGE_SIZE, {})).start;
+    std::memset(reinterpret_cast<void*>(upper), 0, Hal::PAGE_SIZE);
+    return Ok(makeArc<x86_64::Vmm<>>(pmm, reinterpret_cast<x86_64::Pml<4>*>(upper)));
+}
+
+export Hal::PmmRange imageRange() {
+    return {
+        Hal::pageAlignDown(reinterpret_cast<usize>(Efi::li()->imageBase)),
+        Hal::pageAlignUp(Efi::li()->imageSize),
+    };
+}
+
+} // namespace Opstart