diff options
Diffstat (limited to 'src/simulator.rs')
-rw-r--r-- | src/simulator.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/simulator.rs b/src/simulator.rs index 8e2a0a5..9071599 100644 --- a/src/simulator.rs +++ b/src/simulator.rs @@ -16,7 +16,7 @@ use isa; use isa::IsaType; -use memory::{MemoryInterface, MemoryError, Mmu, SharedMemory}; +use memory::{MemoryInterface, MemoryError, Mmu, SharedCache, SharedMemory}; use register_file::RegisterFile; use syscall::SyscallHandler; use trap::Trap; @@ -27,7 +27,7 @@ pub struct Core<'a> { registers: RegisterFile, stall: u32, running: bool, - cache: SharedMemory<'a>, + cache: SharedCache<'a>, mmu: Box<Mmu + 'a>, cycle_count: u32, stall_count: u32, @@ -53,7 +53,7 @@ pub struct Simulator<'a, T: SyscallHandler> { impl<'a> Core<'a> { // TODO: take Rc<RefCell<>> to Memory as well? pub fn new(id: usize, entry: isa::Address, sp: isa::Address, - cache: SharedMemory<'a>, mmu: Box<Mmu + 'a>) -> Core<'a> { + cache: SharedCache<'a>, mmu: Box<Mmu + 'a>) -> Core<'a> { let mut registers = RegisterFile::new(); registers.write_word(isa::Register::X2, sp); Core { |