diff --git a/rmm/src/main.rs b/rmm/src/main.rs index a63c24f305..f115f9ac7e 100644 --- a/rmm/src/main.rs +++ b/rmm/src/main.rs @@ -267,45 +267,39 @@ unsafe fn new_tables(areas: &'static [MemoryArea]) { } } -unsafe fn inner() { +fn main() { unsafe { - let areas = A::init(); + let areas = EmulateArch::init(); // Debug table //dump_tables(PageTable::::top()); - new_tables::(areas); + new_tables::(areas); //dump_tables(PageTable::::top()); for i in &[1, 2, 4, 8, 16, 32] { let phys = PhysicalAddress::new(i * MEGABYTE); - let virt = A::phys_to_virt(phys); + let virt = EmulateArch::phys_to_virt(phys); // Test read println!( "0x{:X} (0x{:X}) = 0x{:X}", virt.data(), phys.data(), - A::read::(virt) + EmulateArch::read::(virt) ); // Test write - A::write::(virt, 0x5A); + EmulateArch::write::(virt, 0x5A); // Test read println!( "0x{:X} (0x{:X}) = 0x{:X}", virt.data(), phys.data(), - A::read::(virt) + EmulateArch::read::(virt) ); } } } - -fn main() { - unsafe { - inner::(); - } -}