Bump to rust nightly-2022-01-01, feature global_asm,asm->stable

os/src/batch.rs

@@ -1,6 +1,7 @@
 use lazy_static::*;
 use crate::trap::TrapContext;
 use crate::sync::UPSafeCell;
+use core::arch::asm;
 
 const USER_STACK_SIZE: usize = 4096 * 2;
 const KERNEL_STACK_SIZE: usize = 4096 * 2;

os/src/main.rs

@@ -1,9 +1,9 @@
 #![no_std]
 #![no_main]
-#![feature(global_asm)]
-#![feature(asm)]
 #![feature(panic_info_message)]
 
+use core::arch::global_asm;
+
 #[macro_use]
 mod console;
 mod lang_items;

os/src/sbi.rs

@@ -1,5 +1,7 @@
 #![allow(unused)]
 
+use core::arch::asm;
+
 const SBI_SET_TIMER: usize = 0;
 const SBI_CONSOLE_PUTCHAR: usize = 1;
 const SBI_CONSOLE_GETCHAR: usize = 2;

os/src/trap/mod.rs

@@ -12,6 +12,7 @@ use riscv::register::{
 };
 use crate::syscall::syscall;
 use crate::batch::run_next_app;
+use core::arch::global_asm;
 
 global_asm!(include_str!("trap.S"));
 
@@ -47,4 +48,4 @@ pub fn trap_handler(cx: &mut TrapContext) -> &mut TrapContext {
     cx
 }
 
-pub use context::TrapContext;
+pub use context::TrapContext;

rust-toolchain

@@ -1 +1 @@
-nightly-2021-12-15
+nightly-2022-01-01

user/src/bin/00hello_world.rs

@@ -1,10 +1,11 @@
 #![no_std]
 #![no_main]
-#![feature(asm)]
 
 #[macro_use]
 extern crate user_lib;
 
+use core::arch::asm;
+
 #[no_mangle]
 fn main() -> i32 {
     println!("Hello, world!");
@@ -12,4 +13,4 @@ fn main() -> i32 {
         asm!("sret");
     }
     0
-}
+}

user/src/lib.rs

@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(asm)]
 #![feature(linkage)]
 #![feature(panic_info_message)]
 
@@ -35,4 +34,4 @@ fn clear_bss() {
 use syscall::*;
 
 pub fn write(fd: usize, buf: &[u8]) -> isize { sys_write(fd, buf) }
-pub fn exit(exit_code: i32) -> isize { sys_exit(exit_code) }
+pub fn exit(exit_code: i32) -> isize { sys_exit(exit_code) }

user/src/syscall.rs

@@ -1,3 +1,5 @@
+use core::arch::asm;
+
 const SYSCALL_WRITE: usize = 64;
 const SYSCALL_EXIT: usize = 93;