wip

Author: phip1611

integration-test/multiboot2/multiboot2_payload/.cargo/config.toml renamed to integration-test/bins/multiboot2_payload/.cargo/config.toml

@@ -14,5 +14,6 @@ anyhow = { version = "1.0.69", default-features = false }
 good_memory_allocator = "0.1.7"
 log = { version = "0.4.17", default-features = false }
 multiboot2 = { path = "../../../multiboot2", features = ["unstable"] }
-# qemu-exit = "3.0.1"
-qemu-exit = { path = "/home/pschuster/dev/other/qemu-exit" }
+# Wait for release > 3.0.1
+qemu-exit = { git = "https://github.com/rust-embedded/qemu-exit.git", rev = "3cee0efb5c1842b5261850c57b3b4d608542ff03" }
+x86 = "0.52.0"

integration-test/bins/multiboot2_payload/Cargo.lock

@@ -10,25 +10,30 @@ PHDRS
 }
 
 SECTIONS {
-    .text 8M : AT(8M) ALIGN(4K)
+    .text 16M : AT(16M) ALIGN(4K)
     {
         *(.multiboot2_header)
         *(.text .text.*)
     } : kernel_rx
 
     .rodata :
     {
-      *(.rodata .rodata.*)
+        *(.rodata .rodata.*)
     } : kernel_ro
 
     .data :
     {
-      *(.data .data.*)
+        *(.data .data.*)
     } : kernel_rw
 
     .bss :
     {
-      *(COMMON)
-      *(.bss .bss.*)
+        *(COMMON)
+        *(.bss .bss.*)
     } : kernel_rw
+
+    /DISCARD/ :
+    {
+        *(.eh_frame .eh_frame.*)
+    }
 }

integration-test/multiboot2/multiboot2_payload/Cargo.toml renamed to integration-test/bins/multiboot2_payload/Cargo.toml

@@ -107,7 +107,9 @@ fn print_module_info(mbi: &BootInformation) -> anyhow::Result<()> {
     };
     let grub_cfg = core::str::from_utf8(grub_cfg).map_err(anyhow::Error::msg)?;
     println!("=== file begin ===");
-    println!("{grub_cfg}");
+    for line in grub_cfg.lines() {
+        println!("    > {line}");
+    }
     println!("=== file end ===");
     println!();
     Ok(())

integration-test/multiboot2/multiboot2_payload/build.rs renamed to integration-test/bins/multiboot2_payload/build.rs

@@ -13,10 +13,10 @@ use core::panic::PanicInfo;
 use log::{debug, error, info};
 use qemu_exit::QEMUExit;
 
-mod macros;
 mod allocator;
 mod debugcon;
 mod integrationtest;
+mod macros;
 
 const QEMU_EXIT_PORT: u16 = 0xf4;
 /// Custom error code to report success.