Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 09:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename aster_main as ostd::main

Browse Source
This commit is contained in:
Jianfeng Jiang
2024-06-20 06:16:04 +00:00
committed by Tate, Hongliang Tian
parent 59350a8578
commit fe7251c413
20 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ostd/src/boot/mod.rs
View File

@ -67,7 +67,7 @@ macro_rules! define_global_static_boot_arguments {
///
/// For the introduction of a new boot protocol, the entry point could be a novel
/// one. The entry point function should register all the boot initialization
/// methods before `aster_main` is called. A boot initialization method takes a
/// methods before `ostd::main` is called. A boot initialization method takes a
/// reference of the global static boot information variable and initialize it,
/// so that the boot information it represents could be accessed in the kernel
/// anywhere.
@ -110,17 +110,17 @@ pub fn init() {
/// Calls the OSTD-user defined entrypoint of the actual kernel.
///
/// Any kernel that uses the `ostd` crate should define a function named
/// `aster_main` as the entrypoint.
pub fn call_aster_main() -> ! {
/// Any kernel that uses the `ostd` crate should define a function marked with
/// `ostd::main` as the entrypoint.
pub fn call_ostd_main() -> ! {
#[cfg(not(ktest))]
unsafe {
// The entry point of kernel code, which should be defined by the package that
// uses OSTD.
extern "Rust" {
fn __aster_main() -> !;
fn __ostd_main() -> !;
}
__aster_main();
__ostd_main();
}
#[cfg(ktest)]
unsafe {