greg
/
rust-operating-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add halt loop

This commit is contained in:
greg 2019-07-18 10:31:02 -07:00
parent 0b8cd65458
commit 8b262daa3c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.rs
View File

@ -10,9 +10,9 @@ mod gdt;
use core::panic::PanicInfo; use core::panic::PanicInfo;
#[panic_handler] #[panic_handler]
fn panic(info: &PanicInfo) -> !{ fn panic(info: &PanicInfo) -> ! {
println!("{}", info); println!("{}", info);
loop {} halt_loop();
} }
pub fn init() { pub fn init() {
@ -30,10 +30,12 @@ pub extern "C" fn _start() -> ! {
for i in 1..10 { for i in 1..10 {
println!("Gamarjoba, munde: {}", i); println!("Gamarjoba, munde: {}", i);
} }
halt_loop();
}
pub fn halt_loop() -> ! {
loop { loop {
for _ in 0..100_000 { x86_64::instructions::hlt();
}
print!("-");
} }
} }