diff --git a/README.md b/README.md index e97de711..e28e783e 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,8 @@ rCore-Tutorial version 3.x ### Binaries -* rustc 1.56.0-nightly (08095fc1f 2021-07-26) +* rustc 1.56.0-nightly (b03ccace5 2021-08-24) * qemu: 5.0.0 -* rustsbi-lib: 0.2.0-alpha.4 - - rustsbi-qemu: d4968dd2 - - rustsbi-k210: b689314e +* rustsbi: qemu[7d71bfb7] k210[563144b0] diff --git a/bootloader/rustsbi-k210.bin b/bootloader/rustsbi-k210.bin index 27987d68..c53ed1fc 100755 Binary files a/bootloader/rustsbi-k210.bin and b/bootloader/rustsbi-k210.bin differ diff --git a/bootloader/rustsbi-qemu.bin b/bootloader/rustsbi-qemu.bin index 0e61b8ea..ddbf336a 100755 Binary files a/bootloader/rustsbi-qemu.bin and b/bootloader/rustsbi-qemu.bin differ diff --git a/rust-toolchain b/rust-toolchain index bf867e0a..1c5af266 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly +nightly-2021-08-25 diff --git a/user/src/bin/00hello_world.rs b/user/src/bin/00hello_world.rs index 7a11980a..242749ac 100644 --- a/user/src/bin/00hello_world.rs +++ b/user/src/bin/00hello_world.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -#![feature(llvm_asm)] +#![feature(asm)] #[macro_use] extern crate user_lib; @@ -9,7 +9,7 @@ extern crate user_lib; fn main() -> i32 { println!("Hello, world!"); unsafe { - llvm_asm!("sret"); + asm!("sret"); } 0 } \ No newline at end of file diff --git a/user/src/bin/01store_fault.rs b/user/src/bin/01store_fault.rs index 790196b2..994d8bfd 100644 --- a/user/src/bin/01store_fault.rs +++ b/user/src/bin/01store_fault.rs @@ -1,6 +1,5 @@ #![no_std] #![no_main] -#![feature(llvm_asm)] #[macro_use] extern crate user_lib;