From 48109c34d0e8834461067dc2fc9b49ccfcdda3b9 Mon Sep 17 00:00:00 2001
From: Yifan Wu <shinbokuow@163.com>
Date: Sat, 1 Jan 2022 02:24:51 -0800
Subject: [PATCH] Bump to rust nightly-2022-01-01, feature
 global_asm,asm->stable

---
 os/src/main.rs          | 6 +++---
 os/src/mm/memory_set.rs | 3 ++-
 os/src/sbi.rs           | 2 ++
 os/src/task/switch.rs   | 5 +++--
 os/src/trap/mod.rs      | 1 +
 rust-toolchain          | 2 +-
 user/src/lib.rs         | 3 +--
 user/src/syscall.rs     | 4 +++-
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/os/src/main.rs b/os/src/main.rs
index 3308d62c..dd16ddb1 100644
--- a/os/src/main.rs
+++ b/os/src/main.rs
@@ -1,7 +1,5 @@
 #![no_std]
 #![no_main]
-#![feature(global_asm)]
-#![feature(asm)]
 #![feature(panic_info_message)]
 #![feature(alloc_error_handler)]
 
@@ -24,6 +22,8 @@ mod sync;
 mod mm;
 mod fs;
 
+use core::arch::global_asm;
+
 global_asm!(include_str!("entry.asm"));
 global_asm!(include_str!("link_app.S"));
 
@@ -54,4 +54,4 @@ pub fn rust_main() -> ! {
     loader::list_apps();
     task::run_tasks();
     panic!("Unreachable in rust_main!");
-}
\ No newline at end of file
+}
diff --git a/os/src/mm/memory_set.rs b/os/src/mm/memory_set.rs
index 582a2f8e..84262537 100644
--- a/os/src/mm/memory_set.rs
+++ b/os/src/mm/memory_set.rs
@@ -15,6 +15,7 @@ use crate::config::{
     TRAP_CONTEXT,
     USER_STACK_SIZE
 };
+use core::arch::asm;
 
 extern "C" {
     fn stext();
@@ -341,4 +342,4 @@ pub fn remap_test() {
         false,
     );
     println!("remap_test passed!");
-}
\ No newline at end of file
+}
diff --git a/os/src/sbi.rs b/os/src/sbi.rs
index 276c199d..c8ecbf1d 100644
--- a/os/src/sbi.rs
+++ b/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;
diff --git a/os/src/task/switch.rs b/os/src/task/switch.rs
index fa75be1a..dd3a2d3e 100644
--- a/os/src/task/switch.rs
+++ b/os/src/task/switch.rs
@@ -1,6 +1,7 @@
-global_asm!(include_str!("switch.S"));
-
 use super::TaskContext;
+use core::arch::global_asm;
+
+global_asm!(include_str!("switch.S"));
 
 extern "C" {
     pub fn __switch(
diff --git a/os/src/trap/mod.rs b/os/src/trap/mod.rs
index 5bb54abb..113b34d8 100644
--- a/os/src/trap/mod.rs
+++ b/os/src/trap/mod.rs
@@ -21,6 +21,7 @@ use crate::task::{
 };
 use crate::timer::set_next_trigger;
 use crate::config::{TRAP_CONTEXT, TRAMPOLINE};
+use core::arch::{global_asm, asm};
 
 global_asm!(include_str!("trap.S"));
 
diff --git a/rust-toolchain b/rust-toolchain
index c9f86822..a8a61591 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-12-15
+nightly-2022-01-01
diff --git a/user/src/lib.rs b/user/src/lib.rs
index 0dfe73c3..f52b9afa 100644
--- a/user/src/lib.rs
+++ b/user/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(asm)]
 #![feature(linkage)]
 #![feature(panic_info_message)]
 #![feature(alloc_error_handler)]
@@ -76,4 +75,4 @@ pub fn sleep(period_ms: usize) {
     while sys_get_time() < start + period_ms as isize {
         sys_yield();
     }
-}
\ No newline at end of file
+}
diff --git a/user/src/syscall.rs b/user/src/syscall.rs
index 2a9f62ea..f0a5b490 100644
--- a/user/src/syscall.rs
+++ b/user/src/syscall.rs
@@ -1,3 +1,5 @@
+use core::arch::asm;
+
 const SYSCALL_CLOSE: usize = 57;
 const SYSCALL_PIPE: usize = 59;
 const SYSCALL_READ: usize = 63;
@@ -67,4 +69,4 @@ pub fn sys_exec(path: &str) -> isize {
 
 pub fn sys_waitpid(pid: isize, exit_code: *mut i32) -> isize {
     syscall(SYSCALL_WAITPID, [pid as usize, exit_code as usize, 0])
-}
\ No newline at end of file
+}
-- 
GitLab