fix clear bss when load user program. 'sh' works!

master
WangRunji 7 years ago
parent 40b099ed79
commit 9b3294a5f2

@ -80,12 +80,11 @@ impl ContextImpl {
let virt_addr = ph.virtual_addr() as usize; let virt_addr = ph.virtual_addr() as usize;
let offset = ph.offset() as usize; let offset = ph.offset() as usize;
let file_size = ph.file_size() as usize; let file_size = ph.file_size() as usize;
if file_size == 0 { let mem_size = ph.mem_size() as usize;
return;
} let target = unsafe { ::core::slice::from_raw_parts_mut(virt_addr as *mut u8, mem_size) };
use core::slice; target[..file_size].copy_from_slice(&data[offset..offset + file_size]);
let target = unsafe { slice::from_raw_parts_mut(virt_addr as *mut u8, file_size) }; target[file_size..].iter_mut().for_each(|x| *x = 0);
target.copy_from_slice(&data[offset..offset + file_size]);
} }
ustack_top = push_args_at_stack(args, ustack_top); ustack_top = push_args_at_stack(args, ustack_top);
}); });

Loading…
Cancel
Save