wip

Author: sleepy-monax

src/kernel/hjert-api/api.h

@@ -90,6 +90,12 @@ struct Domain : public Object {
     Res<O> create(Args &&...args) {
         return Hj::create<O>(_cap, std::forward<Args>(args)...);
     }
+
+    Res<Cap> attach(Object &obj) {
+        Cap out;
+        try$(_dup(_cap, &out, obj));
+        return Ok(out);
+    }
 };
 
 struct Task : public Object {

src/kernel/hjert-api/syscalls.h

@@ -8,15 +8,15 @@ Res<> _now(TimeStamp *ts);
 
 Res<> _log(char const *msg, usize len);
 
-Res<> _create(Cap dest, Cap *cap, Props const *props);
+Res<> _create(Cap dest, Cap *out, Props const *props);
 
 Res<> _label(Cap cap, char const *label, usize len);
 
 Res<> _drop(Cap cap);
 
 Res<> _pledge(Cap cap, Flags<Pledge> pledges);
 
-Res<> _dup(Cap node, Cap *dst, Cap src);
+Res<> _dup(Cap dest, Cap *out, Cap cap);
 
 Res<> _start(Cap cap, usize ip, usize sp, Args const *args);
 

src/kernel/hjert-api/types.h

@@ -7,7 +7,6 @@
 namespace Hj {
 
 #define FOREACH_TYPE(TYPE) \
-    TYPE(NONE)             \
     TYPE(DOMAIN)           \
     TYPE(TASK)             \
     TYPE(SPACE)            \
@@ -167,23 +166,23 @@ struct Msg {
     constexpr Msg(Arg label)
         : label(label) {}
 
-    void store(usize idx, Arg arg) {
+    void storeArg(usize idx, Arg arg) {
         flags &= ~(1 << idx);
         args[idx] = arg;
     }
 
-    void store(usize idx, Cap cap) {
-        flags |= 1 << idx;
-        args[idx] = cap.raw();
-    }
-
-    Res<Arg> loadVal(usize idx) const {
+    Res<Arg> loadArg(usize idx) const {
         if (not(flags & (1 << idx))) {
             return Ok(args[idx]);
         }
         return Error::invalidData("not-a-value");
     }
 
+    void storeCap(usize idx, Cap cap) {
+        flags |= 1 << idx;
+        args[idx] = cap.raw();
+    }
+
     Res<Cap> loadCap(usize idx) const {
         if (flags & (1 << idx)) {
             return Ok(Cap(args[idx]));
@@ -266,7 +265,6 @@ using MapFlags = Hal::VmmFlags;
 
 struct DomainProps {
     static constexpr Type TYPE = Type::DOMAIN;
-    usize size = 4096;
 };
 
 struct TaskProps {
@@ -330,4 +328,16 @@ struct Props : public _Props {
     }
 };
 
+struct Mapper {
+    usize _bits;
+
+    usize len() {
+        return 1 << _bits;
+    }
+
+    usize mask() {
+        return len() - 1;
+    }
+};
+
 } // namespace Hj

src/kernel/hjert-core/domain.cpp

@@ -11,8 +11,11 @@ Res<Hj::Cap> Domain::add(Hj::Cap dest, Strong<Object> obj) {
 
     auto c = dest.raw();
 
-    if (c != 0)
-        return try$(get<Domain>(c & MASK))->add(c >> SHIFT, obj);
+    if (c != 0) {
+        auto subDomain = try$(_getUnlock<Domain>(c & MASK));
+        auto newCap = try$(subDomain->add(c >> SHIFT, obj));
+        return Ok(Hj::Cap{newCap._raw | (c & ~MASK)});
+    }
 
     for (c = 1; c < _slots.len(); c++) {
         if (not _slots[c]) {
@@ -24,27 +27,34 @@ Res<Hj::Cap> Domain::add(Hj::Cap dest, Strong<Object> obj) {
     return Error::invalidHandle("no free slots");
 }
 
-Res<Strong<Object>> Domain::get(Hj::Cap cap) {
-    ObjectLockScope scope(*this);
-
+Res<Strong<Object>> Domain::_getUnlock(Hj::Cap cap) {
     auto c = cap.raw();
 
-    if (c & ~MASK)
-        return try$(get<Domain>(c & MASK))->get(c >> SHIFT);
+    if (c & ~MASK) {
+        auto subDomain = try$(_getUnlock<Domain>(c & MASK));
+        return subDomain->get(c >> SHIFT);
+    }
 
     if (not _slots[c])
         return Error::invalidHandle("slot is empty");
 
     return Ok(*_slots[c]);
 }
 
+Res<Strong<Object>> Domain::get(Hj::Cap cap) {
+    ObjectLockScope scope(*this);
+    return _getUnlock(cap);
+}
+
 Res<> Domain::drop(Hj::Cap cap) {
     ObjectLockScope scope(*this);
 
     auto c = cap.raw();
 
-    if (c & ~MASK)
-        return try$(get<Domain>(c & MASK))->drop(c >> SHIFT);
+    if (c & ~MASK) {
+        auto subDomain = try$(_getUnlock<Domain>(c & MASK));
+        return subDomain->drop(c >> SHIFT);
+    }
 
     if (not _slots[c])
         return Error::invalidHandle("slot is empty");

src/kernel/hjert-core/domain.h

@@ -8,7 +8,7 @@ struct Domain : public BaseObject<Domain, Hj::Type::DOMAIN> {
     using Slot = Opt<Strong<Object>>;
 
     static constexpr usize SHIFT = 11;
-    static constexpr usize LEN = 2 << 11;
+    static constexpr usize LEN = 1 << 11;
     static constexpr usize MASK = LEN - 1;
 
     Array<Slot, LEN> _slots;
@@ -17,16 +17,24 @@ struct Domain : public BaseObject<Domain, Hj::Type::DOMAIN> {
 
     Res<Hj::Cap> add(Hj::Cap dest, Strong<Object> obj);
 
+    Res<Strong<Object>> _getUnlock(Hj::Cap cap);
+
     Res<Strong<Object>> get(Hj::Cap cap);
 
     template <typename T>
-    Res<Strong<T>> get(Hj::Cap cap) {
-        auto obj = try$(get(cap));
+    Res<Strong<T>> _getUnlock(Hj::Cap cap) {
+        auto obj = try$(_getUnlock(cap));
         if (not obj.is<T>())
             return Error::invalidHandle("type missmatch");
         return Ok(try$(obj.cast<T>()));
     }
 
+    template <typename T>
+    Res<Strong<T>> get(Hj::Cap cap) {
+        ObjectLockScope scope(*this);
+        return _getUnlock<T>(cap);
+    }
+
     Res<> drop(Hj::Cap cap);
 };
 

src/kernel/hjert-core/syscalls.cpp

@@ -37,7 +37,7 @@ Res<> doLog(Task &self, UserSlice<char const> msg) {
     });
 }
 
-Res<> doCreate(Task &self, Hj::Cap dest, User<Hj::Cap> cap, User<Hj::Props> p) {
+Res<> doCreate(Task &self, Hj::Cap dest, User<Hj::Cap> out, User<Hj::Props> p) {
     auto props = try$(p.load(self.space()));
     auto obj = try$(props.visit(
         Visitor{
@@ -95,7 +95,7 @@ Res<> doCreate(Task &self, Hj::Cap dest, User<Hj::Cap> cap, User<Hj::Props> p) {
             },
         }));
 
-    return cap.store(self.space(), try$(self.domain().add(dest, obj)));
+    return out.store(self.space(), try$(self.domain().add(dest, obj)));
 }
 
 Res<> doLabel(Task &self, Hj::Cap cap, UserSlice<char const> label) {
@@ -122,12 +122,12 @@ Res<> doPledge(Task &self, Hj::Cap cap, Flags<Hj::Pledge> pledges) {
     return obj->pledge(pledges);
 }
 
-Res<> doDup(Task &self, Hj::Cap node, User<Hj::Cap> dst, Hj::Cap src) {
-    if (src.isRoot())
+Res<> doDup(Task &self, Hj::Cap dest, User<Hj::Cap> out, Hj::Cap cap) {
+    if (cap.isRoot())
         return Error::invalidHandle("cannot duplicate root");
 
-    auto obj = try$(self.domain().get(src));
-    return dst.store(self.space(), try$(self.domain().add(node, obj)));
+    auto obj = try$(self.domain().get(cap));
+    return out.store(self.space(), try$(self.domain().add(dest, obj)));
 }
 
 Res<> doStart(Task &self, Hj::Cap cap, usize ip, usize sp, User<Hj::Args const> args) {

src/libs/karm-base/macros.h

@@ -18,6 +18,8 @@ namespace Karm {
 
 #define ALWAYS_INLINE [[gnu::always_inline]]
 
+#define _ var$(placeholder)
+
 /* --- Utilities ------------------------------------------------------------ */
 
 template <typename T, typename U>