diff --git a/src/allocator.rs b/src/allocator.rs index 5891a73..205c2fd 100644 --- a/src/allocator.rs +++ b/src/allocator.rs @@ -28,7 +28,7 @@ pub fn init_heap( mapper: &mut impl Mapper, frame_allocator: &mut impl FrameAllocator, ) -> Result<(), MapToError> { - println!("creating heap"); + println!("[ ] creating heap"); let page_range = { let heap_start = VirtAddr::new(HEAP_START as u64); let heap_end = heap_start + HEAP_SIZE - 1u64; @@ -49,7 +49,7 @@ pub fn init_heap( super::ALLOCATOR.lock().init(HEAP_START, HEAP_SIZE); } - println!("heap created"); + println!("[ ] heap created"); Ok(()) } diff --git a/src/lib.rs b/src/lib.rs index 09387a8..854eed3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -30,13 +30,12 @@ use core::panic::PanicInfo; use bootloader::BootInfo; pub fn init(boot_info: &'static BootInfo) { - println!("XeOS booting"); + println!("XeOS booting:"); gdt::init(); interrupts::init_idt(); unsafe { interrupts::PICS.lock().initialize() }; x86_64::instructions::interrupts::enable(); allocator::init(&boot_info); - println!("XeOS booted"); } pub fn hlt_loop() -> ! { diff --git a/src/main.rs b/src/main.rs index 56675c3..e7ed087 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,17 +13,16 @@ use xe_os::println; entry_point!(kernel_main); fn kernel_main(boot_info: &'static BootInfo) -> ! { - println!("booted"); xe_os::init(&boot_info); #[cfg(test)] test_main(); - println!("It did not crash!"); + println!("Running WASM:"); xe_os::wasm::run(); - - println!("THE WASM RAN :DDDD"); + println!("[ ] success"); + xe_os::hlt_loop(); } diff --git a/src/wasm/mod.rs b/src/wasm/mod.rs index e2a80ac..009984a 100644 --- a/src/wasm/mod.rs +++ b/src/wasm/mod.rs @@ -15,7 +15,7 @@ pub fn run() { let bytes = include_bytes!("../../data/h.wasm"); let b: Vec = bytes.iter().cloned().collect(); - println!("loaded wasm into a Vec"); + println!("[ ] loaded wasm into a Vec"); let module = wasmi::Module::from_buffer(&b).unwrap(); let mut imports = ImportsBuilder::new(); @@ -25,7 +25,7 @@ pub fn run() { .expect("failed to load wasm module") .assert_no_start(); - println!("invoking export"); + println!("[ ] invoking export"); let _ = instance.invoke_export("h", &[], &mut H); }