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/syscall/process.rs
+7 -2
View File
@@ -594,13 +594,18 @@ pub unsafe fn usermode_bootstrap(bootstrap: &Bootstrap) -> ! {
}
// TODO: Not all arches do linear mapping
let bootstrap_slice = unsafe { bootstrap_mem(bootstrap) };
UserSliceWo::new(PAGE_SIZE, bootstrap.page_count * PAGE_SIZE)
.expect("failed to create bootstrap user slice")
.copy_from_slice(unsafe { bootstrap_mem(bootstrap) })
.copy_from_slice(bootstrap_slice)
.expect("failed to copy memory to bootstrap");
let bootstrap_entry = u64::from_le_bytes(bootstrap_slice[0x1a..0x22].try_into().unwrap());
log::info!("Bootstrap entry point: {:X}", bootstrap_entry);
assert_ne!(bootstrap_entry, 0);
// Start in a minimal environment without any stack.
usermode(bootstrap.entry, 0, 0, 0);
usermode(bootstrap_entry.try_into().unwrap(), 0, 0, 0);
}
pub unsafe fn bootstrap_mem(bootstrap: &crate::Bootstrap) -> &'static [u8] {