5 files changed, 63 insertions, 33 deletions
diff --git a/kernel/src/boot.asm b/kernel/src/asm/boot.asm
index 36b1ef9..2ecaba8 100644
--- a/kernel/src/boot.asm
+++ b/kernel/src/asm/boot.asm
@@ -168,5 +168,5 @@ p2_table:
 	resb 4096
 alignb 4096 * 512  ; align memory into huge memory page
 stack_bottom:
-	resb 4096 * 42
+	resb 4096 * 512
 stack_top:
diff --git a/kernel/src/long_mode_init.asm b/kernel/src/asm/long_mode_init.asm
index 8c1b1e7..8c1b1e7 100644
--- a/kernel/src/long_mode_init.asm
+++ b/kernel/src/asm/long_mode_init.asm
diff --git a/kernel/src/multiboot_header.asm b/kernel/src/asm/multiboot_header.asm
index 9c9d859..9c9d859 100644
--- a/kernel/src/multiboot_header.asm
+++ b/kernel/src/asm/multiboot_header.asm
diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
index 59888d1..e5ab3d3 100644
--- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs
@@ -11,47 +11,19 @@ pub mod interrupts;
 pub mod io;
 pub mod testing;
 
-use core::fmt::Write;
 pub use io::qemu::{exit_qemu, QemuExitCode};
 pub use io::vga_text::OStream;
 pub use io::{qemu, serial, vga_text};
+pub use qemu::*;
 
+#[cfg(test)]
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
-    interrupts::gdt::init();
-    interrupts::table::init();
-    if cfg!(test) {
-        #[cfg(test)]
-        test_main();
-        qemu::exit_qemu(qemu::QemuExitCode::Success);
-    }
-
-    x86_64::instructions::interrupts::int3();
-
-    /// TODO: write test
-    ///fn _loop(i: u64) -> u64 {
-    ///    if i > 0b1010101001101101 {
-    ///         return i;
-    ///    }
-    ///    let n = i;
-    ///    let mut stdout = OStream::new();
-    ///    write!(&mut stdout, "{:x}", &n as *const u64 as u64).unwrap();
-    ///    _loop(i + 1)
-    ///}
-    ///_loop(0);
-    /// TODO: write test
-    ///x86_64::instructions::interrupts::int3();
     loop {}
 }
 
+#[cfg(test)]
 #[panic_handler]
-#[no_mangle]
-pub extern "C" fn panic_handler(info: &core::panic::PanicInfo) -> ! {
-    io::panic_screen::show(info.message());
-
-    if cfg!(test) {
-        write!(serial::SerialStream::new(), "Testing failed\n").unwrap();
-        qemu::exit_qemu(qemu::QemuExitCode::Failed);
-    }
+fn panic(_info: &core::panic::PanicInfo) -> ! {
     loop {}
 }
diff --git a/kernel/src/main.rs b/kernel/src/main.rs
new file mode 100644
index 0000000..ae78c93
--- /dev/null
+++ b/kernel/src/main.rs
@@ -0,0 +1,58 @@
+#![no_main]
+#![feature(compiler_builtins_lib)]
+#![feature(custom_test_frameworks)]
+#![feature(abi_x86_interrupt)]
+#![feature(panic_info_message)]
+#![test_runner(crate::testing::serial_test_runner)]
+#![reexport_test_harness_main = "test_main"]
+#![no_std]
+
+pub mod interrupts;
+pub mod io;
+pub mod testing;
+
+use core::fmt::Write;
+pub use io::qemu::{exit_qemu, QemuExitCode};
+pub use io::vga_text::OStream;
+pub use io::{qemu, serial, vga_text};
+
+#[cfg(not(test))]
+#[no_mangle]
+extern "C" fn _start() -> ! {
+    interrupts::gdt::init();
+    interrupts::table::init();
+    if cfg!(test) {
+        #[cfg(test)]
+        test_main();
+        qemu::exit_qemu(qemu::QemuExitCode::Success);
+    }
+
+    x86_64::instructions::interrupts::int3();
+
+    /// TODO: write test
+    ///fn _loop(i: u64) -> u64 {
+    ///    if i > 0b1010101001101101 {
+    ///         return i;
+    ///    }
+    ///    let n = i;
+    ///    let mut stdout = OStream::new();
+    ///    write!(&mut stdout, "{:x}", &n as *const u64 as u64).unwrap();
+    ///    _loop(i + 1)
+    ///}
+    ///_loop(0);
+    /// TODO: write test
+    ///x86_64::instructions::interrupts::int3();
+    loop {}
+}
+
+#[panic_handler]
+#[no_mangle]
+extern "C" fn panic_handler(info: &core::panic::PanicInfo) -> ! {
+    io::panic_screen::show(info.message());
+
+    if cfg!(test) {
+        write!(serial::SerialStream::new(), "Testing failed\n").unwrap();
+        qemu::exit_qemu(qemu::QemuExitCode::Failed);
+    }
+    loop {}
+}