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

Added return_pc as mutable

Browse Source
This commit is contained in:
Stephen Marz 2019-11-03 21:23:30 -05:00
parent 07dffe1823
commit 6cc5cba4b8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
risc_v/ch4/src/trap.rs
View File

@ -28,12 +28,12 @@ extern "C" fn m_trap(epc: usize,
// The cause contains the type of trap (sync, async) as well as the cause // The cause contains the type of trap (sync, async) as well as the cause
// number. So, here we narrow down just the cause number. // number. So, here we narrow down just the cause number.
let cause_num = cause & 0xfff; let cause_num = cause & 0xfff;
let return_pc = if is_async { let mut return_pc = epc;
if is_async {
// Asynchronous trap // Asynchronous trap
match cause_num { match cause_num {
3 => { 3 => {
// Machine software // Machine software
epc
}, },
7 => unsafe { 7 => unsafe {
// Machine timer // Machine timer
@ -42,11 +42,9 @@ extern "C" fn m_trap(epc: usize,
// The frequency given by QEMU is 10_000_000 Hz, so this sets // The frequency given by QEMU is 10_000_000 Hz, so this sets
// the next interrupt to fire one second from now. // the next interrupt to fire one second from now.
mtimecmp.write_volatile(mtime.read_volatile() + 10_000_000); mtimecmp.write_volatile(mtime.read_volatile() + 10_000_000);
epc
}, },
11 => { 11 => {
// Machine external (interrupt from Platform Interrupt Controller (PLIC)) // Machine external (interrupt from Platform Interrupt Controller (PLIC))
epc
}, },
_ => { _ => {
panic!("Unhandled async trap CPU#{} -> {}\n", hart, cause_num); panic!("Unhandled async trap CPU#{} -> {}\n", hart, cause_num);
@ -63,12 +61,12 @@ extern "C" fn m_trap(epc: usize,
8 => { 8 => {
// Environment (system) call from User mode // Environment (system) call from User mode
println!("E-call from User mode! CPU#{} -> 0x{:08x}", hart, epc); println!("E-call from User mode! CPU#{} -> 0x{:08x}", hart, epc);
epc + 4 return_pc += 4;
}, },
9 => { 9 => {
// Environment (system) call from Supervisor mode // Environment (system) call from Supervisor mode
println!("E-call from Supervisor mode! CPU#{} -> 0x{:08x}", hart, epc); println!("E-call from Supervisor mode! CPU#{} -> 0x{:08x}", hart, epc);
epc + 4 return_pc += 4;
}, },
11 => { 11 => {
// Environment (system) call from Machine mode // Environment (system) call from Machine mode
@ -78,17 +76,17 @@ extern "C" fn m_trap(epc: usize,
12 => { 12 => {
// Instruction page fault // Instruction page fault
println!("Instruction page fault CPU#{} -> 0x{:08x}: 0x{:08x}", hart, epc, tval); println!("Instruction page fault CPU#{} -> 0x{:08x}: 0x{:08x}", hart, epc, tval);
epc + 4 return_pc += 4;
}, },
13 => { 13 => {
// Load page fault // Load page fault
println!("Load page fault CPU#{} -> 0x{:08x}: 0x{:08x}", hart, epc, tval); println!("Load page fault CPU#{} -> 0x{:08x}: 0x{:08x}", hart, epc, tval);
epc + 4 return_pc += 4;
}, },
15 => { 15 => {
// Store page fault // Store page fault
println!("Store page fault CPU#{} -> 0x{:08x}: 0x{:08x}", hart, epc, tval); println!("Store page fault CPU#{} -> 0x{:08x}: 0x{:08x}", hart, epc, tval);
epc + 4 return_pc += 4;
}, },
_ => { _ => {
panic!("Unhandled sync trap CPU#{} -> {}\n", hart, cause_num); panic!("Unhandled sync trap CPU#{} -> {}\n", hart, cause_num);