Changeset 94d211e in mainline for kernel/arch/riscv64/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/riscv64/include/arch/mm/page.h (modified) (4 diffs)

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

@@ -82 +82 @@
 
 /* Flags mask for non-leaf page table entries */
-#define NON_LEAF_MASK  (~(PAGE_READ | PAGE_WRITE | PAGE_EXEC))
+#define NON_LEAF_MASK  (~(_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC))
 
 /* Get PTE address accessors for each level. */
@@ -156 +156 @@
 #define PTE_PRESENT_ARCH(pte)     ((pte)->valid != 0)
 #define PTE_GET_FRAME_ARCH(pte)   ((uintptr_t) (pte)->pfn << 12)
+#define PTE_READABLE_ARCH(pte)    ((pte)->readable != 0)
 #define PTE_WRITABLE_ARCH(pte)    ((pte)->writable != 0)
 #define PTE_EXECUTABLE_ARCH(pte)  ((pte)->executable != 0)
@@ -183 +184 @@
         pte_t *entry = &pt[i];
 
-        return (((!entry->valid) << PAGE_PRESENT_SHIFT) |
+        return (((!entry->valid) << PAGE_NOT_PRESENT_SHIFT) |
             (entry->user << PAGE_USER_SHIFT) |
             (entry->readable << PAGE_READ_SHIFT) |
@@ -196 +197 @@
 
         entry->valid = !(flags & PAGE_NOT_PRESENT);
-        entry->readable = (flags & PAGE_READ) != 0;
-        entry->writable = (flags & PAGE_WRITE) != 0;
-        entry->executable = (flags & PAGE_EXEC) != 0;
+        entry->readable = (flags & _PAGE_READ) != 0;
+        entry->writable = (flags & _PAGE_WRITE) != 0;
+        entry->executable = (flags & _PAGE_EXEC) != 0;
         entry->user = (flags & PAGE_USER) != 0;
         entry->global = (flags & PAGE_GLOBAL) != 0;