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

Fetch buffer in user space as a Vec.

Browse source
This commit is contained in:
Yifan Wu 2020-12-07 18:07:19 +08:00
parent 9366099b28
commit 1008d92c35
6 changed files with 49 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
os/src/trap/mod.rs
View file

@ -41,13 +41,13 @@ pub fn enable_timer_interrupt() {
#[no_mangle]
pub fn trap_handler() -> ! {
println!("into trap_handler!");
//println!("into trap_handler!");
let cx = current_trap_cx();
let scause = scause::read();
let stval = stval::read();
match scause.cause() {
Trap::Exception(Exception::UserEnvCall) => {
println!("found UserEnvCall!");
//println!("found UserEnvCall!");
cx.sepc += 4;
cx.x[10] = syscall(cx.x[17], [cx.x[10], cx.x[11], cx.x[12]]) as usize;
}
@ -73,17 +73,17 @@ pub fn trap_handler() -> ! {
#[no_mangle]
pub fn trap_return() -> ! {
println!("into trap_return");
//println!("into trap_return");
let trap_cx_ptr = TRAP_CONTEXT;
let user_satp = current_user_token();
println!("trap_cx_ptr={:#x}, user_satp={:#x}", trap_cx_ptr, user_satp);
//println!("trap_cx_ptr={:#x}, user_satp={:#x}", trap_cx_ptr, user_satp);
extern "C" {
fn __alltraps();
fn __restore();
}
let restore_va = __restore as usize - __alltraps as usize + TRAMPOLINE;
println!("__alltraps={:#x},__restore={:#x}", __alltraps as usize, __restore as usize);
println!("restore_va={:#x}", restore_va);
//println!("__alltraps={:#x},__restore={:#x}", __alltraps as usize, __restore as usize);
//println!("restore_va={:#x}", restore_va);
unsafe {
llvm_asm!("jr $0" :: "r"(restore_va), "{a0}"(trap_cx_ptr), "{a1}"(user_satp) :: "volatile");
}