Replace BootInfo::p4_table_addr with RECURSIVE_LEVEL_4_TABLE_ADDR constant

Author: phil-opp

src/bootinfo/mod.rs

@@ -9,7 +9,6 @@ mod memory_map;
 #[derive(Debug)]
 #[repr(C)]
 pub struct BootInfo {
-    pub p4_table_addr: u64,
     pub memory_map: MemoryMap,
     pub package: Package,
 }
@@ -29,9 +28,8 @@ impl Deref for Package {
 }
 
 impl BootInfo {
-    pub fn new(p4_table_addr: u64, memory_map: MemoryMap, package: &'static [u8]) -> Self {
+    pub fn new(memory_map: MemoryMap, package: &'static [u8]) -> Self {
         BootInfo {
-            p4_table_addr,
             memory_map,
             package: Package {
                 ptr: package.as_ptr(),

src/lib.rs

@@ -1,5 +1,9 @@
 #![no_std]
 
+/// The virtual address of the recursively mapped level 4 page table.
+#[cfg(feature = "recursive_level_4_table")]
+pub const RECURSIVE_LEVEL_4_TABLE_ADDR: u64 = 0o_177777_777_777_777_777_0000;
+
 pub mod bootinfo;
 
 /// Defines the entry point function.

src/main.rs

@@ -223,11 +223,7 @@ fn load_elf(
     };
 
     // Construct boot info structure.
-    let mut boot_info = BootInfo::new(
-        recursive_page_table_addr.start_address().as_u64(),
-        memory_map,
-        &[],
-    );
+    let mut boot_info = BootInfo::new(memory_map, &[]);
     boot_info.memory_map.sort();
 
     // Write boot info to boot info page.