andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2024-11-24 18:36:24 +04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yifan Wu 2022-01-01 01:21:30 -08:00
parent c5a0e2c9d0
commit d675f8e4ca
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/src/main.rs
View File

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

2
os/src/sbi.rs
View File

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

2
rust-toolchain
View File

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