From cbe2690cd5d1b290633c466ebb4df7b64b09b037 Mon Sep 17 00:00:00 2001
From: Danny Holman <dholman@gymli.org>
Date: Thu, 28 Mar 2024 21:30:12 -0500
Subject: arch: i386: kernel: add mostly finished PFA and paging system

Add the mostly finished physical memory allocator and expose its
functions to the paging system.

Signed-off-by: Danny Holman <dholman@gymli.org>
---
 kernel/init.c |  4 +++-
 kernel/mem.c  | 15 ---------------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 kernel/mem.c

(limited to 'kernel')

diff --git a/kernel/init.c b/kernel/init.c
index 86567a4..8512988 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -1,5 +1,5 @@
 #include <kernel/io.h>
-#include <kernel/mem.h>
+#include <kernel/kmalloc.h>
 #include <kernel/string.h>
 #include <kernel/serial.h>
 
@@ -8,6 +8,7 @@ void jump_userspace(void);
 char rootfs[1024];
 
 int start_init(int argc, char* argv[]) {
+        while (1);
         return 0;
 }
 
@@ -22,4 +23,5 @@ void process_cmd(char *cmdline) {
 void kernel_main(char *cmdline) {
         kprintf("Box Kernel version %s\n", VERSION);
         serial_init();
+        kmalloc_init();
 }
diff --git a/kernel/mem.c b/kernel/mem.c
deleted file mode 100644
index e977f6a..0000000
--- a/kernel/mem.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <kernel/mem.h>
-#include <kernel/paging.h>
-
-extern uintptr_t _kernel_end;
-static uintptr_t heap_start = (uintptr_t)&_kernel_end;
-static uintptr_t heap_end = (uintptr_t)&_kernel_end;
-
-void* kmalloc(size_t sz) {
-        void *tmp = heap_end;
-        heap_end += sz;
-        return tmp;
-}
-
-void kfree(void *ptr) {
-}
-- 
cgit v1.2.3