morgan
/
vexriscv-rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #8 

8: mepc is word-size r=dvc94ch a=strake



Co-authored-by: M Farkas-Dyck <strake888@gmail.com>
This commit is contained in:
bors[bot] 2018-08-19 08:49:02 +00:00
parent 8d530616c9 ecc69bda00
commit 489b88f66b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/register/mepc.rs
View File

@ -2,7 +2,7 @@
/// Reads the CSR /// Reads the CSR
#[inline] #[inline]
pub fn read() -> u32 { pub fn read() -> usize {
match () { match () {
#[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))] #[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))]
() => { () => {
@ -10,7 +10,7 @@ pub fn read() -> u32 {
unsafe { unsafe {
asm!("csrrs $0, 0x341, x0" : "=r"(r) ::: "volatile"); asm!("csrrs $0, 0x341, x0" : "=r"(r) ::: "volatile");
} }
r as u32 r
}, },
#[cfg(not(any(target_arch = "riscv32", target_arch = "riscv64")))] #[cfg(not(any(target_arch = "riscv32", target_arch = "riscv64")))]
() => unimplemented!(), () => unimplemented!(),