test: try to fix

Author: criskell

Cargo.toml

@@ -14,5 +14,9 @@ ovmf-prebuilt = "0.1.0-alpha.1"
 members = ["kernel"]
 
 [profile.dev]
+panic="unwind"
 debug = true
-split-debuginfo = "unpacked"
+split-debuginfo = "unpacked"
+
+[profile.release]
+panic="abort"

kernel/Cargo.toml

@@ -52,4 +52,3 @@ harness = false       # disable test runner from default and custom test framewo
 [[test]]
 name = "stack_overflow"
 harness = false
-

kernel/src/framebuffer.rs

@@ -199,20 +199,3 @@ fn test_println_many() {
         println!("test_println_many output");
     }
 }
-
-#[test_case]
-fn test_println_output() {
-    use core::fmt::Write;
-    use x86_64::instructions::interrupts;
-
-    let s = "tatakae";
-
-    interrupts::without_interrupts(|| {
-        let mut writer = WRITER.lock();
-        writeln!(writer, "\n{}", s).expect("writeln failed");
-        for (i, c) in s.chars().enumerate() {
-            let screen_char = writer.buffer.chars[BUFFER_HEIGHT - 2][i].read();
-            assert_eq!(char::from(screen_char.ascii_character), c);
-        }
-    });
-}

kernel/src/lib.rs

@@ -63,13 +63,13 @@ pub fn hlt_loop() -> ! {
 }
 
 #[cfg(test)]
-use bootloader::{BootInfo, entry_point};
+use bootloader_api::{BootInfo, entry_point};
 
 #[cfg(test)]
 entry_point!(test_kernel_main);
 
 #[cfg(test)]
-fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
+fn test_kernel_main(_boot_info: &'static mut BootInfo) -> ! {
     init();
     test_main();
     hlt_loop();

kernel/src/main.rs

@@ -17,9 +17,7 @@ extern crate alloc;
 
 pub static BOOTLOADER_CONFIG: BootloaderConfig = {
     let mut config = BootloaderConfig::new_default();
-    config.mappings.kernel_stack = Mapping::FixedAddress(0x10000000000);
     config.mappings.physical_memory = Some(Mapping::FixedAddress(0x20000000000));
-    config.kernel_stack_size = 80 * 1024;
     config
 };
 

kernel/tests/basic_boot.rs

@@ -1,12 +1,12 @@
 #![no_std]
 #![no_main]
 #![feature(custom_test_frameworks)]
-#![test_runner(osdev_rust::test_runner)]
+#![test_runner(kernel::test_runner)]
 #![reexport_test_harness_main = "test_main"]
 
 use core::panic::PanicInfo;
 
-use osdev_rust::println;
+use kernel::println;
 
 #[unsafe(no_mangle)]
 pub extern "C" fn _start() -> ! {
@@ -17,7 +17,7 @@ pub extern "C" fn _start() -> ! {
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    osdev_rust::test_panic_handler(info)
+    kernel::test_panic_handler(info)
 }
 
 #[test_case]

kernel/tests/heap_allocation.rs

@@ -1,28 +1,38 @@
 #![no_std]
 #![no_main]
 #![feature(custom_test_frameworks)]
-#![test_runner(osdev_rust::test_runner)]
+#![test_runner(kernel::test_runner)]
 #![reexport_test_harness_main = "test_main"]
 
 extern crate alloc;
 
 use alloc::{boxed::Box, vec::Vec};
-use bootloader::{BootInfo, entry_point};
+use bootloader_api::{
+    BootInfo,
+    config::{BootloaderConfig, Mapping},
+    entry_point,
+};
 use core::panic::PanicInfo;
-use osdev_rust::allocator::HEAP_SIZE;
+use kernel::allocator::HEAP_SIZE;
 
-entry_point!(main);
+pub static BOOTLOADER_CONFIG: BootloaderConfig = {
+    let mut config = BootloaderConfig::new_default();
+    config.mappings.physical_memory = Some(Mapping::FixedAddress(0x20000000000));
+    config
+};
 
-fn main(boot_info: &'static BootInfo) -> ! {
-    use osdev_rust::allocator;
-    use osdev_rust::memory::{self, BootInfoFrameAllocator};
+entry_point!(main, config = &BOOTLOADER_CONFIG);
+
+fn main(boot_info: &'static mut BootInfo) -> ! {
+    use kernel::allocator;
+    use kernel::memory::{self, BootInfoFrameAllocator};
     use x86_64::VirtAddr;
 
-    osdev_rust::init();
+    kernel::init();
 
-    let phys_mem_offset = VirtAddr::new(boot_info.physical_memory_offset);
+    let phys_mem_offset = VirtAddr::new(boot_info.physical_memory_offset.into_option().unwrap());
     let mut mapper = unsafe { memory::init(phys_mem_offset) };
-    let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_map) };
+    let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_regions) };
     allocator::init_heap(&mut mapper, &mut frame_allocator).expect("heap initialization failed");
 
     test_main();
@@ -31,7 +41,7 @@ fn main(boot_info: &'static BootInfo) -> ! {
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    osdev_rust::test_panic_handler(info);
+    kernel::test_panic_handler(info);
 }
 
 #[test_case]

kernel/tests/should_panic.rs

@@ -5,7 +5,7 @@
 
 use core::panic::PanicInfo;
 
-use osdev_rust::{QemuExitCode, exit_qemu, serial_print, serial_println};
+use kernel::{QemuExitCode, exit_qemu, serial_print, serial_println};
 
 #[unsafe(no_mangle)]
 pub extern "C" fn _start() -> ! {

kernel/tests/stack_overflow.rs

@@ -2,19 +2,19 @@
 #![no_main]
 #![feature(abi_x86_interrupt)]
 
-use core::panic::PanicInfo;
-use lazy_static::lazy_static;
-use osdev_rust::{
+use core::{panic::PanicInfo, ptr::NonNull};
+use kernel::{
     QemuExitCode, exit_qemu, gdt::DOUBLE_FAULT_IST_INDEX, serial_print, serial_println,
     test_panic_handler,
 };
+use lazy_static::lazy_static;
 use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
 
 #[unsafe(no_mangle)]
 pub extern "C" fn _start() -> ! {
     serial_print!("stack_overflow::stack_overflow...\t");
 
-    osdev_rust::gdt::init();
+    kernel::gdt::init();
     init_test_idt();
 
     stack_overflow();
@@ -41,7 +41,12 @@ fn stack_overflow() {
     // garante que o compilador não transforme a recursão em um loop.
     // devido a tail recursion optimizations.
     // isso quebraria o teste.
-    volatile::Volatile::new(0).read();
+    unsafe {
+        volatile::VolatilePtr::new(
+            NonNull::new(0 as *mut u8).expect("failed to create non-null ptr"),
+        )
+        .read();
+    }
 }
 
 lazy_static! {