Merge pull request #2370 from hermit-os/rm-load_info

feat: don't use explicit load info from loader

Author: mkroening

Cargo.lock

@@ -295,6 +295,7 @@ build-time = "0.1.3"
 crossbeam-utils = { version = "0.8", default-features = false }
 delegate = "0.13"
 document-features = { version = "0.2", optional = true }
+elf = { version = "0.8", default-features = false }
 embedded-io = { version = "0.7", features = ["alloc"] }
 endian-num = { version = "0.2", optional = true, features = ["linux-types"] }
 enum_dispatch = "0.3"

Cargo.toml

@@ -14,7 +14,7 @@ use free_list::PageLayout;
 use hashbrown::HashMap;
 use hermit_sync::{InterruptSpinMutex, InterruptTicketMutex, OnceCell, SpinMutex};
 use memory_addresses::VirtAddr;
-use memory_addresses::arch::aarch64::PhysAddr;
+use memory_addresses::PhysAddr;
 
 use crate::arch::aarch64::kernel::core_local::increment_irq_counter;
 use crate::arch::aarch64::kernel::scheduler::State;

src/arch/aarch64/kernel/interrupts.rs

@@ -18,7 +18,7 @@ use core::arch::global_asm;
 use core::sync::atomic::{AtomicPtr, AtomicU32, Ordering};
 use core::{ptr, str};
 
-use memory_addresses::arch::aarch64::{PhysAddr, VirtAddr};
+use memory_addresses::PhysAddr;
 
 use crate::arch::aarch64::kernel::core_local::*;
 use crate::arch::aarch64::mm::paging::{BasePageSize, PageSize};
@@ -46,15 +46,6 @@ pub fn get_ram_address() -> PhysAddr {
 	PhysAddr::new(env::boot_info().hardware_info.phys_addr_range.start)
 }
 
-pub fn get_base_address() -> VirtAddr {
-	VirtAddr::new(env::boot_info().load_info.kernel_image_addr_range.start)
-}
-
-pub fn get_image_size() -> usize {
-	let range = &env::boot_info().load_info.kernel_image_addr_range;
-	(range.end - range.start) as usize
-}
-
 pub fn get_limit() -> usize {
 	env::boot_info().hardware_info.phys_addr_range.end as usize
 }
@@ -131,6 +122,8 @@ pub fn boot_next_processor() {
 		use core::arch::asm;
 		use core::hint::spin_loop;
 
+		use memory_addresses::VirtAddr;
+
 		use crate::kernel::start::{TTBR0, smp_start};
 		use crate::mm::virtual_to_physical;
 

src/arch/aarch64/kernel/mod.rs

@@ -5,7 +5,7 @@ use bit_field::BitField;
 use fdt::Fdt;
 use fdt::node::FdtNode;
 use free_list::PageLayout;
-use memory_addresses::arch::aarch64::{PhysAddr, VirtAddr};
+use memory_addresses::{PhysAddr, VirtAddr};
 use pci_types::{
 	Bar, CommandRegister, ConfigRegionAccess, InterruptLine, InterruptPin, MAX_BARS, PciAddress,
 	PciHeader,

src/arch/aarch64/kernel/pci.rs

@@ -8,7 +8,7 @@ use aarch64_cpu::asm::barrier::{SY, isb};
 use aarch64_cpu::registers::*;
 use align_address::Align;
 use free_list::{PageLayout, PageRange};
-use memory_addresses::arch::aarch64::{PhysAddr, VirtAddr};
+use memory_addresses::{PhysAddr, VirtAddr};
 
 use crate::arch::aarch64::kernel::CURRENT_STACK_ADDRESS;
 use crate::arch::aarch64::kernel::core_local::core_scheduler;

src/arch/aarch64/kernel/scheduler.rs

@@ -3,7 +3,7 @@ use core::arch::asm;
 use free_list::PageLayout;
 use hermit_entry::boot_info::PlatformInfo;
 use hermit_sync::OnceCell;
-use memory_addresses::arch::aarch64::{PhysAddr, VirtAddr};
+use memory_addresses::{PhysAddr, VirtAddr};
 use time::OffsetDateTime;
 
 use crate::arch::aarch64::mm::paging::{self, BasePageSize, PageSize, PageTableEntryFlags};

src/arch/aarch64/kernel/systemtime.rs

@@ -8,7 +8,7 @@ use align_address::Align;
 use free_list::PageLayout;
 use memory_addresses::{PhysAddr, VirtAddr};
 
-use crate::arch::aarch64::kernel::get_ram_address;
+use crate::env::get_ram_address;
 use crate::mm::{FrameAlloc, PageRangeAllocator};
 
 /// Pointer to the root page table (called "Level 0" in ARM terminology).

src/arch/aarch64/mm/paging.rs

@@ -16,7 +16,7 @@ use core::ptr;
 use core::sync::atomic::{AtomicPtr, AtomicU32, AtomicU64, Ordering};
 
 use free_list::PageLayout;
-use memory_addresses::{PhysAddr, VirtAddr};
+use memory_addresses::PhysAddr;
 use riscv::register::sstatus;
 
 use crate::arch::riscv64::kernel::core_local::core_id;
@@ -48,11 +48,6 @@ pub fn get_ram_address() -> PhysAddr {
 	PhysAddr::new(env::boot_info().hardware_info.phys_addr_range.start)
 }
 
-pub fn get_image_size() -> usize {
-	(env::boot_info().load_info.kernel_image_addr_range.end
-		- env::boot_info().load_info.kernel_image_addr_range.start) as usize
-}
-
 pub fn get_limit() -> usize {
 	(env::boot_info().hardware_info.phys_addr_range.end
 		- env::boot_info().hardware_info.phys_addr_range.start) as usize
@@ -73,10 +68,6 @@ pub fn get_processor_count() -> u32 {
 	1
 }
 
-pub fn get_base_address() -> VirtAddr {
-	VirtAddr::new(env::boot_info().load_info.kernel_image_addr_range.start)
-}
-
 pub fn args() -> Option<&'static str> {
 	None
 }

src/arch/riscv64/kernel/mod.rs

@@ -6,7 +6,7 @@ use core::sync::atomic::{AtomicPtr, AtomicU32, Ordering};
 use core::{mem, slice};
 
 use hermit_entry::boot_info::{PlatformInfo, RawBootInfo};
-use memory_addresses::{PhysAddr, VirtAddr};
+use memory_addresses::PhysAddr;
 use x86_64::registers::control::{Cr0, Cr4};
 
 use crate::arch::x86_64::kernel::core_local::*;
@@ -42,15 +42,6 @@ pub fn get_ram_address() -> PhysAddr {
 	PhysAddr::new(env::boot_info().hardware_info.phys_addr_range.start)
 }
 
-pub fn get_base_address() -> VirtAddr {
-	VirtAddr::new(env::boot_info().load_info.kernel_image_addr_range.start)
-}
-
-pub fn get_image_size() -> usize {
-	let range = &env::boot_info().load_info.kernel_image_addr_range;
-	(range.end - range.start) as usize
-}
-
 #[cfg(feature = "smp")]
 pub fn get_possible_cpus() -> u32 {
 	use core::cmp;
@@ -235,6 +226,7 @@ where
 
 	use align_address::Align;
 	use free_list::PageLayout;
+	use memory_addresses::VirtAddr;
 	use x86_64::structures::paging::{PageSize, Size4KiB as BasePageSize};
 
 	use crate::arch::x86_64::mm::paging::{self, PageTableEntryFlags, PageTableEntryFlagsExt};