From 09890a2ca3205843d41cef3e02a49ae169f2c038 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 11 Mar 2020 17:49:03 +0800 Subject: [PATCH] riscv: use upstream riscv module Still pulling from git, as the version number hasn't been bumped yet. Signed-off-by: Sean Cross --- Cargo.lock | 21 ++++++++++----------- kernel/Cargo.toml | 2 +- kernel/src/arch/mod.rs | 2 +- kernel/src/arch/riscv.rs | 6 +++++- kernel/src/arch/riscv/irq.rs | 8 ++++---- kernel/src/arch/riscv/mem.rs | 2 +- kernel/src/arch/riscv/syscall.rs | 2 +- kernel/src/main.rs | 6 +----- 8 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 344fb5f80..0dfdf3741 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -194,7 +194,7 @@ name = "kernel" version = "0.1.0" dependencies = [ "bitflags", - "vexriscv", + "riscv", "xous", ] @@ -351,6 +351,15 @@ version = "0.6.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" +[[package]] +name = "riscv" +version = "0.5.5" +source = "git+https://github.com/rust-embedded/riscv.git?rev=30af64cad7b3869a14182ab18b48ad0c71cce1ed#30af64cad7b3869a14182ab18b48ad0c71cce1ed" +dependencies = [ + "bare-metal", + "bit_field", +] + [[package]] name = "rustc_version" version = "0.2.3" @@ -470,16 +479,6 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -[[package]] -name = "vexriscv" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8cca4a24ec0049cadb38a5a0767529d28f3ea7bb5e5233b8f6cc02a1d8f0a51" -dependencies = [ - "bare-metal", - "bit_field", -] - [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 6f75292b6..4c0162a0e 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -7,7 +7,7 @@ description = "Core kernel for Xous, including task switching and memory managem [dependencies] bitflags = "1.2.1" -vexriscv = "0.0.2" +riscv = { git = "https://github.com/rust-embedded/riscv.git", rev = "30af64cad7b3869a14182ab18b48ad0c71cce1ed" } xous = { path = "../xous-rs" } [features] diff --git a/kernel/src/arch/mod.rs b/kernel/src/arch/mod.rs index 8ead27bd5..a6cbbbd78 100644 --- a/kernel/src/arch/mod.rs +++ b/kernel/src/arch/mod.rs @@ -2,7 +2,7 @@ #[cfg(target_arch = "riscv32")] mod riscv; #[cfg(target_arch = "riscv32")] -pub use riscv::*; +pub use crate::arch::riscv::*; #[cfg(target_arch = "riscv64")] mod riscv; diff --git a/kernel/src/arch/riscv.rs b/kernel/src/arch/riscv.rs index 2b0ca02d8..4f574e50c 100644 --- a/kernel/src/arch/riscv.rs +++ b/kernel/src/arch/riscv.rs @@ -1,4 +1,4 @@ -use vexriscv::register::{satp, sie, sstatus}; +use riscv::register::{satp, sie, sstatus}; use xous::PID; pub mod exception; @@ -20,6 +20,10 @@ pub fn init() { } } +pub fn wfi() { + unsafe { riscv::asm::wfi() }; +} + #[repr(C)] #[derive(Copy, Clone, Debug)] /// Everything required to keep track of a single thread of execution. diff --git a/kernel/src/arch/riscv/irq.rs b/kernel/src/arch/riscv/irq.rs index 13728dfa4..9d23fb570 100644 --- a/kernel/src/arch/riscv/irq.rs +++ b/kernel/src/arch/riscv/irq.rs @@ -2,7 +2,7 @@ use crate::arch::current_pid; use crate::arch::mem::MemoryMapping; use crate::mem::MemoryManagerHandle; use crate::processtable::{ProcessContext, ProcessState, SystemServicesHandle, RETURN_FROM_ISR}; -use vexriscv::register::{scause, sepc, sie, sstatus, stval, vsim, vsip}; +use riscv::register::{scause, sepc, sie, sstatus, stval, vexriscv::sim, vexriscv::sip}; use xous::{SysCall, PID}; extern "Rust" { @@ -26,11 +26,11 @@ pub fn enable_all_irqs() { pub fn enable_irq(irq_no: usize) { // Note that the vexriscv "IRQ Mask" register is inverse-logic -- // that is, setting a bit in the "mask" register unmasks (i.e. enables) it. - vsim::write(vsim::read() | (1 << irq_no)); + sim::write(sim::read() | (1 << irq_no)); } pub fn disable_irq(irq_no: usize) { - vsim::write(vsim::read() & !(1 << irq_no)); + sim::write(sim::read() & !(1 << irq_no)); } static mut PREVIOUS_PID: Option = None; @@ -169,7 +169,7 @@ pub extern "C" fn trap_handler( println!("CPU Exception on PID {}: {}", pid, ex); loop {} } else { - let irqs_pending = vsip::read(); + let irqs_pending = sip::read(); // Safe to access globals since interrupts are disabled // when this function runs. unsafe { diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index 6fe06962e..8c7f855cd 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -1,6 +1,6 @@ use crate::mem::MemoryManager; use core::fmt; -use vexriscv::register::satp; +use riscv::register::satp; use xous::{MemoryFlags, PID}; pub const DEFAULT_STACK_TOP: usize = 0x8000_0000; diff --git a/kernel/src/arch/riscv/syscall.rs b/kernel/src/arch/riscv/syscall.rs index ebf225384..252feb6ec 100644 --- a/kernel/src/arch/riscv/syscall.rs +++ b/kernel/src/arch/riscv/syscall.rs @@ -1,5 +1,5 @@ use crate::processtable::ProcessContext; -use vexriscv::register::{sepc, sstatus}; +use riscv::register::{sepc, sstatus}; extern "C" { fn _xous_resume_context(regs: *const usize) -> !; diff --git a/kernel/src/main.rs b/kernel/src/main.rs index 6eb299a65..9f33b1bb5 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -1,13 +1,9 @@ #![cfg_attr(not(test), no_main)] #![cfg_attr(not(test), no_std)] -extern crate vexriscv; - #[macro_use] extern crate bitflags; -extern crate xous; - #[macro_use] mod debug; @@ -127,7 +123,7 @@ pub extern "C" fn main() { } None => { println!("No runnable tasks found. Zzz..."); - unsafe { vexriscv::asm::wfi() }; + arch::wfi(); } } }