mirror of
https://github.com/panpaul/tiny_os
synced 2024-09-20 01:35:19 +08:00
chore: make compiler happy
This commit is contained in:
parent
272fdf303c
commit
08f9374c8b
6
Cargo.lock
generated
6
Cargo.lock
generated
@ -37,9 +37,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.5.0"
|
||||
version = "2.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
@ -101,7 +101,7 @@ name = "kernel"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"allocator",
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"cfg-if",
|
||||
"cpio",
|
||||
"elf",
|
||||
|
@ -26,7 +26,7 @@ tracer = { path = "../lib/tracer" }
|
||||
uapi = { path = "../uapi" }
|
||||
utils = { path = "../lib/utils", default-features = false }
|
||||
|
||||
bitflags = "2.5"
|
||||
bitflags = "2.6"
|
||||
cfg-if = "1.0"
|
||||
elf = { version = "0.7", default-features = false }
|
||||
fdt = { git = "https://github.com/panpaul/fdt.git" } # fork from upstream
|
||||
|
@ -26,8 +26,8 @@ unsafe extern "C" fn _start(hart_id: usize, fdt_addr: usize) -> ! {
|
||||
|
||||
.option push
|
||||
.option norelax
|
||||
1: auipc gp, %pcrel_hi(__global_pointer$)
|
||||
addi gp, gp, %pcrel_lo(1b)
|
||||
2: auipc gp, %pcrel_hi(__global_pointer$)
|
||||
addi gp, gp, %pcrel_lo(2b)
|
||||
.option pop
|
||||
|
||||
lla t0, KERNEL_OFFSET
|
||||
|
@ -38,8 +38,8 @@ extern "C" fn idle_thread() {
|
||||
unsafe {
|
||||
core::arch::asm!(
|
||||
"
|
||||
1: wfi
|
||||
j 1b
|
||||
2: wfi
|
||||
j 2b
|
||||
",
|
||||
options(noreturn)
|
||||
)
|
||||
|
@ -151,7 +151,6 @@ impl Debug for CNodeCap<'_> {
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::arch::vspace::RAM_ALLOCATOR;
|
||||
use crate::objects::*;
|
||||
use core::alloc::Layout;
|
||||
use log::info;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user