X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/12293ed1d71cd306ed9a5d021a79ba945fe4e680..f13e160f6aa2f74895ecf1f65099265643836210:/lunaix-os/kernel/mm/region.c

diff --git a/lunaix-os/kernel/mm/region.c b/lunaix-os/kernel/mm/region.c
index d9fddeb..59dd6e3 100644
--- a/lunaix-os/kernel/mm/region.c
+++ b/lunaix-os/kernel/mm/region.c
@@ -1,65 +1,78 @@
-#include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/region.h>
+#include <lunaix/mm/valloc.h>
+
+#include <klibc/string.h>
+
+struct mm_region*
+region_create(ptr_t start, ptr_t end, u32_t attr)
+{
+    return valloc(sizeof(struct mm_region));
+}
 
 void
-region_add(struct mm_region** regions,
-           unsigned long start,
-           unsigned long end,
-           unsigned int attr)
+region_add(vm_regions_t* lead, struct mm_region* vmregion)
 {
-    struct mm_region* region = lxmalloc(sizeof(struct mm_region));
+    if (llist_empty(lead)) {
+        llist_append(lead, &vmregion->head);
+        return vmregion;
+    }
 
-    *region = (struct mm_region){ .attr = attr, .end = end, .start = 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);
 
-    if (!*regions) {
-        llist_init_head(&region->head);
-        *regions = region;
-    } else {
-        llist_append(&(*regions)->head, &region->head);
-    }
+    // XXX caution. require mm_region::head to be the lead of struct
+    llist_insert_after(&pos->head, &vmregion->head);
 }
 
 void
-region_release_all(struct mm_region** regions)
+region_release_all(vm_regions_t* lead)
 {
     struct mm_region *pos, *n;
 
-    llist_for_each(pos, n, &(*regions)->head, head)
+    llist_for_each(pos, n, lead, head)
     {
-        lxfree(pos);
+        vfree(pos);
     }
-
-    *regions = NULL;
 }
 
 void
-region_copy(struct mm_region** src, struct mm_region** dest)
+region_copy(vm_regions_t* src, vm_regions_t* dest)
 {
-    if (!*src) {
+    if (!src) {
         return;
     }
 
-    struct mm_region *pos, *n;
+    struct mm_region *pos, *n, *dup;
 
-    llist_init_head(*dest);
-    llist_for_each(pos, n, &(*src)->head, head)
+    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 mm_region** regions, unsigned long vaddr)
+region_get(vm_regions_t* lead, unsigned long vaddr)
 {
-    if (!*regions) {
+    if (llist_empty(lead)) {
         return NULL;
     }
 
     struct mm_region *pos, *n;
 
-    llist_for_each(pos, n, &(*regions)->head, head)
+    llist_for_each(pos, n, lead, head)
     {
-        if (vaddr >= pos->start && vaddr < pos->end) {
+        if (pos->start <= vaddr && vaddr < pos->end) {
             return pos;
         }
     }