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

Revert “[wip] mmu refactor for Phil-Opps code” 

15c55dc0cd
This commit is contained in:
Berkus Decker 2019-02-24 01:50:23 +02:00
parent 15c55dc0cd
commit a073ceb272
1 changed files with 4 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/arch/aarch64/mmu.rs
View File

@ -27,7 +27,6 @@
//! [ARMv8 memory addressing](https://static.docs.arm.com/100940/0100/armv8_a_address%20translation_100940_0100_en.pdf) //! [ARMv8 memory addressing](https://static.docs.arm.com/100940/0100/armv8_a_address%20translation_100940_0100_en.pdf)
use crate::println; use crate::println;
use core::marker::PhantomData;
use cortex_a::{barrier, regs::*}; use cortex_a::{barrier, regs::*};
use register::register_bitfields; use register::register_bitfields;
@ -110,73 +109,19 @@ impl BaseAddr for [u64; 512] {
const NUM_ENTRIES_4KIB: usize = 512; const NUM_ENTRIES_4KIB: usize = 512;
struct Entry(u64);
impl Entry {
pub fn is_unused(&self) -> bool {
self.0 == 0
}
pub fn set_unused(&mut self) {
self.0 = 0;
}
}
// Levels
trait TableLevel {}
enum Level0 {}
enum Level1 {}
enum Level2 {}
enum Level3 {}
impl TableLevel for Level0 {}
impl TableLevel for Level1 {}
impl TableLevel for Level2 {}
impl TableLevel for Level3 {}
// Levels for nested tables
trait HierarchicalLevel: TableLevel {
type NextLevel: TableLevel;
}
impl HierarchicalLevel for Level0 {
type NextLevel = Level1;
}
impl HierarchicalLevel for Level1 {
type NextLevel = Level2;
}
impl HierarchicalLevel for Level2 {
type NextLevel = Level3;
}
// We need a wrapper struct here so that we can make use of the align attribute. // We need a wrapper struct here so that we can make use of the align attribute.
#[repr(C)] #[repr(C)]
#[repr(align(4096))] #[repr(align(4096))]
struct PageTable<L: TableLevel> { struct PageTable {
entries: [Entry; NUM_ENTRIES_4KIB], entries: [u64; NUM_ENTRIES_4KIB],
level: PhantomData<L>,
} }
impl<L> PageTable<L> static mut LVL2_TABLE: PageTable = PageTable {
where
L: TableLevel,
{
pub fn zero(&mut self) {
for entry in self.entries.iter_mut() {
entry.set_unused();
}
}
}
static mut LVL2_TABLE: PageTable<Level2> = PageTable {
entries: [0; NUM_ENTRIES_4KIB], entries: [0; NUM_ENTRIES_4KIB],
level: PhantomData<Level2>,
}; };
static mut SINGLE_LVL3_TABLE: PageTable<Level3> = PageTable { static mut SINGLE_LVL3_TABLE: PageTable = PageTable {
entries: [0; NUM_ENTRIES_4KIB], entries: [0; NUM_ENTRIES_4KIB],
level: PhantomData<Level3>,
}; };
/// Set up identity mapped page tables for the first 1 gigabyte of address /// Set up identity mapped page tables for the first 1 gigabyte of address