Merge branch 'master' into signal-dev

[lunaix-os.git] / lunaix-os / kernel / mm / dmm.c

diff --git a/lunaix-os/kernel/mm/dmm.c b/lunaix-os/kernel/mm/dmm.c
index 04a024919a0a9e5104b210956064eff024151d5e..d5826253963e09fc2d74adae073d7ff7114b9816 100644 (file)
--- a/lunaix-os/kernel/mm/dmm.c
+++ b/lunaix-os/kernel/mm/dmm.c
@@ -1,19 +1,91 @@
+/**
+ * @file dmm.c
+ * @author Lunaixsky
+ * @brief Dynamic memory manager for heap. This design do not incorporate any\
+ * specific implementation of malloc family. The main purpose of this routines is to
+ * provide handy method to initialize & grow the heap as needed by upstream implementation.
+ * 
+ * This is designed to be portable, so it can serve as syscalls to malloc/free in the c std lib. 
+ * 
+ * @version 0.2
+ * @date 2022-03-3
+ *
+ * @copyright Copyright (c) Lunaixsky 2022
+ *
+ */
+
 #include <lunaix/mm/dmm.h>
 #include <lunaix/mm/vmm.h>
+#include <lunaix/mm/page.h>
+#include <lunaix/status.h>
+
+#include <lunaix/spike.h>
+#include <lunaix/syscall.h>
+
+
+__DEFINE_LXSYSCALL1(int, sbrk, size_t, size) {
+    heap_context_t* uheap = &__current->mm.u_heap;
+    mutex_lock(&uheap->lock);
+    void* r = lxsbrk(uheap, size);
+    mutex_unlock(&uheap->lock);
+    return r;
+}
+
+__DEFINE_LXSYSCALL1(void*, brk, void*, addr) {
+    heap_context_t* uheap = &__current->mm.u_heap;
+    mutex_lock(&uheap->lock);
+    int r = lxbrk(uheap, addr);
+    mutex_unlock(&uheap->lock);
+    return r;
+}
 
-// This is a temporary design. 
-//  We can do better when we are ready for multitasking
-void
-lxsbrk(void* current, void* next) {
-    // TODO: sbrk 
+int
+dmm_init(heap_context_t* heap)
+{
+    assert((uintptr_t)heap->start % BOUNDARY == 0);
+
+    heap->brk = heap->start;
+    mutex_init(&heap->lock);
+
+    return vmm_alloc_page(__current->pid, heap->brk, NULL, PG_PREM_RW, 0) != NULL;
 }
 
-void
-lxmalloc(size_t size) {
-    // TODO: Malloc 
+int
+lxbrk(heap_context_t* heap, void* addr)
+{
+    return -(lxsbrk(heap, addr - heap->brk) == (void*)-1);
 }
 
-void
-lxfree(size_t size) {
-    // TODO: Free 
+void*
+lxsbrk(heap_context_t* heap, size_t size)
+{
+    if (size == 0) {
+        return heap->brk;
+    }
+
+    void* current_brk = heap->brk;
+
+    // The upper bound of our next brk of heap given the size.
+    // This will be used to calculate the page we need to allocate.
+    void* next = current_brk + ROUNDUP(size, BOUNDARY);
+
+    // any invalid situations
+    if (next >= heap->max_addr || next < current_brk) {
+        __current->k_status = LXINVLDPTR;
+        return (void*)-1;
+    }
+
+    uintptr_t diff = PG_ALIGN(next) - PG_ALIGN(current_brk);
+    if (diff) {
+        // if next do require new pages to be allocated
+        if (!vmm_alloc_pages(__current->pid, (void*)(PG_ALIGN(current_brk) + PG_SIZE),
+                             diff,
+                             PG_PREM_RW, 0)) {
+            __current->k_status = LXHEAPFULL;
+            return NULL;
+        }
+    }
+
+    heap->brk += size;
+    return current_brk;
 }
\ No newline at end of file