vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Directly read the bootstrap entry point from the initfs header

Browse Source
This commit is contained in:
bjorn3
2024-03-11 12:31:18 +01:00
parent fb66a8628f
commit ecbc2b7e8d
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/aarch64/start.rs
+2 -4
View File
@@ -48,8 +48,8 @@ pub struct KernelArgs {
bootstrap_base: usize,
/// Size of contiguous bootstrap/initfs physical region, not necessarily page aligned.
bootstrap_size: usize,
/// Entry point the kernel will jump to.
bootstrap_entry: usize,
/// Entry point the kernel will jump to. (deprecated)
_bootstrap_entry: usize,
}
/// The entry to Rust, all things must be initialized
@@ -125,7 +125,6 @@ pub unsafe extern "C" fn kstart(args_ptr: *const KernelArgs) -> ! {
{ args.bootstrap_base },
args.bootstrap_base + args.bootstrap_size
);
info!("Bootstrap entry point: {:X}", { args.bootstrap_entry });
// Setup interrupt handlers
core::arch::asm!(
@@ -202,7 +201,6 @@ pub unsafe extern "C" fn kstart(args_ptr: *const KernelArgs) -> ! {
args.bootstrap_base,
)),
page_count: args.bootstrap_size / crate::memory::PAGE_SIZE,
entry: args.bootstrap_entry,
env,
}
};
src/arch/x86/start.rs
+2 -4
View File
@@ -60,8 +60,8 @@ pub struct KernelArgs {
bootstrap_base: u64,
/// Size of contiguous bootstrap/initfs physical region, not necessarily page aligned.
bootstrap_size: u64,
/// Entry point the kernel will jump to.
bootstrap_entry: u64,
/// Entry point the kernel will jump to. (deprecated)
_bootstrap_entry: u64,
}
/// The entry to Rust, all things must be initialized
@@ -135,7 +135,6 @@ pub unsafe extern "C" fn kstart(args_ptr: *const KernelArgs) -> ! {
{ args.bootstrap_base },
{ args.bootstrap_base } + { args.bootstrap_size }
);
info!("Bootstrap entry point: {:X}", { args.bootstrap_entry });
// Set up GDT before paging
gdt::init();
@@ -224,7 +223,6 @@ pub unsafe extern "C" fn kstart(args_ptr: *const KernelArgs) -> ! {
args.bootstrap_base as usize,
)),
page_count: (args.bootstrap_size as usize) / crate::memory::PAGE_SIZE,
entry: args.bootstrap_entry as usize,
env,
}
};
src/arch/x86_64/start.rs
+2 -4
View File
@@ -60,8 +60,8 @@ pub struct KernelArgs {
bootstrap_base: u64,
/// Size of contiguous bootstrap/initfs physical region, not necessarily page aligned.
bootstrap_size: u64,
/// Entry point the kernel will jump to.
bootstrap_entry: u64,
/// Entry point the kernel will jump to. (deprecated)
_bootstrap_entry: u64,
}
/// The entry to Rust, all things must be initialized
@@ -135,7 +135,6 @@ pub unsafe extern "C" fn kstart(args_ptr: *const KernelArgs) -> ! {
{ args.bootstrap_base },
{ args.bootstrap_base } + { args.bootstrap_size }
);
info!("Bootstrap entry point: {:X}", { args.bootstrap_entry });
// Set up GDT before paging
gdt::init();
@@ -233,7 +232,6 @@ pub unsafe extern "C" fn kstart(args_ptr: *const KernelArgs) -> ! {
args.bootstrap_base as usize,
)),
page_count: (args.bootstrap_size as usize) / crate::memory::PAGE_SIZE,
entry: args.bootstrap_entry as usize,
env,
}
};