Skip to content

mem: defining kernel and user space #36

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: defining kernel and user space #36

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
5 changes: 5 additions & 0 deletions src/ferramenta.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,3 +244,8 @@ pub fn align(val: usize, bound: usize) -> usize
{
val + bound - 1 & !(bound - 1)
}

pub fn in_range(input: usize, start: usize, range: usize) -> bool
{
input >= start && input < start + range
}
Copy link
Copy Markdown
Collaborator

@edrflt edrflt Apr 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

manque le newline

6 changes: 3 additions & 3 deletions src/memory/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub fn init(mmap: *const MultibootTagMmap, mmap_size: usize)
let alloc: &mut pageframe::Allocator = pageframe::Allocator::shared();
alloc.read_grub_mmap(mmap, mmap_size);

let page_directory_addr = alloc.request_free_page();
let page_directory_addr = alloc.request_free_page(true);
let mut pt_manager = pagetable::Manager::new(page_directory_addr);

id_map(&mut pt_manager);
Expand All @@ -44,8 +44,8 @@ pub fn init(mmap: *const MultibootTagMmap, mmap_size: usize)
enable_paging();
pt_manager.enable_paging();
}
let page = alloc.request_free_page();
crate::logln!("requested page: {:#0X}", page);
let page = alloc.request_free_page(false);
crate::logln!("requested page userspace: {:#0X}", page);
pt_manager.memory_map(0x150000, page);
}

Expand Down
9 changes: 8 additions & 1 deletion src/memory/pageframe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ extern "C"
static _kernel_end: c_void;
}

const KERNEL_SPACE_START: usize = 0x0000_0000;
const KERNEL_SPACE_RANGE: usize = 0x0000_2000;

pub struct Allocator
{
pub free_mem: usize,
Expand Down Expand Up @@ -85,10 +88,14 @@ impl Allocator
self.reserve_mem(page_index!(kernel_end), page_index!(self.bitmap.size / 8));
}

pub fn request_free_page(&mut self) -> usize
pub fn request_free_page(&mut self, kernel_space: bool) -> usize
{
for i in 0..self.bitmap.size
{
if !kernel_space && ferramenta::in_range(i, KERNEL_SPACE_START, KERNEL_SPACE_RANGE)
{
continue;
}
if self.bitmap.get(i) == false
{
crate::logln!("locking page {}", i);
Expand Down
2 changes: 1 addition & 1 deletion src/memory/pagetable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl Manager
{
let alloc = pageframe::Allocator::shared();
page_directory_entry.reset();
page_directory_entry.set_addr(alloc.request_free_page() as u32);
page_directory_entry.set_addr(alloc.request_free_page(true) as u32);
page_directory_entry.set_rw(true);
page_directory_entry.set_present(true);
unsafe
Expand Down