shut up clippy
This commit is contained in:
parent
77355d3f25
commit
c3280cbbfc
2
build.rs
2
build.rs
@ -4,4 +4,4 @@ fn main() {
|
|||||||
println!("cargo:rustc-link-arg=-Tsrc/linker_scripts/{arch}/linker.ld");
|
println!("cargo:rustc-link-arg=-Tsrc/linker_scripts/{arch}/linker.ld");
|
||||||
// ..and to re-run if it changes.
|
// ..and to re-run if it changes.
|
||||||
println!("cargo:rerun-if-changed=src/linker_scripts/{arch}linker.ld");
|
println!("cargo:rerun-if-changed=src/linker_scripts/{arch}linker.ld");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,7 +41,9 @@ use crate::{
|
|||||||
gdt::dump_gdt,
|
gdt::dump_gdt,
|
||||||
interrupts::get_lapic_addr,
|
interrupts::get_lapic_addr,
|
||||||
},
|
},
|
||||||
}, boot::modules::MODULE_RESPONSE, memory::paging::{self, active_root_table, map_page, phys_to_virt},
|
},
|
||||||
|
boot::modules::MODULE_RESPONSE,
|
||||||
|
memory::paging::{self, active_root_table, map_page, phys_to_virt},
|
||||||
};
|
};
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
@ -203,11 +205,18 @@ unsafe extern "C" fn main() -> ! {
|
|||||||
let res = map_page(phys_to_virt(lapic), mapping);
|
let res = map_page(phys_to_virt(lapic), mapping);
|
||||||
log_info!("Map status: {:?}", res);
|
log_info!("Map status: {:?}", res);
|
||||||
|
|
||||||
if let Some(modules_list) = *MODULE_RESPONSE {
|
if let Some(modules_list) = *MODULE_RESPONSE
|
||||||
if modules_list.modules()[0].path().ends_with("/userboot") {
|
&& modules_list.modules()[0].path().ends_with("/userboot")
|
||||||
log_info!("Found userboot: {} {}", modules_list.modules()[0].path(), modules_list.modules()[0].cmdline());
|
{
|
||||||
log_info!("Start address: 0x{:x}", modules_list.modules()[0].data().as_ptr() as usize);
|
log_info!(
|
||||||
}
|
"Found userboot: {} {}",
|
||||||
|
modules_list.modules()[0].path(),
|
||||||
|
modules_list.modules()[0].cmdline()
|
||||||
|
);
|
||||||
|
log_info!(
|
||||||
|
"Start address: 0x{:x}",
|
||||||
|
modules_list.modules()[0].data().as_ptr() as usize
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
panic!("Finished boot, but cannot start init because processes not implemented!");
|
panic!("Finished boot, but cannot start init because processes not implemented!");
|
||||||
|
|||||||
@ -5,10 +5,10 @@ use core::panic::PanicInfo;
|
|||||||
|
|
||||||
#[unsafe(no_mangle)]
|
#[unsafe(no_mangle)]
|
||||||
unsafe extern "C" fn main() -> ! {
|
unsafe extern "C" fn main() -> ! {
|
||||||
loop {}
|
panic!()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[panic_handler]
|
#[panic_handler]
|
||||||
pub fn panic(info: &PanicInfo) -> ! {
|
pub fn panic(_info: &PanicInfo) -> ! {
|
||||||
loop {}
|
loop {}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user