diff --git a/src/arch/aarch64/kernel/systemtime.rs b/src/arch/aarch64/kernel/systemtime.rs index 182345c62c..a1c43ea4f2 100644 --- a/src/arch/aarch64/kernel/systemtime.rs +++ b/src/arch/aarch64/kernel/systemtime.rs @@ -86,7 +86,7 @@ pub fn init() { let boot_time = OffsetDateTime::from_unix_timestamp(rtc_read(RTC_DR) as i64).unwrap(); - info!("HermitCore-rs booted on {boot_time}"); + info!("Hermit booted on {boot_time}"); let micros = u64::try_from(boot_time.unix_timestamp_nanos() / 1000).unwrap(); BOOT_TIME.set(micros).unwrap(); diff --git a/src/arch/x86_64/kernel/acpi.rs b/src/arch/x86_64/kernel/acpi.rs index 91cfb935b9..6469c5e440 100644 --- a/src/arch/x86_64/kernel/acpi.rs +++ b/src/arch/x86_64/kernel/acpi.rs @@ -468,7 +468,7 @@ pub fn poweroff() -> Result { pub fn init() { // Detect the RSDP and get a pointer to either the XSDT (64-bit) or RSDT (32-bit), whichever is available. // Both are called RSDT in the following. - let rsdp = detect_acpi().expect("HermitCore requires an ACPI-compliant system"); + let rsdp = detect_acpi().expect("Hermit requires an ACPI-compliant system"); let rsdt_physical_address = if rsdp.revision >= 2 { PhysAddr(rsdp.xsdt_physical_address) } else { diff --git a/src/arch/x86_64/kernel/apic.rs b/src/arch/x86_64/kernel/apic.rs index 1aab2ede7a..59e24b69f1 100644 --- a/src/arch/x86_64/kernel/apic.rs +++ b/src/arch/x86_64/kernel/apic.rs @@ -579,7 +579,7 @@ fn calibrate_timer() { // The APIC Timer is used to provide a one-shot interrupt for the tickless timer // implemented through processor::get_timer_ticks. // Therefore determine a counter value for 1 microsecond, which is the resolution - // used throughout all of HermitCore. Wait 30ms for accuracy. + // used throughout all of Hermit. Wait 30ms for accuracy. let microseconds = 30_000; // Be sure that all interrupts for calibration accuracy and initialize the counter are disabled. diff --git a/src/arch/x86_64/kernel/boot.asm b/src/arch/x86_64/kernel/boot.asm index d2e5dbc9a7..681cbb30d5 100644 --- a/src/arch/x86_64/kernel/boot.asm +++ b/src/arch/x86_64/kernel/boot.asm @@ -1,10 +1,10 @@ ; This is the entry point for the application processors. -; It is loaded at 0x8000 by HermitCore and filled with parameters. +; It is loaded at 0x8000 by Hermit and filled with parameters. ; It does the switch from Real Mode -> Protected Mode -> Long Mode, ; sets up CR3 for this CPU, and then calls into _start. ; ; In contrast to this self-contained entry point, _start is linked -; to the rest of HermitCore and thus has access to all exported symbols +; to the rest of Hermit and thus has access to all exported symbols ; (like the actual Rust entry point). diff --git a/src/arch/x86_64/kernel/pci.rs b/src/arch/x86_64/kernel/pci.rs index 60b5d5c076..e48e838853 100644 --- a/src/arch/x86_64/kernel/pci.rs +++ b/src/arch/x86_64/kernel/pci.rs @@ -56,7 +56,7 @@ impl ConfigRegionAccess for PciConfigRegion { pub(crate) fn init() { debug!("Scanning PCI Busses 0 to {}", PCI_MAX_BUS_NUMBER - 1); - // HermitCore only uses PCI for network devices. + // Hermit only uses PCI for network devices. // Therefore, multifunction devices as well as additional bridges are not scanned. // We also limit scanning to the first 32 buses. let pci_config = PciConfigRegion::new(); diff --git a/src/arch/x86_64/kernel/systemtime.rs b/src/arch/x86_64/kernel/systemtime.rs index 44e9353041..c936b7cc4c 100644 --- a/src/arch/x86_64/kernel/systemtime.rs +++ b/src/arch/x86_64/kernel/systemtime.rs @@ -180,21 +180,21 @@ pub fn init() { let boot_time = match boot_info().platform_info { PlatformInfo::Multiboot { .. } => { // Get the current time in microseconds since the epoch (1970-01-01) from the x86 RTC. - // Subtract the timer ticks to get the actual time when HermitCore-rs was booted. + // Subtract the timer ticks to get the actual time when Hermit was booted. let current_time = without_interrupts(|| Rtc::new().get_microseconds_since_epoch()); let boot_time = current_time - processor::get_timer_ticks(); OffsetDateTime::from_unix_timestamp_nanos(boot_time as i128 * 1000).unwrap() } PlatformInfo::LinuxBootParams { .. } => { // Get the current time in microseconds since the epoch (1970-01-01) from the x86 RTC. - // Subtract the timer ticks to get the actual time when HermitCore-rs was booted. + // Subtract the timer ticks to get the actual time when Hermit was booted. let current_time = without_interrupts(|| Rtc::new().get_microseconds_since_epoch()); let boot_time = current_time - processor::get_timer_ticks(); OffsetDateTime::from_unix_timestamp_nanos(boot_time as i128 * 1000).unwrap() } PlatformInfo::Uhyve { boot_time, .. } => boot_time, }; - info!("HermitCore-rs booted on {boot_time}"); + info!("Hermit booted on {boot_time}"); let micros = u64::try_from(boot_time.unix_timestamp_nanos() / 1000).unwrap(); BOOT_TIME.set(micros).unwrap(); diff --git a/src/console.rs b/src/console.rs index 121dd00e43..2d51bcd6e3 100644 --- a/src/console.rs +++ b/src/console.rs @@ -7,7 +7,7 @@ use crate::arch; pub struct Console(()); /// A collection of methods that are required to format -/// a message to HermitCore's console. +/// a message to Hermit's console. impl fmt::Write for Console { /// Print a string of characters. #[inline] diff --git a/src/env.rs b/src/env.rs index 8384cb2966..7d1b8e601e 100644 --- a/src/env.rs +++ b/src/env.rs @@ -28,7 +28,7 @@ struct Cli { args: Vec, } -/// Whether HermitCore is running under the "uhyve" hypervisor. +/// Whether Hermit is running under the "uhyve" hypervisor. pub fn is_uhyve() -> bool { matches!(boot_info().platform_info, PlatformInfo::Uhyve { .. }) } diff --git a/src/lib.rs b/src/lib.rs index 85dbb06b2b..ca374b651c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -//! First version is derived and adapted for HermitCore from +//! First version is derived and adapted for Hermit from //! Philipp Oppermann's excellent series of blog posts () //! and Eric Kidd's toy OS (). @@ -258,9 +258,9 @@ extern "C" fn initd(_arg: usize) { init_rtl8139_netif(processor::get_frequency() as u32); } - info!("HermitCore is running on common system!"); + info!("Hermit is running on common system!"); } else { - info!("HermitCore is running on uhyve!"); + info!("Hermit is running on uhyve!"); } // Initialize Drivers @@ -299,7 +299,7 @@ fn synch_all_cores() { } } -/// Entry Point of HermitCore for the Boot Processor +/// Entry Point of Hermit for the Boot Processor #[cfg(target_os = "none")] fn boot_processor_main() -> ! { // Initialize the kernel and hardware. @@ -308,7 +308,7 @@ fn boot_processor_main() -> ! { logging::init(); } - info!("Welcome to HermitCore-rs {}", env!("CARGO_PKG_VERSION")); + info!("Welcome to Hermit {}", env!("CARGO_PKG_VERSION")); info!("Kernel starts at {:p}", env::get_base_address()); extern "C" { @@ -349,7 +349,7 @@ fn boot_processor_main() -> ! { PerCoreScheduler::run(); } -/// Entry Point of HermitCore for an Application Processor +/// Entry Point of Hermit for an Application Processor #[cfg(all(target_os = "none", feature = "smp"))] fn application_processor_main() -> ! { arch::application_processor_init(); diff --git a/src/mm/allocator.rs b/src/mm/allocator.rs index 064d5c8d0b..236b5677ad 100644 --- a/src/mm/allocator.rs +++ b/src/mm/allocator.rs @@ -1,4 +1,4 @@ -//! Implementation of the HermitCore Allocator for dynamically allocating heap memory +//! Implementation of the Hermit Allocator for dynamically allocating heap memory //! in the kernel. use core::alloc::{GlobalAlloc, Layout}; diff --git a/src/mm/mod.rs b/src/mm/mod.rs index d68750736a..26ce32c82e 100644 --- a/src/mm/mod.rs +++ b/src/mm/mod.rs @@ -110,7 +110,7 @@ pub(crate) fn init() { #[cfg(feature = "newlib")] { - info!("An application with a C-based runtime is running on top of HermitCore!"); + info!("An application with a C-based runtime is running on top of Hermit!"); let kernel_heap_size = 10 * LargePageSize::SIZE as usize; unsafe { @@ -133,7 +133,7 @@ pub(crate) fn init() { #[cfg(not(feature = "newlib"))] { - info!("A pure Rust application is running on top of HermitCore!"); + info!("A pure Rust application is running on top of Hermit!"); // At first, we map only a small part into the heap. // Afterwards, we already use the heap and map the rest into diff --git a/src/syscalls/timer.rs b/src/syscalls/timer.rs index 2248947e8f..87a2df5d04 100644 --- a/src/syscalls/timer.rs +++ b/src/syscalls/timer.rs @@ -65,7 +65,7 @@ extern "C" fn __sys_clock_getres(clock_id: u64, res: *mut timespec) -> i32 { match clock_id { CLOCK_REALTIME | CLOCK_PROCESS_CPUTIME_ID | CLOCK_THREAD_CPUTIME_ID | CLOCK_MONOTONIC => { - // All clocks in HermitCore have 1 microsecond resolution. + // All clocks in Hermit have 1 microsecond resolution. microseconds_to_timespec(1, result); 0 }