diff options
Diffstat (limited to 'src/defs.rs')
| -rw-r--r-- | src/defs.rs | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/src/defs.rs b/src/defs.rs index 3724c41..ddde0da 100644 --- a/src/defs.rs +++ b/src/defs.rs @@ -22,28 +22,15 @@ pub fn pmap_bss_end() -> u64 { return ___BSS_END__ as u64; } -pub struct Mem; -pub struct VAddr(u64); -#[derive(Debug)] -pub struct Range { - pub addr: u64, - pub len: u64, -} - pub fn roundup_4k(addr: u64) -> u64 { - return (addr + 0x1000) & 0xffff_ffff_ffff_0000; + return (addr + 0xfff) & !0xfff; } pub fn rounddown_4k(addr: u64) -> u64 { - return addr & 0xffff_ffff_ffff_0000; -} - -impl Range { - pub fn contains(&self, addr: u64) -> bool { - return self.addr <= addr && addr < self.addr + self.len; - } + return addr & !0xfff; } +pub struct Mem; impl Mem { // units pub const K: u64 = 1024; @@ -70,18 +57,6 @@ impl Mem { pub const PHY_BM_SIZE: u64 = Mem::PHY_PAGES >> 3; } -impl VAddr { - pub fn roundup_4k(&self) { - todo!() - } - pub fn rounddown_4k(&self) { - todo!() - } - pub fn page_number(&self) -> u64 { - self.0 >> Mem::PAGE_SHIFT - } -} - // PHY_TOP 128M // ~ free frames // PMA::bitmap + PHY_BM_SIZE |