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

Add page fault handler to riscv 32.

Browse Source
This commit is contained in:
lcy1996 2018-10-11 21:30:35 +08:00
parent f5acc273d7
commit 0a7ec18701
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/src/arch/riscv32/interrupt.rs
View File

@ -72,6 +72,9 @@ pub extern fn rust_trap(tf: &mut TrapFrame) {
Trap::Interrupt(I::SupervisorTimer) => timer(),
Trap::Exception(E::IllegalInstruction) => illegal_inst(tf),
Trap::Exception(E::UserEnvCall) => syscall(tf),
Trap::Exception(E::LoadPageFault) => page_fault(tf),
Trap::Exception(E::StoreFault) => page_fault(tf),
Trap::Exception(E::InstructionPageFault) => page_fault(tf),
_ => ::trap::error(tf),
}
::trap::before_return();
@ -111,6 +114,24 @@ fn illegal_inst(tf: &mut TrapFrame) {
}
}
/*
* @param:
* TrapFrame: the Trapframe for the page fault exception
* @brief:
* process page fault exception
*/
fn page_fault(tf: &mut TrapFrame) {
let addr: usize;
// move stval(i.e. sbadaddr) to addr
addr = stval::read();
error!("\nEXCEPTION: Page Fault @ {:#x}", addr);
use memory::page_fault_handler;
if !page_fault_handler(addr) {
::trap::error(tf);
}
}
/// Migrate from riscv-pk
/*
* @param:

9
kernel/src/memory.rs
View File

@ -52,7 +52,14 @@ pub fn active_table() -> MutexGuard<'static, CowExt<ActivePageTable>> {
ACTIVE_TABLE.lock()
}
// Return true to continue, false to halt
/*
* @param:
* addr: the virtual address of the page fault
* @brief:
* handle page fault
* @retval:
* Return true to continue, false to halt
*/
pub fn page_fault_handler(addr: usize) -> bool {
// Handle copy on write
unsafe { ACTIVE_TABLE.force_unlock(); }