andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-22 16:16:16 +04:00
Code Issues Projects Releases Wiki Activity

Modified the code in pgfault

Browse Source
This commit is contained in:
lcy1996 2018-11-17 16:54:21 +08:00
parent 9d803e87d9
commit 00d0ea8a8b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/src/memory.rs
View File

@ -113,17 +113,16 @@ pub fn page_fault_handler(addr: usize) -> bool {
info!("active page table token in pg fault is {:x?}", ActivePageTable::token());
let id = memory_set_record().iter()
.position(|x| unsafe{(*(x.clone() as *mut MemorySet)).get_page_table_mut().token() == ActivePageTable::token()});
let mut mmsets = memory_set_record();
/*LAB3 EXERCISE 1: YOUR STUDENT NUMBER
* handle the frame deallocated
*/
match id {
Some(targetid) => {
info!("get id from memroy set recorder.");
let mmset_ptr = mmsets.get(targetid);
let mmset_ptr = memory_set_record().get(targetid).expect("fail to get mmset_ptr").clone();
// get current mmset
let current_mmset = unsafe{&mut *(mmset_ptr.expect("fail to get mmset_ptr").clone() as *mut MemorySet)};
let current_mmset = unsafe{&mut *(mmset_ptr as *mut MemorySet)};
//check whether the vma is legal
if current_mmset.find_area(addr).is_none(){
return false;