Unverified Commit c7c13694 authored by bors[bot]'s avatar bors[bot] Committed by GitHub
Browse files

Merge #26



26: Make compatible with latest nightly r=stlankes a=mkroening

This makes the loader compatible with the latest nightly.
Co-authored-by: Martin Kröning's avatarMartin Kröning <mkroening@posteo.net>
parents 92b88420 34f5831b
Pipeline #533850 passed with stages
in 5 minutes and 16 seconds
......@@ -160,7 +160,7 @@ impl<S: PageSize> Page<S> {
/// Flushes this page from the TLB of this CPU.
fn flush_from_tlb(&self) {
unsafe {
llvm_asm!("invlpg ($0)" :: "r"(self.virtual_address) : "memory" : "volatile");
asm!("invlpg [{}]", in(reg) self.virtual_address, options(nostack, preserves_flags));
}
}
......
......@@ -7,8 +7,6 @@
#![feature(alloc_error_handler)]
#![feature(allocator_api)]
#![feature(const_raw_ptr_to_usize_cast)]
#![feature(llvm_asm)]
#![feature(global_asm)]
#![feature(asm)]
#![feature(panic_info_message)]
......
......@@ -35,7 +35,7 @@ pub unsafe extern "C" fn loader_main() -> ! {
);
let app = arch::find_kernel();
let elf = elf::Elf::parse(&app).expect("Unable to parse ELF file");
let elf = elf::Elf::parse(app).expect("Unable to parse ELF file");
assert_ne!(
elf.entry, 0,
"Goblin failed to find entry point of the kernel in the Elf header"
......
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