diff options
Diffstat (limited to 'src/mem.rs')
| -rw-r--r-- | src/mem.rs | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -15,12 +15,12 @@ impl Memory { pub fn new(size: usize) -> Memory { let mut pages: Vec<Page> = Vec::with_capacity(size / PAGE_SIZE); for i in 0..size / PAGE_SIZE { - pages[i] = Page { + pages.push(Page { virtual_addr: usize::MAX, real_addr: i * PAGE_SIZE, permission: 0, allocated: 0, - } + }); } Memory { memory: vec![0u8; size].into_boxed_slice(), @@ -93,8 +93,8 @@ impl Memory { address: usize, size: usize, permission: usize, - ) -> Result<Box<[u8]>, ()> { - let mut ret = []; + ) -> Result<Vec<u8>, ()> { + let mut ret = vec![0; size]; for addr in address..address + size { if let Ok(byte) = self.read(addr, permission) { ret[addr - address] = byte; @@ -102,7 +102,7 @@ impl Memory { return Err(()); } } - Ok(Box::new(ret)) + Ok(ret) } pub fn write_multiple_bytes( |
