Unverified Commit b30fb1cf authored by Stefan Lankes's avatar Stefan Lankes Committed by GitHub
Browse files

Merge pull request #7 from tlambertz/master

Fix loader. Previously strongly dependent on the input ELF's layout.
parents 99afb05e 8afeb8bc
......@@ -12,7 +12,7 @@
extern crate rusty_loader;
use core::intrinsics::copy_nonoverlapping;
use core::intrinsics::copy;
use rusty_loader::arch;
use rusty_loader::*;
......@@ -37,7 +37,8 @@ pub unsafe extern "C" fn loader_main() -> ! {
kernel_location,
virtual_address
);
copy_nonoverlapping(
arch::map_memory(virtual_address, mem_size);
copy(
kernel_location as *const u8,
virtual_address as *mut u8,
mem_size,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment