michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Reorganize imports

Browse Source
This commit is contained in:
Philipp Oppermann
2015-12-04 13:38:41 +01:00
parent 799067f8b1
commit 4a54a24145
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/memory/paging/table.rs
View File

@@ -1,5 +1,5 @@
use memory::FrameAllocator; use memory::FrameAllocator;
use memory::paging::{ENTRY_COUNT, Page}; use memory::paging::ENTRY_COUNT;
use memory::paging::entry::*; use memory::paging::entry::*;
use core::ops::{Index, IndexMut}; use core::ops::{Index, IndexMut};
use core::marker::PhantomData; use core::marker::PhantomData;
@@ -47,6 +47,8 @@ impl<L> Table<L> where L: HierachicalLevel
} }
fn next_table_address(&self, index: usize) -> Option<usize> { fn next_table_address(&self, index: usize) -> Option<usize> {
use memory::paging::Page;
let entry_flags = self[index].flags(); let entry_flags = self[index].flags();
if entry_flags.contains(PRESENT) && !entry_flags.contains(HUGE_PAGE) { if entry_flags.contains(PRESENT) && !entry_flags.contains(HUGE_PAGE) {
let table_page = Page::containing_address(self as *const _ as usize); let table_page = Page::containing_address(self as *const _ as usize);