Merge branch 'post-08-new' into post-09-new

src/main.rs

@@ -1,6 +1,8 @@
-#![cfg_attr(not(test), no_std)]
-#![cfg_attr(not(test), no_main)]
-#![cfg_attr(test, allow(unused_imports))]
+#![no_std]
+#![no_main]
+#![feature(custom_test_frameworks)]
+#![test_runner(blog_os::test_runner)]
+#![reexport_test_harness_main = "test_main"]
 
 use blog_os::println;
 use bootloader::{entry_point, BootInfo};
@@ -8,18 +10,12 @@ use core::panic::PanicInfo;
 
 entry_point!(kernel_main);
 
-#[cfg(not(test))]
 fn kernel_main(boot_info: &'static BootInfo) -> ! {
-    use blog_os::interrupts::PICS;
     use blog_os::memory;
     use x86_64::{structures::paging::Page, VirtAddr};
-
     println!("Hello World{}", "!");
 
-    blog_os::gdt::init();
-    blog_os::interrupts::init_idt();
-    unsafe { PICS.lock().initialize() };
-    x86_64::instructions::interrupts::enable();
+    blog_os::init();
 
     let mut mapper = unsafe { memory::init(boot_info.physical_memory_offset) };
     let mut frame_allocator = memory::init_frame_allocator(&boot_info.memory_map);
@@ -32,6 +28,9 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
     let page_ptr: *mut u64 = page.start_address().as_mut_ptr();
     unsafe { page_ptr.offset(400).write_volatile(0x_f021_f077_f065_f04e) };
 
+    #[cfg(test)]
+    test_main();
+
     println!("It did not crash!");
     blog_os::hlt_loop();
 }
@@ -43,3 +42,9 @@ fn panic(info: &PanicInfo) -> ! {
     println!("{}", info);
     blog_os::hlt_loop();
 }
+
+#[cfg(test)]
+#[panic_handler]
+fn panic(info: &PanicInfo) -> ! {
+    blog_os::test_panic_handler(info)
+}