xeos
/
wasmi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Pages::BYTE_SIZE for LINEAR_MEMORY_PAGE_SIZE

This commit is contained in:
Sergey Pepyakin 2018-02-08 17:02:27 +03:00
parent 5bf4ebf122
commit 4795b39502
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/memory.rs
View File

@ -6,14 +6,14 @@ use std::rc::Rc;
use std::cell::RefCell; use std::cell::RefCell;
use parity_wasm::elements::ResizableLimits; use parity_wasm::elements::ResizableLimits;
use Error; use Error;
use memory_units::{RoundUpTo, Pages, Bytes}; use memory_units::{RoundUpTo, Pages, Bytes, ByteSize};
/// Size of a page of [linear memory][`MemoryInstance`] - 64KiB. /// Size of a page of [linear memory][`MemoryInstance`] - 64KiB.
/// ///
/// The size of a memory is always a integer multiple of a page size. /// The size of a memory is always a integer multiple of a page size.
/// ///
/// [`MemoryInstance`]: struct.MemoryInstance.html /// [`MemoryInstance`]: struct.MemoryInstance.html
pub const LINEAR_MEMORY_PAGE_SIZE: Bytes = Bytes(65536); pub const LINEAR_MEMORY_PAGE_SIZE: Bytes = Pages::BYTE_SIZE;
/// Maximal number of pages. /// Maximal number of pages.
const LINEAR_MEMORY_MAX_PAGES: Pages = Pages(65536); const LINEAR_MEMORY_MAX_PAGES: Pages = Pages(65536);
@ -343,10 +343,9 @@ pub fn validate_memory(initial: Pages, maximum: Option<Pages>) -> Result<(), Str
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::{MemoryInstance, LINEAR_MEMORY_MAX_PAGES}; use super::{MemoryInstance, LINEAR_MEMORY_PAGE_SIZE};
use Error; use Error;
use parity_wasm::elements::ResizableLimits; use memory_units::{Pages, Bytes};
use memory_units::Pages;
#[test] #[test]
fn alloc() { fn alloc() {
@ -379,6 +378,11 @@ mod tests {
} }
} }
#[test]
fn ensure_page_size() {
assert_eq!(LINEAR_MEMORY_PAGE_SIZE, Bytes(65536));
}
fn create_memory(initial_content: &[u8]) -> MemoryInstance { fn create_memory(initial_content: &[u8]) -> MemoryInstance {
let mem = MemoryInstance::new(Pages(1), Some(Pages(1))); let mem = MemoryInstance::new(Pages(1), Some(Pages(1)));
mem.set(0, initial_content).expect("Successful initialize the memory"); mem.set(0, initial_content).expect("Successful initialize the memory");