Update dependency and build under 1.59.0+

Author: luojia65

Cargo.lock

@@ -6,11 +6,11 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rustsbi = { version = "0.2.0-alpha.8" }
+rustsbi = { version = "0.2.0-alpha.10" }
 buddy_system_allocator = "0.8"
 lazy_static = { version = "1", features = ["spin_no_std"] }
 spin = "0.9"
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "7e9d2e5b", features = ["inline-asm"] }
+riscv = { git = "https://github.com/rust-embedded/riscv", rev = "dc0bc37e", features = ["inline-asm"] }
 device_tree = { git = "https://github.com/rcore-os/device_tree-rs/" }
 embedded-hal = "0.2.6"
 nb = "1"

rustsbi-qemu/Cargo.toml

@@ -109,7 +109,7 @@ pub fn execute_supervisor(supervisor_mepc: usize, hart_id: usize, a1: usize, hsm
 #[inline]
 unsafe fn get_vaddr_u32(vaddr: usize) -> u32 {
     let mut ans: u32;
-    asm!("
+    core::arch::asm!("
         li      {tmp}, (1 << 17)
         csrrs   {tmp}, mstatus, {tmp}
         lwu     {ans}, 0({vaddr})

rustsbi-qemu/src/execute.rs

@@ -221,7 +221,7 @@ unsafe fn pmps<const L: usize>() -> [(u8, usize); L] {
 unsafe fn pmpcfg_r(pmpcfg_id: usize) -> usize {
     assert!(pmpcfg_id <= 15, "pmpcfg id should be in [0, 15]");
     let ans: usize;
-    asm!(
+    core::arch::asm!(
     // tmp <- 1的地址；len <- csrr和j指令的长度和
     "la     {tmp}, 1f
     la      {len}, 2f
@@ -256,7 +256,7 @@ unsafe fn pmpcfg_r(pmpcfg_id: usize) -> usize {
 unsafe fn pmpaddr_r(pmpaddr_id: usize) -> usize {
     assert!(pmpaddr_id <= 63, "pmpcfg id should be in [0, 63]");
     let ans: usize;
-    asm!(
+    core::arch::asm!(
     // tmp <- 1的地址；len <- csrr和j指令的长度和
     "la     {tmp}, 1f
     la      {len}, 2f

rustsbi-qemu/src/hart_csr_utils.rs

@@ -1,7 +1,7 @@
 #![no_std]
 #![no_main]
 #![feature(naked_functions)]
-#![feature(asm, asm_sym, asm_const)]
+#![feature(asm_sym, asm_const)]
 #![feature(generator_trait)]
 #![feature(default_alloc_error_handler)]
 
@@ -22,6 +22,7 @@ mod test_device;
 
 use buddy_system_allocator::LockedHeap;
 use core::panic::PanicInfo;
+use core::arch::asm;
 
 const PER_HART_STACK_SIZE: usize = 4 * 4096; // 16KiB
 const SBI_STACK_SIZE: usize = 8 * PER_HART_STACK_SIZE; // assume 8 cores in QEMU

rustsbi-qemu/src/main.rs

@@ -1,4 +1,5 @@
 use core::{
+    arch::asm,
     ops::{Generator, GeneratorState},
     pin::Pin,
 };

rustsbi-qemu/src/runtime.rs

@@ -9,6 +9,7 @@ mod console;
 mod mm;
 mod sbi;
 
+use core::arch::asm;
 use riscv::register::{
     scause::{self, Exception, Trap},
     sepc,

test-kernel/src/main.rs

@@ -1,5 +1,6 @@
 #![allow(unused)]
 use core::fmt;
+use core::arch::asm;
 
 pub const EXTENSION_BASE: usize = 0x10;
 pub const EXTENSION_TIMER: usize = 0x54494D45;