karm-sys: Implemented enought api to get the browser working again.

Author: sleepy-monax

src/kernel/hjert-core/mem.cpp

@@ -1,9 +1,10 @@
 import Karm.Core;
 import Karm.Logger;
 
-#include "arch.h"
 #include "mem.h"
 
+#include "arch.h"
+
 namespace Hjert::Core {
 
 struct Pmm : Hal::Pmm {
@@ -44,7 +45,8 @@ struct Pmm : Hal::Pmm {
         }
 
         LockScope scope(_lock);
-        try$(prange.ensureAligned(Hal::PAGE_SIZE));
+        try$(prange.ensureAligned(Hal::PAGE_SIZE)
+                 .okOr(Error::invalidInput("range is not page aligned")));
         _bits.set(pmm2Bits(prange), false);
         return Ok();
     }
@@ -122,10 +124,10 @@ Hal::PmmRange _findBitmapSpace(Handover::Payload& payload, usize bitmapSize) {
             continue;
 
         if (record.start == 0 and (record.size >= bitmapSize + Hal::PAGE_SIZE))
-            return {static_cast<usize>(record.start) + Hal::PAGE_SIZE, bitmapSize};
+            return {record.start + Hal::PAGE_SIZE, bitmapSize};
 
         if (record.size >= bitmapSize)
-            return {static_cast<usize>(record.start), bitmapSize};
+            return {record.start, bitmapSize};
     }
 
     logFatal("mem: no usable memory for bitmap");

src/kernel/hjert-core/vmo.cpp

@@ -20,7 +20,8 @@ Res<Arc<Vmo>> Vmo::makeDma(Hal::DmaRange prange) {
         return Error::invalidInput("size is zero");
     }
 
-    try$(prange.ensureAligned(Hal::PAGE_SIZE));
+    try$(prange.ensureAligned(Hal::PAGE_SIZE)
+             .okOr(Error::invalidInput("range is not page aligned")));
     return Ok(makeArc<Vmo>(prange));
 }
 

src/libs/karm-sys/efi/sys.cpp

@@ -215,6 +215,10 @@ Res<Rc<Fd>> listenUdp(SocketAddr) {
     return Error::notImplemented();
 }
 
+Res<Rc<Fd>> connectIpc(Ref::Url){
+    return Error::notImplemented();
+}
+
 Res<Rc<Fd>> listenIpc(Ref::Url) {
     return Error::notImplemented();
 }
@@ -391,6 +395,10 @@ Res<Rc<Pid>> spawn(Command const&) {
     return Error::notImplemented();
 }
 
+Res<Tuple<Rc<Pid>, Rc<Fd>>> spawnPty(Command const& ) {
+    return Error::notImplemented();
+}
+
 // MARK: Process Managment -----------------------------------------------------
 
 Res<> sleep(Duration) {

src/libs/karm-sys/skift/async.cpp

@@ -39,6 +39,8 @@ struct SkiftSched : Sys::Sched {
             co_trya$(waitFor(chan.cap(), Hj::Sigs::READABLE, Hj::Sigs::NONE));
             static_assert(sizeof(Handle) == sizeof(Hj::Cap) and alignof(Handle) == alignof(Hj::Cap));
             co_return chan.read(buf);
+        } else if (auto vmo = fd.is<Skift::VmoFd>()) {
+            co_return vmo->read(buf);
         }
 
         co_return Error::notImplemented("unsupported fd type");

src/libs/karm-sys/skift/bootfs.cpp

@@ -6,6 +6,8 @@ module;
 
 export module Karm.Sys.Skift:bootfs;
 
+import Karm.Logger;
+
 namespace Karm::Sys::Skift {
 
 export struct Bootfs {
@@ -55,6 +57,7 @@ export struct Bootfs {
         if (not fileDirent)
             return Error::notFound("elf not found");
 
+        logDebug("opening {}: {:x} {:x}", path, _physStart + fileDirent->offset, alignUp(fileDirent->length, Sys::pageSize()));
         auto fileVmo = try$(
             Hj::Vmo::create(
                 Hj::ROOT,

src/libs/karm-sys/skift/fd.cpp

@@ -21,6 +21,8 @@ export enum struct FdType {
 
 export struct VmoFd : NullFd {
     Hj::Vmo _vmo;
+    Opt<Hj::Mapped> _mapped;
+    usize _off = 0;
 
     Hj::Vmo& vmo() {
         return _vmo;
@@ -35,6 +37,19 @@ export struct VmoFd : NullFd {
         try$(scope.serializeUnit({.kind = Serde::Type::OBJECT_ITEM}, _vmo));
         return scope.end();
     }
+
+    Hj::Mapped& _ensureMapped() {
+        if (not _mapped) {
+            _mapped = Hj::map(_vmo, {Hj::MapFlags::READ}).take();
+        }
+        return _mapped.unwrap();
+    }
+
+    Res<usize> read(MutBytes buf) override {
+        auto read = copy(next(_ensureMapped().bytes(), _off), buf);
+        _off += read;
+        return Ok(read);
+    }
 };
 
 export struct DuplexFd : NullFd {

src/libs/karm-sys/skift/sys.cpp

@@ -56,12 +56,12 @@ Res<Rc<Fd>> openFile(Ref::Url const& url) {
     return Ok(makeRc<Skift::VmoFd>(std::move(vmo)));
 }
 
-Res<Rc<Fd>> createFile(Ref::Url const&) {
-    return Error::notImplemented();
+Res<Rc<Fd>> createFile(Ref::Url const& url) {
+    return openFile(url);
 }
 
-Res<Rc<Fd>> openOrCreateFile(Ref::Url const&) {
-    return Error::notImplemented();
+Res<Rc<Fd>> openOrCreateFile(Ref::Url const& url) {
+    return openFile(url);
 }
 
 Res<Pair<Rc<Fd>, Rc<Fd>>> createPipe() {