Changeset 94d211e in mainline for kernel/arch/ia32/include/arch/mm/page.h

Timestamp:

2018-03-21T19:32:48Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

1c7a170

Parents:

973be387

Message:

Change the way page flags work. TODO description

File:

• kernel/arch/ia32/include/arch/mm/page.h (modified) (4 diffs)

kernel/arch/ia32/include/arch/mm/page.h

@@ -109 +109 @@
         get_pt_flags((pte_t *) (ptl0), (size_t) (i))
 #define GET_PTL2_FLAGS_ARCH(ptl1, i) \
-        PAGE_PRESENT
+        PAGE_NEXT_LEVEL_PT
 #define GET_PTL3_FLAGS_ARCH(ptl2, i) \
-        PAGE_PRESENT
+        PAGE_NEXT_LEVEL_PT
 #define GET_FRAME_FLAGS_ARCH(ptl3, i) \
         get_pt_flags((pte_t *) (ptl3), (size_t) (i))
@@ -138 +138 @@
 #define PTE_GET_FRAME_ARCH(p) \
         ((p)->frame_address << FRAME_WIDTH)
+#define PTE_READABLE_ARCH(p) \
+        1
 #define PTE_WRITABLE_ARCH(p) \
         ((p)->writeable != 0)
-#define PTE_EXECUTABLE_ARCH(p)  1
+#define PTE_EXECUTABLE_ARCH(p) \
+        1
 
 #ifndef __ASSEMBLER__
@@ -184 +187 @@
         pte_t *p = &pt[i];
 
-        return ((!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT |
-            (!p->present) << PAGE_PRESENT_SHIFT |
-            p->uaccessible << PAGE_USER_SHIFT |
-            1 << PAGE_READ_SHIFT |
+        return ((p->page_cache_disable ? PAGE_NOT_CACHEABLE : PAGE_CACHEABLE) |
+            (!p->present) << PAGE_NOT_PRESENT_SHIFT |
+            (p->uaccessible ? PAGE_USER : PAGE_KERNEL) |
+            _PAGE_READ |
             p->writeable << PAGE_WRITE_SHIFT |
-            1 << PAGE_EXEC_SHIFT |
+            _PAGE_EXEC |
             p->global << PAGE_GLOBAL_SHIFT);
 }
@@ -199 +202 @@
         p->page_cache_disable = !(flags & PAGE_CACHEABLE);
         p->present = !(flags & PAGE_NOT_PRESENT);
-        p->uaccessible = (flags & PAGE_USER) != 0;
-        p->writeable = (flags & PAGE_WRITE) != 0;
+        p->uaccessible = !(flags & PAGE_KERNEL);
+        p->writeable = (flags & _PAGE_WRITE) != 0;
         p->global = (flags & PAGE_GLOBAL) != 0;