metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Make boot info compile

This commit is contained in:
Berkus Decker 2021-02-26 01:37:55 +02:00
parent 15323fe7f3
commit a6266dc385
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nucleus/src/boot_info.rs
View File

@ -1,3 +1,5 @@
use crate::{memory::PhysAddr, println, sync};
#[derive(Default, Copy, Clone)] #[derive(Default, Copy, Clone)]
struct BootInfoMemRegion { struct BootInfoMemRegion {
pub start: PhysAddr, pub start: PhysAddr,
@ -71,13 +73,13 @@ impl BootInfo {
let mut new_reg: BootInfoMemRegion = BootInfoMemRegion::new(); let mut new_reg: BootInfoMemRegion = BootInfoMemRegion::new();
/* Determine whether placing the region at the start or the end will create a bigger left over region */ /* Determine whether placing the region at the start or the end will create a bigger left over region */
if reg_iter.start.align_up(1u64 << size_bits) - reg_iter.start if reg_iter.start.aligned_up(1u64 << size_bits) - reg_iter.start
< reg_iter.end - reg_iter.end.align_down(1u64 << size_bits) < reg_iter.end - reg_iter.end.aligned_down(1u64 << size_bits)
{ {
new_reg.start = reg_iter.start.align_up(1u64 << size_bits); new_reg.start = reg_iter.start.aligned_up(1u64 << size_bits);
new_reg.end = new_reg.start + (1u64 << size_bits); new_reg.end = new_reg.start + (1u64 << size_bits);
} else { } else {
new_reg.end = reg_iter.end.align_down(1u64 << size_bits); new_reg.end = reg_iter.end.aligned_down(1u64 << size_bits);
new_reg.start = new_reg.end - (1u64 << size_bits); new_reg.start = new_reg.end - (1u64 << size_bits);
} }
if new_reg.end > new_reg.start if new_reg.end > new_reg.start