From 29bc4daf9e6bc91fd7add0c80fd8d614823105cb Mon Sep 17 00:00:00 2001 From: Quinten Kock Date: Wed, 23 Dec 2020 04:09:38 +0100 Subject: [PATCH] set up 1mb of static kernel-allocable memory --- kernel/src/allocator/kalloc.zig | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/kernel/src/allocator/kalloc.zig b/kernel/src/allocator/kalloc.zig index 3b894b5..c72ee54 100644 --- a/kernel/src/allocator/kalloc.zig +++ b/kernel/src/allocator/kalloc.zig @@ -1,19 +1,5 @@ const std = @import("std"); -var GlobAlloc: ?std.heap.FixedBufferAllocator = null; - -pub export fn kalloc_init(start: usize, len: usize) void { - // const aligned = std.mem.alignForward(start, 8); - const ptr = @intToPtr([*]u8, start); - const buf = ptr[0..len]; - GlobAlloc = std.heap.FixedBufferAllocator.init(buf); -} - -// export fn kalloc(bytes: usize, a: usize) void { -// var a = GlobAlloc.?.allocator.allocAdvanced(u8, a, bytes, std.mem.Allocator.Exact.at_least); -// return a catch unreachable; -// } - -pub fn kallocNop() void { - std.log.err("calling kallocNop", .{}); -} \ No newline at end of file +var buf: [1024*1024]u8 = undefined; +pub var KAlloc = std.heap.FixedBufferAllocator.init(&buf); +// pub var KAlloc = std.heap.GeneralPurposeAllocator(.{.thread_safe=false}){.backing_allocator = &GlobAlloc.allocator};