summaryrefslogtreecommitdiff
path: root/kernel/src/mem
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/src/mem')
-rw-r--r--kernel/src/mem/heap.c16
-rw-r--r--kernel/src/mem/paging.c3
-rw-r--r--kernel/src/mem/paging_asm.S12
3 files changed, 24 insertions, 7 deletions
diff --git a/kernel/src/mem/heap.c b/kernel/src/mem/heap.c
new file mode 100644
index 0000000..545f6ea
--- /dev/null
+++ b/kernel/src/mem/heap.c
@@ -0,0 +1,16 @@
+#include <heap.h>
+
+void init_heap(uint64_t addr, uint64_t size, uint64_t block_size)
+{
+
+}
+
+void* kmalloc(uint32_t size)
+{
+ return (uint64_t*)0x0;
+}
+
+void kfree(void *addr)
+{
+
+}
diff --git a/kernel/src/mem/paging.c b/kernel/src/mem/paging.c
index aa7f91e..3f9e2f5 100644
--- a/kernel/src/mem/paging.c
+++ b/kernel/src/mem/paging.c
@@ -1,4 +1,5 @@
-#include <stdint.h>
+#include <types.h>
+
#include <paging.h>
void load_pt_lvl4(uint64_t*);
diff --git a/kernel/src/mem/paging_asm.S b/kernel/src/mem/paging_asm.S
index 5a1dcf7..508930f 100644
--- a/kernel/src/mem/paging_asm.S
+++ b/kernel/src/mem/paging_asm.S
@@ -2,11 +2,11 @@
.global load_pt_lvl4
load_pt_lvl4:
- push %rbp
- mov %rsp, %rbp
+ push %rbp
+ mov %rsp, %rbp
- mov %rdi, %cr3
+ mov %rdi, %cr3
- mov %rbp, %rsp
- pop %rbp
- ret
+ mov %rbp, %rsp
+ pop %rbp
+ ret