Skip to content

Commit 8d07094

Browse files
sleepy-monaxsleepy-monax
committed
meta: Bump karm.
1 parent c889764 commit 8d07094

9 files changed

Lines changed: 28 additions & 21 deletions

File tree

‎src/kernel/hjert-core/context.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct Context {
2727
};
2828

2929
struct Stack {
30-
static constexpr usize DEFAULT_SIZE = kib(64);
30+
static constexpr usize DEFAULT_SIZE = 64_KiB;
3131

3232
static Res<Stack> create();
3333

‎src/kernel/hjert-core/entry.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Res<> enterUserspace(Handover::Payload& payload) {
8383
auto handoverRange = try$(space->map({}, handoverVmo, 0, Hj::MapFlags::READ));
8484

8585
logInfo("entry: mapping stack...");
86-
auto stackVmo = try$(Vmo::alloc(kib(64), Hj::VmoFlags::UPPER));
86+
auto stackVmo = try$(Vmo::alloc(64_KiB, Hj::VmoFlags::UPPER));
8787
stackVmo->label("stack");
8888
auto stackRange = try$(space->map({}, stackVmo, 0, {Hj::MapFlags::READ, Hj::MapFlags::WRITE}));
8989
logInfo("entry: stack: {x}-{x}", stackRange.start, stackRange.end());

‎src/kernel/hjert-core/mem.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct Pmm : Hal::Pmm {
6060
logInfo(" mem: physical memory layout:");
6161
_bits.visit([this](auto range) {
6262
auto prange = bits2Pmm(range);
63-
logInfo(" {x} - {x} ({}kib)", prange.start, prange.end(), prange.size / kib(1));
63+
logInfo(" {x} - {x} ({}kib)", prange.start, prange.end(), prange.size / 1_KiB);
6464
});
6565
}
6666

@@ -167,7 +167,7 @@ Res<> initMem(Handover::Payload& payload) {
167167
logInfo("mem: marking free memory as free...");
168168
for (auto& record : payload) {
169169
if (record.tag == Handover::Tag::FREE) {
170-
logInfo("mem: free memory at {p} {p} ({}kib)", record.start, record.start + record.size, record.size / kib(1));
170+
logInfo("mem: free memory at {p} {p} ({}kib)", record.start, record.start + record.size, record.size / 1_KiB);
171171
try$(pmm().free({record.start, record.size}));
172172
}
173173
}
@@ -188,11 +188,11 @@ Res<> initMem(Handover::Payload& payload) {
188188
Arch::globalVmm().mapRange(
189189
{
190190
Handover::KERNEL_BASE + Hal::PAGE_SIZE,
191-
gib(2) - Hal::PAGE_SIZE - Hal::PAGE_SIZE,
191+
2_GiB - Hal::PAGE_SIZE - Hal::PAGE_SIZE,
192192
},
193193
{
194194
Hal::PAGE_SIZE,
195-
gib(2) - Hal::PAGE_SIZE - Hal::PAGE_SIZE,
195+
2_GiB - Hal::PAGE_SIZE - Hal::PAGE_SIZE,
196196
},
197197
{Hal::Vmm::READ, Hal::Vmm::WRITE}
198198
)
@@ -203,11 +203,11 @@ Res<> initMem(Handover::Payload& payload) {
203203
Arch::globalVmm().mapRange(
204204
{
205205
Handover::UPPER_HALF + Hal::PAGE_SIZE,
206-
gib(4) - Hal::PAGE_SIZE,
206+
4_GiB - Hal::PAGE_SIZE,
207207
},
208208
{
209209
Hal::PAGE_SIZE,
210-
gib(4) - Hal::PAGE_SIZE,
210+
4_GiB - Hal::PAGE_SIZE,
211211
},
212212
{Hal::Vmm::READ, Hal::Vmm::WRITE}
213213
)

‎src/kernel/hjert-core/syscalls.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Res<> doCreate(Task& self, Hj::Cap dest, User<Hj::Cap> out, User<Hj::Props> p) {
8787
return Ok(try$(Vmo::makeDma({props.phys, props.len})));
8888
}
8989

90-
if (props.len > gib(2)) {
90+
if (props.len > 2_GiB) {
9191
return Error::invalidInput("Vmo size too large");
9292
}
9393

‎src/kernel/hjert-core/task.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ enum struct State {
2020
};
2121

2222
struct Task : BaseObject<Task, Hj::Type::TASK> {
23-
2423
Mode _mode;
2524
Stack _stack;
2625
Opt<Box<Context>> _ctx;

‎src/kernel/opstart/loader.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void enterKernel(usize entry, usize payload, usize stack, usize vmm);
1515

1616
Res<> loadEntry(Entry const& entry) {
1717
logInfo("opstart: preparing payload...");
18-
auto payloadMem = try$(Sys::mutMmap(NONE, {.size = kib(16)}));
18+
auto payloadMem = try$(Sys::mutMmap(NONE, {.size = 16_KiB}));
1919
logInfo("opstart: payload at vaddr: {p} paddr: {p}", payloadMem.vaddr(), payloadMem.paddr());
2020
Handover::Builder payload{payloadMem.mutBytes()};
2121

@@ -98,15 +98,15 @@ Res<> loadEntry(Entry const& entry) {
9898

9999
logInfo("opstart: mapping kernel...");
100100
try$(vmm->mapRange(
101-
{Handover::KERNEL_BASE + Hal::PAGE_SIZE, gib(2) - Hal::PAGE_SIZE - Hal::PAGE_SIZE},
102-
{Hal::PAGE_SIZE, gib(2) - Hal::PAGE_SIZE - Hal::PAGE_SIZE},
101+
{Handover::KERNEL_BASE + Hal::PAGE_SIZE, 2_GiB - Hal::PAGE_SIZE - Hal::PAGE_SIZE},
102+
{Hal::PAGE_SIZE, 2_GiB - Hal::PAGE_SIZE - Hal::PAGE_SIZE},
103103
{Hal::Vmm::READ, Hal::Vmm::WRITE}
104104
));
105105

106106
logInfo("opstart: mapping upper half...");
107107
try$(vmm->mapRange(
108-
{Handover::UPPER_HALF + Hal::PAGE_SIZE, gib(4) - Hal::PAGE_SIZE},
109-
{Hal::PAGE_SIZE, gib(4) - Hal::PAGE_SIZE},
108+
{Handover::UPPER_HALF + Hal::PAGE_SIZE, 4_GiB - Hal::PAGE_SIZE},
109+
{Hal::PAGE_SIZE, 4_GiB - Hal::PAGE_SIZE},
110110
{Hal::Vmm::READ, Hal::Vmm::WRITE}
111111
));
112112

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ struct ConOut : Fd {
6060
return Error::notImplemented();
6161
}
6262

63+
Res<> truncate(usize) override {
64+
return Error::notImplemented();
65+
}
66+
6367
Res<> flush() override {
6468
return Ok();
6569
}
@@ -142,6 +146,10 @@ struct FileProto : Fd {
142146
return Ok(pos);
143147
}
144148

149+
Res<> truncate(usize) override {
150+
return Error::notImplemented();
151+
}
152+
145153
Res<> flush() override {
146154
try$(_proto->flush(_proto));
147155
return Ok();
@@ -215,7 +223,7 @@ Res<Rc<Fd>> listenUdp(SocketAddr) {
215223
return Error::notImplemented();
216224
}
217225

218-
Res<Rc<Fd>> connectIpc(Ref::Url){
226+
Res<Rc<Fd>> connectIpc(Ref::Url) {
219227
return Error::notImplemented();
220228
}
221229

@@ -395,7 +403,7 @@ Res<Rc<Pid>> spawn(Command const&) {
395403
return Error::notImplemented();
396404
}
397405

398-
Res<Tuple<Rc<Pid>, Rc<Fd>>> spawnPty(Command const& ) {
406+
Res<Tuple<Rc<Pid>, Rc<Fd>>> spawnPty(Command const&) {
399407
return Error::notImplemented();
400408
}
401409

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ export struct DuplexFd : NullFd {
6363
Hj::Channel _out;
6464

6565
static Res<Rc<DuplexFd>> create(Str label) {
66-
auto in = try$(Hj::Channel::create(Hj::Domain::self(), kib(16), 16));
66+
auto in = try$(Hj::Channel::create(Hj::Domain::self(), 16_KiB, 16));
6767
try$(in.label(Io::format("{}-in", label)));
6868

69-
auto out = try$(Hj::Channel::create(Hj::Domain::self(), kib(16), 16));
69+
auto out = try$(Hj::Channel::create(Hj::Domain::self(), 16_KiB, 16));
7070
try$(out.label(Io::format("{}-out", label)));
7171

7272
return Ok(makeRc<DuplexFd>(std::move(in), std::move(out)));
@@ -107,7 +107,7 @@ export struct PipeFd : NullFd {
107107
Hj::Pipe _pipe;
108108

109109
static Res<Rc<PipeFd>> create() {
110-
auto pipe = try$(Hj::Pipe::create(Hj::ROOT, kib(16)));
110+
auto pipe = try$(Hj::Pipe::create(Hj::ROOT, 16_KiB));
111111
return Ok(makeRc<PipeFd>(std::move(pipe)));
112112
}
113113

‎src/srvs/strata-cm/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static Res<Hj::Task> loadElf(Sys::Context& ctx, String id, Rc<Sys::Skift::Duplex
5959
}
6060

6161
logInfoIf(DEBUG_ELF, "mapping the stack...");
62-
auto stackVmo = try$(Hj::Vmo::create(Hj::ROOT, 0, kib(64), Hj::VmoFlags::UPPER));
62+
auto stackVmo = try$(Hj::Vmo::create(Hj::ROOT, 0, 64_KiB, Hj::VmoFlags::UPPER));
6363
try$(stackVmo.label("stack"));
6464
auto stackRange = try$(elfSpace.map(0, stackVmo, 0, 0, {Hj::MapFlags::READ, Hj::MapFlags::WRITE}));
6565

0 commit comments

Comments
 (0)