karm-base: Fix the weird dependency cycle between base and impl.

Author: sleepy-monax

.github/workflows/build.yml

@@ -30,3 +30,5 @@ jobs:
       - name: Build Userspace (x86_64)
         run: ./skift.sh build --target=skift-x86_64
 
+      - name: Build Userspace (Host)
+        run: ./skift.sh build

src/apps/hideo-file-manager/model.cpp

@@ -24,7 +24,7 @@ void reduce(State &s, Action a) {
             reduce(s, GoTo{parent});
         },
         [&](Navigate navigate) {
-            Sys::Url dest = s.currentUrl();
+            auto dest = s.currentUrl();
             dest.append(navigate.item);
             reduce(s, GoTo{dest});
         },

src/apps/hideo-file-manager/model.h

@@ -1,18 +1,18 @@
 #pragma once
 
-#include <karm-sys/url.h>
 #include <karm-ui/reducer.h>
+#include <url/url.h>
 
 namespace FileManager {
 
 struct State {
-    Vec<Sys::Url> history;
+    Vec<Url::Url> history;
     usize currentIndex = 0;
 
-    State(Sys::Url path)
+    State(Url::Url path)
         : history({path}) {}
 
-    Sys::Url currentUrl() const {
+    Url::Url currentUrl() const {
         return history[currentIndex];
     }
 
@@ -42,7 +42,7 @@ struct GoParent {
 };
 
 struct GoTo {
-    Sys::Url url;
+    Url::Url url;
 };
 
 struct Navigate {

src/apps/hideo-file-manager/widgets.cpp

@@ -101,7 +101,7 @@ Mdi::Icon iconForLocation(Str loc) {
     return Mdi::FOLDER;
 }
 
-Ui::Child breadcrumbRoot(Sys::Url url) {
+Ui::Child breadcrumbRoot(Url::Url url) {
     if (url.scheme == "location") {
         return Ui::button(
             Model::bind<GoRoot>(),

src/apps/hideo-font-viewer/main.cpp

@@ -37,7 +37,7 @@ Ui::Child app(Strong<Media::Fontface> fontface) {
 
 Res<> entryPoint(Ctx &ctx) {
     auto &args = useArgs(ctx);
-    auto url = try$(Sys::parseUrlOrPath(args[0]));
+    auto url = try$(Url::parseUrlOrPath(args[0]));
     auto fontface = try$(args.len()
                              ? Media::loadFontface(url)
                              : Ok(Media::Fontface::fallback()));

src/apps/hideo-image-viewer/main.cpp

@@ -30,7 +30,7 @@ Res<> entryPoint(Ctx &ctx) {
     Res<Media::Image> image = Error::invalidInput("No image provided");
 
     if (args.len() > 0) {
-        auto url = try$(Sys::parseUrlOrPath(args[0]));
+        auto url = try$(Url::parseUrlOrPath(args[0]));
         image = Media::loadImage(url);
     }
 

src/clis/dtb-dump/main.cpp

@@ -10,7 +10,7 @@ Res<> entryPoint(Ctx &ctx) {
         return Error::invalidInput("Usage: dtb-dump <dtb-file>");
     }
 
-    auto url = try$(Sys::parseUrlOrPath(args[0]));
+    auto url = try$(Url::parseUrlOrPath(args[0]));
     auto dtbFile = try$(Sys::File::open(url));
     auto dtbMem = try$(Sys::mmap().read().map(dtbFile));
     auto dtb = try$(DeviceTree::Blob::load(dtbMem.bytes()));

src/clis/handover-dump/main.cpp

@@ -11,7 +11,7 @@ Res<> entryPoint(Ctx &ctx) {
         return Error::invalidInput("Usage: handover-dump <elf-file>");
     }
 
-    auto url = try$(Sys::parseUrlOrPath(args[0]));
+    auto url = try$(Url::parseUrlOrPath(args[0]));
     Sys::File kernelFile = try$(Sys::File::open(url));
     auto kernelMem = try$(Sys::mmap().read().map(kernelFile));
     Elf::Image kernelElf{kernelMem.bytes()};

src/clis/hashsum/main.cpp

@@ -6,7 +6,7 @@
 Res<> entryPoint(Ctx &ctx) {
     auto &args = useArgs(ctx);
 
-    auto url = try$(Sys::parseUrlOrPath(args[0]));
+    auto url = try$(Url::parseUrlOrPath(args[0]));
     auto file = try$(Sys::File::open(url));
     auto hash = try$(Hash::fromName(args[0]));
     auto digest = try$(Hash::digest(file, hash));

src/clis/ls/main.cpp

@@ -2,7 +2,7 @@
 #include <karm-sys/dir.h>
 
 Res<> entryPoint(Ctx &) {
-    auto url = try$(Sys::parseUrlOrPath("."));
+    auto url = try$(Url::parseUrlOrPath("."));
     auto dir = try$(Sys::Dir::open(url));
     for (auto const &entry : dir.entries()) {
         Sys::println(entry.name);

src/clis/ttf-dump/main.cpp

@@ -43,7 +43,7 @@ Res<> entryPoint(Ctx &ctx) {
         return Error::invalidInput("Usage: dtb-dump <dtb-file>");
     }
 
-    auto url = try$(Sys::parseUrlOrPath(args[0]));
+    auto url = try$(Url::parseUrlOrPath(args[0]));
     auto file = try$(Sys::File::open(url));
     auto map = try$(Sys::mmap().map(file));
     auto ttf = try$(Ttf::Font::load(map.bytes()));

src/impls/abi-sysv/abi.cpp

@@ -1,7 +1,6 @@
 // https://opensource.apple.com/source/libcppabi/libcppabi-14/src/cxa_guard.cxx
 
 #include <karm-base/lock.h>
-#include <karm-base/panic.h>
 
 extern "C" int __cxa_atexit(void (*)(void *), void *, void *) {
     return 0;

src/impls/abi-sysv/init.cpp

@@ -1,4 +1,3 @@
-#include <karm-base/panic.h>
 #include <karm-base/std.h>
 
 using InitFunc = void (*)();

src/impls/impl-efi/base.cpp

@@ -1,65 +1,11 @@
 #include <efi/base.h>
 #include <efi/spec.h>
-#include <karm-base/align.h>
-#include <karm-base/string.h>
-#include <karm-io/traits.h>
+
 
 #include <karm-base/_embed.h>
 
 namespace Karm::_Embed {
 
-struct DebugOut : public Io::TextWriterBase<> {
-    Res<usize> write(Bytes bytes) override {
-        usize writen{};
-        Array<u16, 129> buf{};
-        // Some space for the null terminator.
-        auto chunkSize = sizeOf(buf) - sizeof(u16);
-
-        while (not isEmpty(bytes)) {
-            usize toCopy = alignDown(sizeOf(bytes), sizeof(u16));
-
-            // We need to copy the bytes into to a u16 aligned buffer.
-            copy(sub(bytes, 0, toCopy), mutBytes(buf));
-
-            // If bytes.size() is not a multiple of sizeof(u16),
-            // then the last byte will be ignored.
-            buf[toCopy / sizeof(u16) + 1] = 0;
-
-            try$(Efi::st()->conOut->outputString(Efi::st()->conOut, buf.buf()));
-            writen += toCopy;
-
-            bytes = next(bytes, chunkSize);
-        }
-
-        return Ok(writen);
-    }
-};
-
-void debug(char const *buf) {
-    Efi::st()->conOut->outputString(Efi::st()->conOut, (u16 const *)L"DEBUG: ").unwrap();
-    DebugOut out{};
-    (void)out.writeStr(buf);
-    Efi::st()->conOut->outputString(Efi::st()->conOut, (u16 const *)EMBED_SYS_LINE_ENDING_L).unwrap();
-}
-
-[[noreturn]] void panic(char const *buf) {
-    Efi::st()->conOut->outputString(Efi::st()->conOut, (u16 const *)L"PANIC: ").unwrap();
-
-    DebugOut out{};
-    (void)out.writeStr(buf);
-
-    Efi::st()->conOut->outputString(Efi::st()->conOut, (u16 const *)EMBED_SYS_LINE_ENDING_L).unwrap();
-
-    (void)Efi::st()->runtime->resetSystem(
-        Efi::ResetType::RESET_SHUTDOWN,
-        Efi::ERR_UNSUPPORTED,
-        0,
-        nullptr);
-
-    while (1)
-        ;
-}
-
 void relaxe() {
 #if defined(__x86_64__)
     asm volatile("pause");

src/impls/impl-efi/main.cpp

@@ -0,0 +1,50 @@
+#include <efi/base.h>
+#include <karm-base/align.h>
+#include <karm-base/string.h>
+#include <karm-io/traits.h>
+
+struct DebugOut : public Io::TextWriterBase<> {
+    Res<usize> write(Bytes bytes) override {
+        usize writen{};
+        Array<u16, 129> buf{};
+        // Some space for the null terminator.
+        auto chunkSize = sizeOf(buf) - sizeof(u16);
+
+        while (not isEmpty(bytes)) {
+            usize toCopy = alignDown(sizeOf(bytes), sizeof(u16));
+
+            // We need to copy the bytes into to a u16 aligned buffer.
+            copy(sub(bytes, 0, toCopy), mutBytes(buf));
+
+            // If bytes.size() is not a multiple of sizeof(u16),
+            // then the last byte will be ignored.
+            buf[toCopy / sizeof(u16) + 1] = 0;
+
+            try$(Efi::st()->conOut->outputString(Efi::st()->conOut, buf.buf()));
+            writen += toCopy;
+
+            bytes = next(bytes, chunkSize);
+        }
+
+        return Ok(writen);
+    }
+};
+
+void __panicHandler(Karm::PanicKind kind, char const *msg) {
+    Efi::st()->conOut->outputString(Efi::st()->conOut, kind == Karm::PanicKind::PANIC ? (u16 const *)L"PANIC: " : (u16 const *)L"DEBUG: ").unwrap();
+
+    DebugOut out{};
+    (void)out.writeStr(msg);
+    Efi::st()->conOut->outputString(Efi::st()->conOut, (u16 const *)EMBED_SYS_LINE_ENDING_L).unwrap();
+
+    if (kind == Karm::PanicKind::PANIC) {
+        (void)Efi::st()->runtime->resetSystem(
+            Efi::ResetType::RESET_SHUTDOWN,
+            Efi::ERR_UNSUPPORTED,
+            0,
+            nullptr);
+
+        while (1)
+            ;
+    }
+}

src/impls/impl-efi/main.h

@@ -6,11 +6,12 @@
 #include <karm-main/base.h>
 #include <karm-sys/chan.h>
 
-#ifdef EMBED_EFI_MAIN_IMPL
+void __panicHandler(Karm::PanicKind kind, char const *msg);
 
 extern "C" Efi::Status efi_main(Efi::Handle handle, Efi::SystemTable *st) {
     Efi::init(handle, st);
     Abi::Ms::init();
+    Karm::registerPanicHandler(__panicHandler);
 
     (void)Efi::st()->conOut->clearScreen(Efi::st()->conOut);
 
@@ -29,5 +30,3 @@ extern "C" Efi::Status efi_main(Efi::Handle handle, Efi::SystemTable *st) {
 
     return EFI_SUCCESS;
 }
-
-#endif // EMBED_EFI_MAIN_IMPL

src/impls/impl-efi/manifest.json

@@ -14,9 +14,8 @@
         "json-spec"
     ],
     "provides": [
-        "karm-base-impl",
         "karm-logger-impl",
         "karm-sys-impl",
         "karm-ui-impl"
     ]
-}
+}

src/impls/impl-efi/sys.cpp

@@ -140,7 +140,7 @@ Res<Strong<Sys::Fd>> createErr() {
 
 static Opt<Json::Value> _index = NONE;
 
-static Res<Sys::Path> resolve(Sys::Url url) {
+static Res<Url::Path> resolve(Url::Url url) {
     if (url.scheme == "file") {
         return Ok(url.path);
     }
@@ -184,9 +184,9 @@ static Res<Sys::Path> resolve(Sys::Url url) {
 
         auto refStr = ref.asStr();
 
-        auto refUrl = Sys::Url::parse(refStr);
+        auto refUrl = Url::Url::parse(refStr);
 
-        Sys::Path resolved = try$(resolve(refUrl));
+        Url::Path resolved = try$(resolve(refUrl));
         logInfo("resolved to: {}", resolved);
         return Ok(resolved);
     } else {
@@ -195,7 +195,7 @@ static Res<Sys::Path> resolve(Sys::Url url) {
     }
 }
 
-Res<Strong<Sys::Fd>> openFile(Sys::Url url) {
+Res<Strong<Sys::Fd>> openFile(Url::Url url) {
     static Efi::SimpleFileSystemProtocol *fileSystem = nullptr;
     if (not fileSystem) {
         fileSystem = try$(Efi::openProtocol<Efi::SimpleFileSystemProtocol>(Efi::li()->deviceHandle));
@@ -221,11 +221,11 @@ Res<Strong<Sys::Fd>> openFile(Sys::Url url) {
     return Ok(makeStrong<FileProto>(file));
 }
 
-Res<Vec<Sys::DirEntry>> readDir(Sys::Url) {
+Res<Vec<Sys::DirEntry>> readDir(Url::Url) {
     return Error::notImplemented();
 }
 
-Res<Strong<Sys::Fd>> createFile(Sys::Url) {
+Res<Strong<Sys::Fd>> createFile(Url::Url) {
     return Error::notImplemented();
 }
 

src/impls/impl-hjert/manifest.json

@@ -13,7 +13,6 @@
         "libheap"
     ],
     "provides": [
-        "karm-base-impl",
         "karm-logger-impl"
     ]
-}
+}

src/impls/impl-posix/base.cpp

@@ -3,15 +3,6 @@
 
 namespace Karm::_Embed {
 
-void debug(char const *buf) {
-    fprintf(stderr, "DEBUG: %s\n", buf);
-}
-
-[[noreturn]] void panic(char const *buf) {
-    fprintf(stderr, "PANIC: %s\n", buf);
-    abort();
-}
-
 void relaxe() {
 #if defined(__x86_64__)
     asm volatile("pause");

src/impls/impl-posix/main.cpp

@@ -0,0 +1,12 @@
+#include <karm-panic/panic.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void __panicHandler(Karm::PanicKind kind, char const *msg) {
+    fprintf(stderr, "%s: %s\n", kind == Karm::PanicKind::PANIC ? "panic" : "debug", msg);
+
+    if (kind == Karm::PanicKind::PANIC) {
+        abort();
+        __builtin_unreachable();
+    }
+}

src/impls/impl-posix/main.h

@@ -3,7 +3,11 @@
 #include <karm-main/base.h>
 #include <karm-sys/chan.h>
 
+void __panicHandler(Karm::PanicKind kind, char const *msg);
+
 int main(int argc, char const **argv) {
+    Karm::registerPanicHandler(__panicHandler);
+
     Ctx ctx;
     ctx.add<ArgsHook>(argc, argv);
     Res<> code = entryPoint(ctx);

src/impls/impl-posix/manifest.json

@@ -10,9 +10,8 @@
     },
     "requires": [],
     "provides": [
-        "karm-base-impl",
         "karm-logger-impl",
         "karm-sys-impl",
         "karm-async-impl"
     ]
-}
+}