bug fixes

1 files changed, 9 insertions, 15 deletions

diff --git a/kernel/arch/i386/mmu.c b/kernel/arch/i386/mmu.c
index 7147c74..53b2156 100644
--- a/kernel/arch/i386/mmu.c
+++ b/kernel/arch/i386/mmu.c
@@ -8,7 +8,6 @@
 
 #define INDEX_FROM_BIT(a) (a / (32))
 #define OFFSET_FROM_BIT(a) (a % (32))
-#define PAGE_SIZE ((uintptr_t)0x1000)
 
 #define PAGE_ALLOCATE 1
 #define PAGE_NO_ALLOCATE 0
@@ -107,6 +106,7 @@ Page *get_page(void *ptr, PageDirectory *directory, int create_new_page,
   Page *p = &directory->tables[table_index]->pages[address % 1024];
   if (create_new_page) {
     p->present = 0;
+    p->user = set_user;
   }
   return &directory->tables[table_index]->pages[address % 1024];
 }
@@ -120,19 +120,6 @@ void mmu_free_pages(void *a, u32 n) {
   }
 }
 
-void *next_page(void *ptr) {
-  uintptr_t a = (uintptr_t)ptr;
-  return (void *)(a + (PAGE_SIZE - ((u32)a & (PAGE_SIZE - 1))));
-}
-
-void *align_page(void *a) {
-  if ((uintptr_t)a & (PAGE_SIZE - 1)) {
-    return next_page(a);
-  }
-
-  return a;
-}
-
 u32 first_free_frame(void) {
   u32 i = 1;
   for (; i < INDEX_FROM_BIT(num_array_frames * 32); i++) {
@@ -329,7 +316,13 @@ int mmu_allocate_region(void *ptr, size_t n, mmu_flags flags,
   pd = (pd) ? pd : get_active_pagedirectory();
   size_t num_pages = n / 0x1000;
   for (size_t i = 0; i <= num_pages; i++) {
-    Page *p = get_page((void *)(ptr + i * 0x1000), pd, PAGE_ALLOCATE, 1);
+    Page *p = get_page((void *)(ptr + i * 0x1000), pd, 0, 0);
+    if (p && p->present) {
+      p->rw = (flags & MMU_FLAG_RW);
+      p->user = !(flags & MMU_FLAG_KERNEL);
+      continue;
+    }
+    p = get_page((void *)(ptr + i * 0x1000), pd, PAGE_ALLOCATE, 1);
     assert(p);
     int rw = (flags & MMU_FLAG_RW);
     int kernel = (flags & MMU_FLAG_KERNEL);
@@ -338,6 +331,7 @@ int mmu_allocate_region(void *ptr, size_t n, mmu_flags flags,
       return 0;
     }
   }
+  flush_tlb();
   return 1;
 }