From 4ab7f50c2c144f3dbe73e051d794b84a1548c03a Mon Sep 17 00:00:00 2001 From: David Li Date: Mon, 25 Jan 2016 16:42:32 -0500 Subject: feat(memory): disallow access to high memory by default --- src/main.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index a9af93e..38ab791 100644 --- a/src/main.rs +++ b/src/main.rs @@ -27,7 +27,7 @@ use rustv::memory; use rustv::simulator; use memory_tracker::MemoryTracker; -use shareable_cache::ShareableCache; +use shareable_cache::{AccessibleRegion, ShareableCache}; use system::SyscallHandler; const USAGE: &'static str = " @@ -118,9 +118,13 @@ fn main() { let mut cores = vec![]; let mut core_caches = vec![]; + let midpoint = isa::Word(0x4000000 / 2); + for i in 0..4 { let core_cache = Rc::new(RefCell::new( - ShareableCache::new(i, cache_ref.clone(), cache2_ref.clone()))); + ShareableCache::new( + i, midpoint, AccessibleRegion::Low, + cache_ref.clone(), cache2_ref.clone()))); core_caches.push(core_cache.clone()); let mut core = simulator::Core::new( i, start1, isa::Word(0x100000 * (i + 1) as u32), core_cache, @@ -133,7 +137,9 @@ fn main() { for i in 4..8 { let core_cache = Rc::new(RefCell::new( - ShareableCache::new(i, cache2_ref.clone(), cache_ref.clone()))); + ShareableCache::new( + i, midpoint, AccessibleRegion::High, + cache2_ref.clone(), cache_ref.clone()))); core_caches.push(core_cache.clone()); let mut core = simulator::Core::new( i, start2, isa::Word(0x100000 * (i + 1) as u32), core_cache, -- cgit v1.2.3