X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/61bcf0c65dac58d2f29ab40e016489c89ec8eec0..8fdcd1575a97862975fa019f09c00453a2a7d8bb:/lunaix-os/kernel/mm/vmm.c?ds=sidebyside

diff --git a/lunaix-os/kernel/mm/vmm.c b/lunaix-os/kernel/mm/vmm.c
index 55fe52b..fe3d65c 100644
--- a/lunaix-os/kernel/mm/vmm.c
+++ b/lunaix-os/kernel/mm/vmm.c
@@ -4,8 +4,6 @@
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 
-#include <stdbool.h>
-
 void
 vmm_init()
 {
@@ -28,7 +26,11 @@ vmm_init_pd()
 }
 
 int
-vmm_set_mapping(uintptr_t mnt, uintptr_t va, uintptr_t pa, pt_attr attr)
+vmm_set_mapping(uintptr_t mnt,
+                uintptr_t va,
+                uintptr_t pa,
+                pt_attr attr,
+                int options)
 {
     assert((uintptr_t)va % PG_SIZE == 0);
 
@@ -49,19 +51,30 @@ vmm_set_mapping(uintptr_t mnt, uintptr_t va, uintptr_t pa, pt_attr attr)
         }
 
         // This must be writable
-        l1pt->entry[l1_inx] = NEW_L1_ENTRY(attr | PG_WRITE, new_l1pt_pa);
+        l1pt->entry[l1_inx] =
+          NEW_L1_ENTRY(attr | PG_WRITE | PG_PRESENT, new_l1pt_pa);
+
         memset((void*)l2pt, 0, PG_SIZE);
+    } else {
+        x86_pte_t pte = l2pt->entry[l2_inx];
+        if (pte && (options & VMAP_IGNORE)) {
+            return 1;
+        }
     }
 
     if (mnt == PD_REFERENCED) {
         cpu_invplg(va);
     }
 
+    if ((options & VMAP_NOMAP)) {
+        return 1;
+    }
+
     l2pt->entry[l2_inx] = NEW_L2_ENTRY(attr, pa);
     return 1;
 }
 
-int
+uintptr_t
 vmm_del_mapping(uintptr_t mnt, uintptr_t va)
 {
     assert(((uintptr_t)va & 0xFFFU) == 0);
@@ -84,14 +97,16 @@ vmm_del_mapping(uintptr_t mnt, uintptr_t va)
 
         cpu_invplg(va);
         l2pt->entry[l2_index] = PTE_NULL;
+
+        return PG_ENTRY_ADDR(l2pte);
     }
+
+    return 0;
 }
 
 int
 vmm_lookup(uintptr_t va, v_mapping* mapping)
 {
-    // va = va & ~0xfff;
-
     uint32_t l1_index = L1_INDEX(va);
     uint32_t l2_index = L2_INDEX(va);