add lunaix dynamic linker as submodule

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

diff --git a/lunaix-os/kernel/mm/vmap.c b/lunaix-os/kernel/mm/vmap.c
index ad1a832a5a4dc8c80ff3ede81221f6ba41a15b5c..4b1b311f70afd31a3dce6e52154d19de2bb65ed3 100644 (file)
--- a/lunaix-os/kernel/mm/vmap.c
+++ b/lunaix-os/kernel/mm/vmap.c
@@ -2,10 +2,9 @@
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 

-#define VMAP_START PG_MOUNT_BASE + MEM_4MB
-#define VMAP_END VMS_SELF
+#include <sys/mm/mempart.h>

 
 

-static ptr_t start = VMAP_START;
+static ptr_t start = VMAP;

 
 void*
 vmm_vmap(ptr_t paddr, size_t size, pt_attr attr)
 
 void*
 vmm_vmap(ptr_t paddr, size_t size, pt_attr attr)


@@ -47,7 +46,7 @@ vmm_vmap(ptr_t paddr, size_t size, pt_attr attr)
         if (current_addr >= VMAP_END) {
             wrapped = 1;
             examed_size = 0;
         if (current_addr >= VMAP_END) {
             wrapped = 1;
             examed_size = 0;

-            current_addr = VMAP_START;
+            current_addr = VMAP;

         }
     }
 
         }
     }
 


@@ -56,7 +55,7 @@ vmm_vmap(ptr_t paddr, size_t size, pt_attr attr)
 done:
     ptr_t alloc_begin = current_addr - examed_size;
     for (size_t i = 0; i < size; i += PG_SIZE) {
 done:
     ptr_t alloc_begin = current_addr - examed_size;
     for (size_t i = 0; i < size; i += PG_SIZE) {

-        vmm_set_mapping(VMS_SELF, alloc_begin + i, paddr + i, PG_PREM_RW, 0);
+        vmm_set_mapping(VMS_SELF, alloc_begin + i, paddr + i, attr, 0);

         pmm_ref_page(KERNEL_PID, paddr + i);
     }
     start = alloc_begin + size;
         pmm_ref_page(KERNEL_PID, paddr + i);
     }
     start = alloc_begin + size;