From b0f627e9df022cedefee871bdaa64c8e06198a1c Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Wed, 30 Dec 2015 10:24:36 -0700
Subject: Convert simulator to using cache

---
 src/lib.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib.rs')

diff --git a/src/lib.rs b/src/lib.rs
index ac87f77..4c3db9e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -22,11 +22,16 @@ pub mod simulator;
 
 #[test]
 fn it_works() {
+    use std::rc::Rc;
+    use std::cell::RefCell;
+
     use std::path::Path;
     match binary::Binary::new_from_hex_file(Path::new("../riscv/kernel.hex")) {
         Ok(b) => {
             let memory = memory::Memory::new_from_binary(0x2000, b);
-            let mut simulator = simulator::Simulator::new(1, memory);
+            let memory_ref = Rc::new(RefCell::new(Box::new(memory) as Box<memory::MemoryInterface>));
+            let core = simulator::Core::new(memory_ref.clone());
+            let mut simulator = simulator::Simulator::new(vec![core], memory_ref.clone());
             simulator.run();
         },
         Err(err) => println!("Error: {:?}", err),
-- 
cgit v1.2.3