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

This commit is contained in:
Yifan Wu 2022-01-01 01:48:25 -08:00
parent 28f51697d1
commit ba4ff28420
8 changed files with 15 additions and 9 deletions

View File

@ -1,7 +1,5 @@
#![no_std]
#![no_main]
#![feature(global_asm)]
#![feature(asm)]
#![feature(panic_info_message)]
#![feature(alloc_error_handler)]
@ -23,6 +21,8 @@ mod timer;
mod sync;
mod mm;
use core::arch::global_asm;
global_asm!(include_str!("entry.asm"));
global_asm!(include_str!("link_app.S"));
@ -52,4 +52,4 @@ pub fn rust_main() -> ! {
timer::set_next_trigger();
task::run_first_task();
panic!("Unreachable in rust_main!");
}
}

View File

@ -15,6 +15,7 @@ use crate::config::{
TRAP_CONTEXT,
USER_STACK_SIZE
};
use core::arch::asm;
extern "C" {
fn stext();
@ -307,4 +308,4 @@ pub fn remap_test() {
false,
);
println!("remap_test passed!");
}
}

View File

@ -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;

View File

@ -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(

View File

@ -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"));

View File

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

View File

@ -1,5 +1,4 @@
#![no_std]
#![feature(asm)]
#![feature(linkage)]
#![feature(panic_info_message)]

View File

@ -1,3 +1,5 @@
use core::arch::asm;
const SYSCALL_WRITE: usize = 64;
const SYSCALL_EXIT: usize = 93;
const SYSCALL_YIELD: usize = 124;
@ -31,4 +33,4 @@ pub fn sys_yield() -> isize {
pub fn sys_get_time() -> isize {
syscall(SYSCALL_GET_TIME, [0, 0, 0])
}
}