Skip to content

mem: add flag argument to memory_map function #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sulfiore merged 1 commit into from
Apr 9, 2022
Merged

mem: add flag argument to memory_map function #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/memory/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub fn init(mmap: *const MultibootTagMmap, mmap_size: usize)
}
let page = alloc.request_free_page(false);
crate::logln!("requested page userspace: {:#0X}", page);
pt_manager.memory_map(0x150000, page);
pt_manager.memory_map(0x150000, page, 3);
}

fn id_map(pt_manager: &mut pagetable::Manager)
Expand All @@ -57,7 +57,7 @@ fn id_map(pt_manager: &mut pagetable::Manager)

for i in 0..memory_start / PAGE_SIZE
{
pt_manager.memory_map(i * PAGE_SIZE, i * PAGE_SIZE);
pt_manager.memory_map(i * PAGE_SIZE, i * PAGE_SIZE, 3);
alloc.lock_page(i);
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/memory/pagetable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl Manager
self.page_directory = core::slice::from_raw_parts_mut(0xffff_f000 as *mut page::DirectoryEntry, 1024)
}

fn create_page_directory_entry(&mut self, index: usize)
fn create_page_directory_entry(&mut self, index: usize, flags: usize)
{
let page_directory_entry = &mut self.page_directory[index];

Expand All @@ -50,7 +50,7 @@ impl Manager
let alloc = pageframe::Allocator::shared();
page_directory_entry.reset();
page_directory_entry.set_addr(alloc.request_free_page(true) as u32);
page_directory_entry.set_rw(true);
page_directory_entry.value |= flags as u32 & 0xFFF;
page_directory_entry.set_present(true);
unsafe
{
Expand All @@ -59,7 +59,7 @@ impl Manager
}
}

fn create_page_table_entry(&mut self, page_directory_index: usize, page_table_index: usize, physical_address: usize)
fn create_page_table_entry(&mut self, page_directory_index: usize, page_table_index: usize, physical_address: usize, flags: usize)
{
let page_table = unsafe
{
Expand All @@ -70,16 +70,16 @@ impl Manager
{
page_table_entry.reset();
page_table_entry.set_addr(physical_address as u32);
page_table_entry.set_rw(true);
page_table_entry.value |= flags as u32 & 0xFFF;
page_table_entry.set_present(true);
}
}

pub fn memory_map(&mut self, v_addr: usize, phys_addr: usize)
pub fn memory_map(&mut self, v_addr: usize, phys_addr: usize, flags: usize)
{
let (pdi, pti): (usize, usize) = page_map_indexer(v_addr);
self.create_page_directory_entry(pdi);
self.create_page_table_entry(pdi, pti, phys_addr);
self.create_page_directory_entry(pdi, flags);
self.create_page_table_entry(pdi, pti, phys_addr, flags);
}

fn address(&self, page_directory_index: usize) -> u32
Expand Down