saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-15 08:30:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

loader: fix loading when init spans pages

Browse source 
Due to an issue withow MiniELF files were loaded, one page was mapped to
two addresses rather than having two adjacent addresses mapped.  This
occurred when a small section spanned two pages.

This has now been corrected, and an additional test binary will be added
to demonstrate the issue.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-04-06 15:29:37 +08:00
parent a1c88b4ffd
commit 73ad16d367
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
loader/src/main.rs
View file

@ -200,6 +200,7 @@ impl MiniElf {
/// The process will have been already loaded in stage 1. This simply assigns
/// memory maps as necessary.
pub fn load(&self, allocator: &mut BootConfig, load_offset: usize, pid: XousPid) -> usize {
println!("Mapping PID {} starting at offset {:08x}", pid, load_offset);
let mut allocated_bytes = 0;
let mut page_addr: usize = 0;
@ -291,6 +292,7 @@ impl MiniElf {
// Part 3: Copy the final residual partial page
if bytes_to_copy > 0 {
let this_page = (section.virt as usize + section.len()) & !(PAGE_SIZE - 1);
allocator.map_page(satp, top as usize, this_page, flag_defaults);
allocated_bytes += PAGE_SIZE;
top -= PAGE_SIZE;
@ -632,6 +634,8 @@ fn copy_processes(cfg: &mut BootConfig) {
// Zero out the page, if necessary.
unsafe { bzero(top, top.add(section.virt as usize & (PAGE_SIZE - 1))) };
} else {
println!("Reusing existing page @ {:08x}", this_page);
}
// Part 1: Copy the first chunk over.