Merge branch 'master' into prog-loader

[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 bd3b26ec0d5fc1009b0e9cf424869934816d2c03..0e0982d7d2d9b0915ed6065c7fb90deb79c000e0 100644 (file)
--- a/lunaix-os/kernel/mm/region.c
+++ b/lunaix-os/kernel/mm/region.c
@@ -1,8 +1,8 @@
 #include <lunaix/mm/region.h>
 #include <lunaix/mm/valloc.h>
 
-void
-region_add(struct mm_region* regions,
+struct mm_region*
+region_add(struct llist_header* lead,
            unsigned long start,
            unsigned long end,
            unsigned int attr)
@@ -11,22 +11,36 @@ region_add(struct mm_region* regions,
 
     *region = (struct mm_region){ .attr = attr, .end = end, .start = start };
 
-    llist_append(&regions->head, &region->head);
+    if (llist_empty(lead)) {
+        llist_append(lead, &region->head);
+        return region;
+    }
+
+    struct mm_region *pos, *n;
+    llist_for_each(pos, n, lead, head)
+    {
+        if (start >= pos->end && end <= n->start) {
+            break;
+        }
+    }
+
+    llist_insert_after(&pos->head, &region->head);
+    return region;
 }
 
 void
-region_release_all(struct mm_region* regions)
+region_release_all(struct llist_header* lead)
 {
     struct mm_region *pos, *n;
 
-    llist_for_each(pos, n, &regions->head, head)
+    llist_for_each(pos, n, lead, head)
     {
         vfree(pos);
     }
 }
 
 void
-region_copy(struct mm_region* src, struct mm_region* dest)
+region_copy(struct llist_header* src, struct llist_header* dest)
 {
     if (!src) {
         return;
@@ -34,22 +48,22 @@ region_copy(struct mm_region* src, struct mm_region* dest)
 
     struct mm_region *pos, *n;
 
-    llist_for_each(pos, n, &src->head, head)
+    llist_for_each(pos, n, src, head)
     {
         region_add(dest, pos->start, pos->end, pos->attr);
     }
 }
 
 struct mm_region*
-region_get(struct mm_region* regions, unsigned long vaddr)
+region_get(struct llist_header* 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 (pos->start <= vaddr && vaddr < pos->end) {
             return pos;