userspace fun: maze game and a new device to support it

[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 cc75bd9be9b4d5f32b782b28733fbf7be54fbd31..50804dbf47ee46523e89e3003d2f1e6a532248fe 100644 (file)
--- a/lunaix-os/kernel/mm/dmm.c
+++ b/lunaix-os/kernel/mm/dmm.c
@@ -1,4 +1,5 @@
 #include <lunaix/mm/mmap.h>
 #include <lunaix/mm/mmap.h>

+#include <lunaix/mm/vmm.h>

 #include <lunaix/process.h>
 #include <lunaix/status.h>
 
 #include <lunaix/process.h>
 #include <lunaix/status.h>
 


@@ -6,24 +7,55 @@
 #include <lunaix/syscall.h>
 #include <lunaix/syscall_utils.h>
 
 #include <lunaix/syscall.h>
 #include <lunaix/syscall_utils.h>
 

+void
+__heap_copied(struct mm_region* region)
+{
+    mm_index((void**)&region->proc_vms->heap, region);
+}
+
+int
+create_heap(struct proc_mm* pvms, ptr_t addr)
+{
+    struct mmap_param map_param = { .pvms = pvms,
+                                    .vms_mnt = VMS_SELF,
+                                    .flags = MAP_ANON | MAP_PRIVATE,
+                                    .type = REGION_TYPE_HEAP,
+                                    .proct = PROT_READ | PROT_WRITE,
+                                    .mlen = PAGE_SIZE };
+    int status = 0;
+    struct mm_region* heap;
+    if ((status = mmap_user(NULL, &heap, addr, NULL, &map_param))) {
+        return status;
+    }
+
+    heap->region_copied = __heap_copied;
+    mm_index((void**)&pvms->heap, heap);
+
+    return status;
+}
+

 __DEFINE_LXSYSCALL1(void*, sbrk, ssize_t, incr)
 {
 __DEFINE_LXSYSCALL1(void*, sbrk, ssize_t, incr)
 {

-    struct proc_mm* pvms = &__current->mm;
+    struct proc_mm* pvms = vmspace(__current);

     struct mm_region* heap = pvms->heap;
 
     assert(heap);
     int err = mem_adjust_inplace(&pvms->regions, heap, heap->end + incr);
     if (err) {
     struct mm_region* heap = pvms->heap;
 
     assert(heap);
     int err = mem_adjust_inplace(&pvms->regions, heap, heap->end + incr);
     if (err) {

-        return (void*)DO_STATUS(err);
+        return (void*)__ptr(DO_STATUS(err));

     }
     return (void*)heap->end;
 }
 
 __DEFINE_LXSYSCALL1(int, brk, void*, addr)
 {
     }
     return (void*)heap->end;
 }
 
 __DEFINE_LXSYSCALL1(int, brk, void*, addr)
 {

-    struct proc_mm* pvms = &__current->mm;
+    struct proc_mm* pvms = vmspace(__current);

     struct mm_region* heap = pvms->heap;
 
     struct mm_region* heap = pvms->heap;
 

+    if (!heap) {
+        return DO_STATUS(create_heap(pvms, (ptr_t)addr));
+    }
+

     assert(heap);
     int err = mem_adjust_inplace(&pvms->regions, heap, (ptr_t)addr);
     return DO_STATUS(err);
     assert(heap);
     int err = mem_adjust_inplace(&pvms->regions, heap, (ptr_t)addr);
     return DO_STATUS(err);