Merge upstream

Author: wyfcyx

rustsbi-qemu/src/execute.rs

@@ -2,7 +2,6 @@ use crate::feature;
 use crate::qemu_hsm::{pause, HsmCommand, QemuHsm};
 use crate::runtime::{MachineTrap, Runtime, SupervisorContext};
 use core::{
-    arch::asm,
     ops::{Generator, GeneratorState},
     pin::Pin,
 };

rustsbi-qemu/src/hart_csr_utils.rs

@@ -1,7 +1,6 @@
 use alloc::format;
 use alloc::vec::Vec;
 use bit_field::BitField;
-use core::arch::asm;
 use riscv::register::{
     medeleg, mideleg,
     misa::{self, MXL},

rustsbi-qemu/src/main.rs

@@ -23,7 +23,6 @@ mod test_device;
 use buddy_system_allocator::LockedHeap;
 use core::arch::asm;
 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