andrey/osblog
1
0
Fork 0
mirror of https://github.com/sgmarz/osblog.git synced 2024-11-24 02:16:19 +04:00
Code Issues Projects Releases Wiki Activity

Changed scheduler to only return the frame and satp register. The mepc

Browse Source 
is now stored in the trap frame.
This commit is contained in:
Stephen Marz 2020-03-12 13:54:39 -04:00
parent c6b261bf20
commit d9b1743698
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
risc_v/ch9/src/lib.rs
View File

@ -119,6 +119,12 @@ pub fn id_map_range(root: &mut page::Table,
extern "C" { extern "C" {
fn switch_to_user(frame: usize, mepc: usize, satp: usize) -> !; fn switch_to_user(frame: usize, mepc: usize, satp: usize) -> !;
} }
fn rust_switch_to_user(frame: usize, satp: usize) -> ! {
unsafe {
let frameptr = frame as *const cpu::TrapFrame;
switch_to_user(frame, (*frameptr).pc, satp);
}
}
// /////////////////////////////////// // ///////////////////////////////////
// / ENTRY POINT // / ENTRY POINT
// /////////////////////////////////// // ///////////////////////////////////
@ -152,12 +158,9 @@ extern "C" fn kinit() {
let mtime = 0x0200_bff8 as *const u64; let mtime = 0x0200_bff8 as *const u64;
mtimecmp.write_volatile(mtime.read_volatile().wrapping_add(cpu::CONTEXT_SWITCH_TIME)); mtimecmp.write_volatile(mtime.read_volatile().wrapping_add(cpu::CONTEXT_SWITCH_TIME));
} }
let (frame, mepc, satp) = sched::schedule(); let (frame, satp) = sched::schedule();
unsafe { rust_switch_to_user(frame, satp);
switch_to_user(frame, mepc, satp);
}
// switch_to_user will not return, so we should never get here // switch_to_user will not return, so we should never get here
println!("WE DIDN'T SCHEDULE?! THIS ISN'T RIGHT!");
} }
#[no_mangle] #[no_mangle]
extern "C" fn kinit_hart(hartid: usize) { extern "C" fn kinit_hart(hartid: usize) {