Rename jinux to asterinas in documentation and code

This commit is contained in:
Jianfeng Jiang
2023-12-25 07:27:41 +00:00
committed by Tate, Hongliang Tian
parent 2b248dc326
commit 99f6765ced
43 changed files with 143 additions and 143 deletions

View File

@ -3,7 +3,7 @@
//! The bootloader will deliver the address of the `BootParams` struct
//! as the argument of the kernel entrypoint. So we must define a Linux
//! ABI compatible struct in Rust, despite that most of the fields are
//! currently not needed by Jinux.
//! currently not needed by Asterinas.
//!
#[derive(Copy, Clone, Debug)]

View File

@ -152,5 +152,5 @@ unsafe extern "sysv64" fn __linux64_boot(params_ptr: *const boot_params::BootPar
init_framebuffer_info,
init_memory_regions,
);
crate::boot::call_jinux_main();
crate::boot::call_aster_main();
}

View File

@ -9,8 +9,8 @@
// Some of the fields filled with a 0xab* values should be filled
// by the runner, which is the only tool after building and can
// access the info of the payload.
// Jinux will use only a few of these fields, and some of them
// are filled by the loader and will be read by Jinux.
// Asterinas will use only a few of these fields, and some of them
// are filled by the loader and will be read by Asterinas.
CODE32_START = 0x100000

View File

@ -24,6 +24,6 @@ pub fn load_elf(file: &[u8]) -> u32 {
}
}
// Return the Linux 32-bit Boot Protocol entry point defined by Jinux.
// Return the Linux 32-bit Boot Protocol entry point defined by Asterinas.
0x8001000
}

View File

@ -9,7 +9,7 @@ use core::arch::{asm, global_asm};
global_asm!(include_str!("header.S"));
unsafe fn call_jinux_entrypoint(entrypoint: u32, boot_params_ptr: u32) -> ! {
unsafe fn call_aster_entrypoint(entrypoint: u32, boot_params_ptr: u32) -> ! {
asm!("mov esi, {}", in(reg) boot_params_ptr);
asm!("mov eax, {}", in(reg) entrypoint);
asm!("jmp eax");
@ -34,7 +34,7 @@ pub extern "cdecl" fn _rust_setup_entry(boot_params_ptr: u32) -> ! {
println!("[setup] entrypoint: {:#x}", entrypoint);
// Safety: the entrypoint and the ptr is valid.
unsafe { call_jinux_entrypoint(entrypoint, boot_params_ptr) };
unsafe { call_aster_entrypoint(entrypoint, boot_params_ptr) };
}
#[panic_handler]

View File

@ -1,4 +1,4 @@
//! The x86 boot module defines the entrypoints of Jinux and
//! The x86 boot module defines the entrypoints of Asterinas and
//! the corresponding headers for different x86 boot protocols.
//!
//! We directly support
@ -9,7 +9,7 @@
//!
//! without any additional configurations.
//!
//! Jinux diffrentiates the boot protocol by the entry point
//! Asterinas diffrentiates the boot protocol by the entry point
//! chosen by the boot loader. In each entry point function,
//! the universal callback registeration method from
//! `crate::boot` will be called. Thus the initialization of

View File

@ -339,5 +339,5 @@ unsafe extern "sysv64" fn __multiboot_entry(boot_magic: u32, boot_params: u64) -
init_framebuffer_info,
init_memory_regions,
);
crate::boot::call_jinux_main();
crate::boot::call_aster_main();
}

View File

@ -172,5 +172,5 @@ unsafe extern "sysv64" fn __multiboot2_entry(boot_magic: u32, boot_params: u64)
init_framebuffer_info,
init_memory_regions,
);
crate::boot::call_jinux_main();
crate::boot::call_aster_main();
}

View File

@ -1,6 +1,6 @@
//! The module to parse kernel command-line arguments.
//!
//! The format of the Jinux command line string conforms
//! The format of the Asterinas command line string conforms
//! to the Linux kernel command line rules:
//!
//! https://www.kernel.org/doc/html/v6.4/admin-guide/kernel-parameters.html

View File

@ -60,7 +60,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 `jinux_main` is called. A boot initialization method takes a
/// methods before `aster_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.
@ -104,16 +104,16 @@ pub fn init() {
/// Call the framework-user defined entrypoint of the actual kernel.
///
/// Any kernel that uses the aster-frame crate should define a function named
/// `jinux_main` as the entrypoint.
pub fn call_jinux_main() -> ! {
/// `aster_main` as the entrypoint.
pub fn call_aster_main() -> ! {
#[cfg(not(ktest))]
unsafe {
// The entry point of kernel code, which should be defined by the package that
// uses aster-frame.
extern "Rust" {
fn jinux_main() -> !;
fn aster_main() -> !;
}
jinux_main();
aster_main();
}
#[cfg(ktest)]
{

View File

@ -1,4 +1,4 @@
//! The framework part of Jinux.
//! The framework part of Asterinas.
#![feature(alloc_error_handler)]
#![feature(const_maybe_uninit_zeroed)]
#![feature(const_mut_refs)]