From 707e304030524c4b98110d6dd3ae8f01ab0437cf Mon Sep 17 00:00:00 2001 From: Edgar Fouillet Date: Tue, 12 Apr 2022 14:59:12 +0200 Subject: [PATCH 1/2] makefile: bump to 0.0.3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 38d4a69..5906d7a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION=0 PATCHLEVEL=0 -SUBLEVEL=2 +SUBLEVEL=3 EXTRAVERSION= export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION From cf6e49864c0a978869fbe937b1a3a2373f6e186c Mon Sep 17 00:00:00 2001 From: Edgar Fouillet Date: Tue, 12 Apr 2022 15:33:33 +0200 Subject: [PATCH 2/2] pagetable: add flags constants --- src/memory/pagetable.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/memory/pagetable.rs b/src/memory/pagetable.rs index d2f6eb2..fb579a8 100644 --- a/src/memory/pagetable.rs +++ b/src/memory/pagetable.rs @@ -5,6 +5,28 @@ use crate::memory::pageframe; use crate::memory::page_map_indexer; use core::ffi::c_void; +pub mod flags +{ + pub const PDE_PRESENT: usize = 0b0000_0001; + pub const PDE_RW: usize = 0b0000_0010; + pub const PDE_US: usize = 0b0000_0100; + pub const PDE_PWT: usize = 0b0000_1000; + pub const PDE_PCD: usize = 0b0001_0000; + pub const PDE_ACCESSED: usize = 0b0010_0000; + pub const PDE_FLAG2: usize = 0b0100_0000; + pub const PDE_PS: usize = 0b1000_0000; + + pub const PTE_PRESENT: usize = 0b0000_0001; + pub const PTE_RW: usize = 0b0000_0010; + pub const PTE_US: usize = 0b0000_0100; + pub const PTE_PWT: usize = 0b0000_1000; + pub const PTE_PCD: usize = 0b0001_0000; + pub const PTE_ACCESSED: usize = 0b0010_0000; + pub const PTE_DIRTY: usize = 0b0100_0000; + pub const PTE_PAT: usize = 0b1000_0000; + pub const PTE_GLOBAL: usize = 0b1_0000_0000; +} + pub struct Manager { pub page_directory: &'static mut [page::DirectoryEntry],