Merge branch 'master' into prog-loader

[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..cc75bd9be9b4d5f32b782b28733fbf7be54fbd31 100644 (file)
--- a/lunaix-os/kernel/mm/dmm.c
+++ b/lunaix-os/kernel/mm/dmm.c
@@ -1,19 +1,30 @@
-#include <lunaix/mm/dmm.h>
-#include <lunaix/mm/vmm.h>
+#include <lunaix/mm/mmap.h>
+#include <lunaix/process.h>
+#include <lunaix/status.h>

 
 

-// This is a temporary design. 
-//  We can do better when we are ready for multitasking
-void
-lxsbrk(void* current, void* next) {
-    // TODO: sbrk 
-}
+#include <lunaix/spike.h>
+#include <lunaix/syscall.h>
+#include <lunaix/syscall_utils.h>
+
+__DEFINE_LXSYSCALL1(void*, sbrk, ssize_t, incr)
+{
+    struct proc_mm* pvms = &__current->mm;
+    struct mm_region* heap = pvms->heap;

 
 

-void
-lxmalloc(size_t size) {
-    // TODO: Malloc 
+    assert(heap);
+    int err = mem_adjust_inplace(&pvms->regions, heap, heap->end + incr);
+    if (err) {
+        return (void*)DO_STATUS(err);
+    }
+    return (void*)heap->end;

 }
 
 }
 

-void
-lxfree(size_t size) {
-    // TODO: Free 
+__DEFINE_LXSYSCALL1(int, brk, void*, addr)
+{
+    struct proc_mm* pvms = &__current->mm;
+    struct mm_region* heap = pvms->heap;
+
+    assert(heap);
+    int err = mem_adjust_inplace(&pvms->regions, heap, (ptr_t)addr);
+    return DO_STATUS(err);

 }
\ No newline at end of file
 }
\ No newline at end of file