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/memory.rs | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'src/memory.rs') diff --git a/src/memory.rs b/src/memory.rs index 9bc3643..371a0a3 100644 --- a/src/memory.rs +++ b/src/memory.rs @@ -201,24 +201,10 @@ impl Memory { } } - pub fn new_from_text_and_data(size: usize, - text: &[u8], text_offset: usize, - data: &[u8], data_offset: usize) -> Memory { - let mut memory = vec![0; size]; - - { - let mut text_segment = &mut memory[(text_offset / 4)..size]; - copy_u8_into_u32(text, text_segment); - } - - { - let mut data_segment = &mut memory[(data_offset / 4)..size]; - copy_u8_into_u32(data, data_segment); - } - - Memory { - memory: memory, - } + pub fn write_segment(&mut self, data: &[u8], offset: usize) { + let size = self.memory.len(); + let mut segment = &mut self.memory[(offset / 4)..size]; + copy_u8_into_u32(data, segment); } } -- cgit v1.2.3