regression: mmap for fd

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

diff --git a/lunaix-os/kernel/mm/region.c b/lunaix-os/kernel/mm/region.c
index 0e0982d7d2d9b0915ed6065c7fb90deb79c000e0..59dd6e3c330c5570e8d3d8f49618d2abaab92719 100644 (file)
--- a/lunaix-os/kernel/mm/region.c
+++ b/lunaix-os/kernel/mm/region.c
@@ -1,35 +1,40 @@
 #include <lunaix/mm/region.h>
 #include <lunaix/mm/valloc.h>
 
+#include <klibc/string.h>
+
 struct mm_region*
-region_add(struct llist_header* lead,
-           unsigned long start,
-           unsigned long end,
-           unsigned int attr)
+region_create(ptr_t start, ptr_t end, u32_t attr)
 {
-    struct mm_region* region = valloc(sizeof(struct mm_region));
-
-    *region = (struct mm_region){ .attr = attr, .end = end, .start = start };
+    return valloc(sizeof(struct mm_region));
+}
 
+void
+region_add(vm_regions_t* lead, struct mm_region* vmregion)
+{
     if (llist_empty(lead)) {
-        llist_append(lead, &region->head);
-        return region;
+        llist_append(lead, &vmregion->head);
+        return vmregion;
     }
 
-    struct mm_region *pos, *n;
-    llist_for_each(pos, n, lead, head)
-    {
-        if (start >= pos->end && end <= n->start) {
+    ptr_t cur_end = 0;
+    struct mm_region *pos = (struct mm_region*)lead,
+                     *n = list_entry(lead->next, struct mm_region, head);
+    do {
+        if (vmregion->start >= cur_end && vmregion->end <= n->start) {
             break;
         }
-    }
+        cur_end = n->end;
+        pos = n;
+        n = list_entry(n->head.next, struct mm_region, head);
+    } while ((ptr_t)&pos->head != (ptr_t)lead);
 
-    llist_insert_after(&pos->head, &region->head);
-    return region;
+    // XXX caution. require mm_region::head to be the lead of struct
+    llist_insert_after(&pos->head, &vmregion->head);
 }
 
 void
-region_release_all(struct llist_header* lead)
+region_release_all(vm_regions_t* lead)
 {
     struct mm_region *pos, *n;
 
@@ -40,22 +45,24 @@ region_release_all(struct llist_header* lead)
 }
 
 void
-region_copy(struct llist_header* src, struct llist_header* dest)
+region_copy(vm_regions_t* src, vm_regions_t* dest)
 {
     if (!src) {
         return;
     }
 
-    struct mm_region *pos, *n;
+    struct mm_region *pos, *n, *dup;
 
     llist_for_each(pos, n, src, head)
     {
-        region_add(dest, pos->start, pos->end, pos->attr);
+        dup = valloc(sizeof(struct mm_region));
+        memcpy(dup, pos, sizeof(*pos));
+        region_add(dest, dup);
     }
 }
 
 struct mm_region*
-region_get(struct llist_header* lead, unsigned long vaddr)
+region_get(vm_regions_t* lead, unsigned long vaddr)
 {
     if (llist_empty(lead)) {
         return NULL;