Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now PageTable::unmap calls PageTable::find_pte instead of PageTable::find_pte_create.

Browse source
This commit is contained in:
Yifan Wu 2022-01-13 17:04:23 -08:00
parent 880656d6a0
commit 3503a177ac
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
os/src/mm/page_table.rs
View file

@ -93,12 +93,12 @@ impl PageTable {
}
result
}
fn find_pte(&self, vpn: VirtPageNum) -> Option<&PageTableEntry> {
fn find_pte(&self, vpn: VirtPageNum) -> Option<&mut PageTableEntry> {
let idxs = vpn.indexes();
let mut ppn = self.root_ppn;
let mut result: Option<&PageTableEntry> = None;
let mut result: Option<&mut PageTableEntry> = None;
for i in 0..3 {
let pte = &ppn.get_pte_array()[idxs[i]];
let pte = &mut ppn.get_pte_array()[idxs[i]];
if i == 2 {
result = Some(pte);
break;
@ -118,7 +118,7 @@ impl PageTable {
}
#[allow(unused)]
pub fn unmap(&mut self, vpn: VirtPageNum) {
let pte = self.find_pte_create(vpn).unwrap();
let pte = self.find_pte(vpn).unwrap();
assert!(pte.is_valid(), "vpn {:?} is invalid before unmapping", vpn);
*pte = PageTableEntry::empty();
}
@ -154,4 +154,4 @@ pub fn translated_byte_buffer(token: usize, ptr: *const u8, len: usize) -> Vec<&
start = end_va.into();
}
v
}
}