meta: Update karm.

Author: sleepy-monax

src/impls/impl-efi/crypto.cpp

@@ -0,0 +1,11 @@
+module Karm.Crypto;
+
+import Karm.Core;
+
+namespace Karm::Crypto::_Embed {
+
+Res<> entropy(MutBytes) {
+    notImplemented();
+}
+
+} // namespace Karm::Crypto::_Embed

src/impls/impl-efi/manifest.json

@@ -18,6 +18,7 @@
         "karm-sys-impl",
         "karm-sys-async-impl",
         "karm-sys-sandbox-impl",
+        "karm-crypto-impl",
         "karm-ui-impl",
         "karm-app-impl"
     ]

src/impls/impl-efi/sys.cpp

@@ -22,7 +22,7 @@ static SystemTime fromEfi(Efi::Time time) {
     return dt.toInstant();
 }
 
-struct ConOut : public Fd {
+struct ConOut : Fd {
     Efi::SimpleTextOutputProtocol* _proto;
 
     ConOut(Efi::SimpleTextOutputProtocol* proto) : _proto(proto) {}
@@ -85,7 +85,7 @@ struct ConOut : public Fd {
     }
 };
 
-struct FileProto : public Fd {
+struct FileProto : Fd {
     Efi::FileProtocol* _proto = nullptr;
 
     FileProto(Efi::FileProtocol* proto) : _proto(proto) {}
@@ -357,6 +357,10 @@ Res<Stat> stat(Ref::Url const&) {
     return Error::notImplemented();
 }
 
+usize pageSize() {
+    return Hal::PAGE_SIZE;
+}
+
 // MARK: Time ------------------------------------------------------------------
 
 SystemTime now() {

src/impls/impl-skift/crypto.cpp

@@ -0,0 +1,11 @@
+module Karm.Crypto;
+
+import Karm.Core;
+
+namespace Karm::Crypto::_Embed {
+
+Res<> entropy(MutBytes) {
+    notImplemented();
+}
+
+} // namespace Karm::Crypto::_Embed

src/impls/impl-skift/manifest.json

@@ -18,6 +18,7 @@
         "karm-app-impl",
         "karm-sys-impl",
         "karm-sys-async-impl",
-        "karm-sys-sandbox-impl"
+        "karm-sys-sandbox-impl",
+        "karm-crypto-impl"
     ]
 }

src/impls/impl-skift/sys.cpp

@@ -149,6 +149,10 @@ Res<> memFlush(void*, usize) {
     return Error::notImplemented();
 }
 
+usize pageSize() {
+    return Hal::PAGE_SIZE;
+}
+
 // MARK: System Informations ---------------------------------------------------
 
 Res<> populate(SysInfo&) {

src/kernel/opstart/loader.cpp

@@ -15,7 +15,7 @@ void enterKernel(usize entry, usize payload, usize stack, usize vmm);
 
 Res<> loadEntry(Entry const& entry) {
     logInfo("opstart: preparing payload...");
-    auto payloadMem = try$(Sys::mmap().read().size(kib(16)).mapMut());
+    auto payloadMem = try$(Sys::mutMmap(NONE, {.size = kib(16)}));
     logInfo("opstart: payload at vaddr: {p} paddr: {p}", payloadMem.vaddr(), payloadMem.paddr());
     Handover::Builder payload{payloadMem.mutBytes()};
 
@@ -24,7 +24,7 @@ Res<> loadEntry(Entry const& entry) {
 
     logInfo("opstart: loading kernel file...");
     auto kernelFile = try$(Sys::File::open(entry.kernel.url));
-    auto kernelMem = try$(Sys::mmap().map(kernelFile));
+    auto kernelMem = try$(Sys::mmap(kernelFile));
     Elf::Image image{kernelMem.bytes()};
     payload.add(Handover::FILE, 0, kernelMem.prange());
     logInfo("opstart: kernel at vaddr: {p} paddr: {p}", kernelMem.vaddr(), kernelMem.paddr());
@@ -35,7 +35,7 @@ Res<> loadEntry(Entry const& entry) {
     }
 
     logInfo("opstart: setting up stack...");
-    auto stackMap = try$(Sys::mmap().stack().size(Hal::PAGE_SIZE * 16).mapMut());
+    auto stackMap = try$(Sys::mutMmap(NONE, {.options = Sys::MmapOption::STACK, .size = Hal::PAGE_SIZE * 16}));
     payload.add(Handover::STACK, 0, stackMap.prange());
     logInfo("opstart: stack at vaddr: {p} paddr: {p}", stackMap.vaddr(), stackMap.paddr());
 
@@ -61,7 +61,7 @@ Res<> loadEntry(Entry const& entry) {
         logInfo("opstart: loading blob: {}", blob.url);
 
         auto blobFile = try$(Sys::File::open(blob.url));
-        auto blobMem = try$(Sys::mmap().map(blobFile));
+        auto blobMem = try$(Sys::mmap(blobFile));
         auto blobRange = blobMem.prange();
         auto propStr = try$(Json::unparse(blob.props));
 

src/specs/handover/cli/main.cpp

@@ -11,7 +11,7 @@ Async::Task<> entryPointAsync(Sys::Context& ctx) {
 
     auto url = Ref::parseUrlOrPath(args[0], co_try$(Sys::pwd()));
     auto kernelFile = co_try$(Sys::File::open(url));
-    auto kernelMem = co_try$(Sys::mmap().read().map(kernelFile));
+    auto kernelMem = co_try$(Sys::mmap(kernelFile, {.options = Sys::MmapOption::READ}));
     Elf::Image kernelElf{kernelMem.bytes()};
 
     if (not kernelElf.valid())