f

Author: mkroening

src/arch/x86_64/platform/multiboot/entry.s

@@ -12,6 +12,7 @@
 .align 4
 .global _start
 _start:
+    mov edi, ebx
     cli # avoid any interrupt
 
     # Initialize stack pointer

src/arch/x86_64/platform/multiboot/mod.rs

@@ -1,4 +1,5 @@
 use alloc::borrow::ToOwned;
+use xen_hvm::start_info::HvmStartInfo;
 use core::ptr::write_bytes;
 use core::sync::atomic::{AtomicPtr, Ordering};
 use core::{mem, ptr, slice};
@@ -44,11 +45,12 @@ mod entry {
 
 static MB_INFO: AtomicPtr<MultibootInfo> = AtomicPtr::new(ptr::null_mut());
 
-unsafe extern "C" fn rust_start(mb_info: *mut MultibootInfo) -> ! {
-	MB_INFO.store(mb_info, Ordering::Relaxed);
-	unsafe {
-		crate::os::loader_main();
-	}
+unsafe extern "C" fn rust_start(start_info: &'static HvmStartInfo) -> ! {
+	paging::map::<Size4KiB>(0x2000, 0x2000, 1, PageTableFlags::empty());
+	dbg!(start_info);
+	crate::log::init();
+	crate::log_built_info();
+	loop {}
 }
 
 struct Mem;

xen-hvm/src/elfnote.rs

@@ -1,3 +1,4 @@
+use core::mem;
 
 /// Physical entry point into the kernel.
 ///
@@ -7,24 +8,70 @@
 /// Ignored otherwise.
 pub const XEN_ELFNOTE_PHYS32_ENTRY: u32 = 18;
 
+// #[macro_export]
+// macro_rules! phys32_entry {
+// 	($phys32_entry:expr) => {
+// 		const _: unsafe extern "C" fn() = $phys32_entry;
+
+// 		core::arch::global_asm!(
+// 			".pushsection .note.Xen, \"a\", @note",
+// 			".balign 4",
+// 			".Ln_namesz: .long .Ldesc - .Lname",
+// 			".Ln_descsz: .long .Lend - .Ldesc",
+// 			".Ln_type: .long {ty}",
+// 			".Lname: .asciz \"Xen\"",
+// 			".balign 4",
+// 			".Ldesc: .long {desc}",
+// 			".Lend: .balign 4",
+// 			".popsection",
+// 			ty = const $crate::elfnote::XEN_ELFNOTE_PHYS32_ENTRY,
+// 			desc = sym $phys32_entry,
+// 		);
+// 	};
+// }
+
+#[repr(C, packed(4))]
+struct Nhdr32 {
+	n_namesz: u32,
+	n_descsz: u32,
+	n_type: u32,
+}
+
+#[doc(hidden)]
+#[repr(C, packed(4))]
+pub struct Elfnote<N, D> {
+	header: Nhdr32,
+	name: N,
+	desc: D,
+}
+
+impl<N, D> Elfnote<N, D> {
+	pub const fn new(n_type: u32, name: N, desc: D) -> Self {
+		Self {
+			header: Nhdr32 {
+				n_namesz: mem::size_of::<N>() as u32,
+				n_descsz: mem::size_of::<D>() as u32,
+				n_type,
+			},
+			name,
+			desc,
+		}
+	}
+}
+
+impl Elfnote<[u8; 4], unsafe extern "C" fn()> {
+	#[doc(hidden)]
+	pub const fn phys32_entry(phys32_entry: unsafe extern "C" fn()) -> Self {
+		Self::new(XEN_ELFNOTE_PHYS32_ENTRY, *b"Xen\0", phys32_entry)
+	}
+}
+
 #[macro_export]
 macro_rules! phys32_entry {
 	($phys32_entry:expr) => {
-		const _: unsafe extern "C" fn() = $phys32_entry;
-
-		core::arch::global_asm!(
-			".pushsection .note.Xen, \"a\", @note",
-			".balign 4",
-			".Ln_namesz: .long .Ldesc - .Lname",
-			".Ln_descsz: .long .Lend - .Ldesc",
-			".Ln_type: .long {ty}",
-			".Lname: .asciz \"Xen\"",
-			".balign 4",
-			".Ldesc: .long {desc}",
-			".Lend: .balign 4",
-			".popsection",
-			ty = const $crate::elfnote::XEN_ELFNOTE_PHYS32_ENTRY,
-			desc = sym $phys32_entry,
-		);
+		#[used]
+		#[unsafe(link_section = ".note.Xen")]
+		static XEN_ELFNOTE: $crate::elfnote::Elfnote<[u8; 4], unsafe extern "C" fn()> =
+			$crate::elfnote::Elfnote::phys32_entry($phys32_entry);
 	};
 }

xen-hvm/src/save.rs

@@ -0,0 +1,3 @@
+//! 
+//! 
+//! [`xen/include/public/arch-x86/hvm/save.h`]: https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=xen/include/public/arch-x86/hvm/save.h;h=9c4bfc7ebdac9e2baf2856d1293712eb8c30d526;hb=06af9ef22996cecc2024a2e6523cec77a655581e

xen-hvm/src/start_info.rs

@@ -86,6 +86,7 @@ pub const XEN_HVM_START_MAGIC_VALUE: u32 = 0x336ec578;
 /// Address Map Interfaces" section of the ACPI Specification. Please refer to
 /// section 15 in version 6.2 of the ACPI spec: http://uefi.org/specifications
 #[doc(alias = "XEN_HVM_MEMMAP_TYPE")]
+#[derive(Debug)]
 #[repr(u32)]
 pub enum XenHvmMemmapType {
 	#[doc(alias = "XEN_HVM_MEMMAP_TYPE_RAM")]
@@ -115,6 +116,7 @@ pub enum XenHvmMemmapType {
 /// The canonical definition of this layout is above, this is just a way to
 /// represent the layout described there using C types.
 #[doc(alias = "hvm_start_info")]
+#[derive(Debug)]
 #[repr(C)]
 pub struct HvmStartInfo {
 	/// Contains the magic value 0x336ec578 "xEn3" with the 0x80 bit of the "E" set).
@@ -152,6 +154,7 @@ pub struct HvmStartInfo {
 }
 
 #[doc(alias = "hvm_modlist_entry")]
+#[derive(Debug)]
 #[repr(C)]
 pub struct HvmModlistEntry {
 	/// Physical address of the module.
@@ -166,6 +169,7 @@ pub struct HvmModlistEntry {
 }
 
 #[doc(alias = "hvm_memmap_table_entry")]
+#[derive(Debug)]
 #[repr(C)]
 pub struct HvmMemmapTableEntry {
 	/// Base address of the memory region