refactor(x86_64): put platform-specific files into separate directories

Author: mkroening

src/arch/x86_64/mod.rs

@@ -1,21 +1,15 @@
-cfg_if::cfg_if! {
-	if #[cfg(feature = "linux")] {
-		mod linux;
-		pub use self::linux::*;
-	} else if #[cfg(feature = "multiboot")] {
-		mod multiboot;
-		pub use self::multiboot::*;
-	}
-}
-
 mod console;
 #[cfg(target_os = "none")]
 mod paging;
 #[cfg(target_os = "none")]
 mod physicalmem;
+mod platform;
 
 pub use console::Console;
 
+#[cfg(target_os = "none")]
+pub use self::platform::{boot_kernel, find_kernel};
+
 #[cfg(target_os = "none")]
 const KERNEL_STACK_SIZE: u64 = 32_768;
 pub const SERIAL_IO_PORT: u16 = 0x3F8;

src/arch/x86_64/entry_linux.s src/arch/x86_64/platform/linux/entry.ssrc/arch/x86_64/entry_linux.s renamed to src/arch/x86_64/platform/linux/entry.s

@@ -12,9 +12,9 @@ use linux_boot_params::{BootE820Entry, BootParams};
 use log::{error, info};
 use x86_64::structures::paging::{PageSize, PageTableFlags, Size2MiB, Size4KiB};
 
-use super::physicalmem::PhysAlloc;
-use super::{KERNEL_STACK_SIZE, SERIAL_IO_PORT, paging};
 use crate::BootInfoExt;
+use crate::arch::x86_64::physicalmem::PhysAlloc;
+use crate::arch::x86_64::{KERNEL_STACK_SIZE, SERIAL_IO_PORT, paging};
 use crate::fdt::Fdt;
 
 unsafe extern "C" {
@@ -24,7 +24,7 @@ unsafe extern "C" {
 
 mod entry {
 	core::arch::global_asm!(
-		include_str!("entry_linux.s"),
+		include_str!("entry.s"),
 		loader_main = sym crate::os::loader_main,
 	);
 }
@@ -126,7 +126,7 @@ pub unsafe fn boot_kernel(kernel_info: LoadedKernel) -> ! {
 	let entry = ptr::with_exposed_provenance(entry_point.try_into().unwrap());
 	let raw_boot_info = boot_info.write();
 
-	unsafe { super::enter_kernel(stack, entry, raw_boot_info) }
+	unsafe { crate::arch::x86_64::enter_kernel(stack, entry, raw_boot_info) }
 }
 
 trait BootParamsExt {

src/arch/x86_64/link_linux.ld src/arch/x86_64/platform/linux/link.ldsrc/arch/x86_64/link_linux.ld renamed to src/arch/x86_64/platform/linux/link.ld

@@ -0,0 +1,9 @@
+cfg_if::cfg_if! {
+	if #[cfg(feature = "linux")] {
+		mod linux;
+		pub use self::linux::*;
+	} else if #[cfg(feature = "multiboot")] {
+		mod multiboot;
+		pub use self::multiboot::*;
+	}
+}

src/arch/x86_64/linux.rs src/arch/x86_64/platform/linux/mod.rssrc/arch/x86_64/linux.rs renamed to src/arch/x86_64/platform/linux/mod.rs

@@ -12,10 +12,9 @@ use multiboot::information::{MemoryManagement, Multiboot, PAddr};
 use vm_fdt::FdtWriterResult;
 use x86_64::structures::paging::{PageSize, PageTableFlags, Size2MiB, Size4KiB};
 
-use super::paging;
-use super::physicalmem::PhysAlloc;
 use crate::BootInfoExt;
-use crate::arch::x86_64::{KERNEL_STACK_SIZE, SERIAL_IO_PORT};
+use crate::arch::x86_64::physicalmem::PhysAlloc;
+use crate::arch::x86_64::{KERNEL_STACK_SIZE, SERIAL_IO_PORT, paging};
 use crate::fdt::Fdt;
 
 unsafe extern "C" {
@@ -26,7 +25,7 @@ unsafe extern "C" {
 #[allow(bad_asm_style)]
 mod entry {
 	core::arch::global_asm!(
-		include_str!("entry_multiboot.s"),
+		include_str!("entry.s"),
 		loader_main = sym crate::os::loader_main,
 	);
 }
@@ -204,5 +203,5 @@ pub unsafe fn boot_kernel(kernel_info: LoadedKernel) -> ! {
 	let entry = ptr::with_exposed_provenance(entry_point.try_into().unwrap());
 	let raw_boot_info = boot_info.write();
 
-	unsafe { super::enter_kernel(stack, entry, raw_boot_info) }
+	unsafe { crate::arch::x86_64::enter_kernel(stack, entry, raw_boot_info) }
 }

src/arch/x86_64/platform/mod.rs

@@ -75,11 +75,11 @@ impl Target {
 	pub fn rustflags(&self) -> &'static [&'static str] {
 		match self {
 			Self::X86_64Linux => &[
-				"-Clink-arg=-Tsrc/arch/x86_64/link_linux.ld",
+				"-Clink-arg=-Tsrc/arch/x86_64/platform/linux/link.ld",
 				"-Crelocation-model=static",
 			],
 			Self::X86_64Multiboot => &[
-				"-Clink-arg=-Tsrc/arch/x86_64/link_multiboot.ld",
+				"-Clink-arg=-Tsrc/arch/x86_64/platform/multiboot/link.ld",
 				"-Crelocation-model=static",
 			],
 			Self::X86_64Uefi => &[],