yggdrasil-old/yboot2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix "upper" entry without upper flag

Browse Source
This commit is contained in:
Mark 2020-11-09 13:45:04 +02:00
parent ddde48abc5
commit 6f38311de1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -25,4 +25,4 @@ dependencies = [
[[package]] [[package]]
name = "yboot2-proto" name = "yboot2-proto"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.alnyan.me/yggdrasil/yboot2-proto.git#1591988e76a380b7b8fea261aaf2e04760790d5e" source = "git+https://git.alnyan.me/yggdrasil/yboot2-proto.git#f9c0ad12f7d225a99b7a3c31417576fcd46d8b7a"

11
src/main.rs
View File

@ -88,11 +88,20 @@ fn main() -> Result<(), BootError> {
set_efi_mmap(data, &mmap)?; set_efi_mmap(data, &mmap)?;
// Setup upper virtual mapping if requested // Setup upper virtual mapping if requested
let real_entry: usize;
if (data.get_flags() & yboot2_proto::FLAG_UPPER) != 0 { if (data.get_flags() & yboot2_proto::FLAG_UPPER) != 0 {
mem::setup_upper(); mem::setup_upper();
real_entry = entry;
} else {
real_entry = if entry >= 0xFFFFFF0000000000 {
entry - 0xFFFFFF0000000000
} else {
entry
};
} }
unsafe { unsafe {
llvm_asm!("xor %rbp, %rbp; jmp *$0"::"{di}"(entry)); llvm_asm!("xor %rbp, %rbp; jmp *$0"::"{di}"(real_entry));
} }
loop {} loop {}
} }