From 6b3d1df04776406a39b3fd0fab18e49b92c84190 Mon Sep 17 00:00:00 2001
From: David Li
Date: Mon, 4 Jan 2016 18:30:23 -0700
Subject: Make memory construction from segments a method instead
---
src/lib.rs | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'src/lib.rs')
diff --git a/src/lib.rs b/src/lib.rs
index 35951c2..7cf0920 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -52,10 +52,9 @@ fn test_elfloader() {
let mmu = memory::IdentityMmu::new();
// TODO: make this a method; have it accept a MMU
- let memory = memory::Memory::new_from_text_and_data(
- 0x8000,
- text, text_offset as usize,
- data, data_offset as usize);
+ let mut memory = memory::Memory::new(0x8000);
+ memory.write_segment(text, text_offset as usize);
+ memory.write_segment(data, data_offset as usize);
let memory_ref = Rc::new(RefCell::new(Box::new(memory) as Box));
let cache = Rc::new( RefCell::new( Box::new( memory::DirectMappedCache::new(4, 4, memory_ref.clone())) as Box) );
let core = simulator::Core::new(start, 0x1000, cache.clone(), Box::new(mmu));
--
cgit v1.2.3