fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-18 17:31:42 +00:00
Code Issues Projects Releases Wiki Activity

fixed external memory/table init

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2017-05-04 10:58:16 +03:00
parent 013ff25b97
commit 15555aba2b
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/interpreter/module.rs
View File

@ -51,7 +51,7 @@ impl ModuleInstance {
let imports = ModuleImports::new(program, module.import_section()); let imports = ModuleImports::new(program, module.import_section());
// instantiate linear memory regions, if any // instantiate linear memory regions, if any
let mut memory = match module.memory_section() { let memory = match module.memory_section() {
Some(memory_section) => memory_section.entries() Some(memory_section) => memory_section.entries()
.iter() .iter()
.map(MemoryInstance::new) .map(MemoryInstance::new)
@ -60,7 +60,7 @@ impl ModuleInstance {
}; };
// instantiate tables, if any // instantiate tables, if any
let mut tables = match module.table_section() { let tables = match module.table_section() {
Some(table_section) => table_section.entries() Some(table_section) => table_section.entries()
.iter() .iter()
.map(|tt| TableInstance::new(VariableType::AnyFunc, tt)) // TODO: actual table type .map(|tt| TableInstance::new(VariableType::AnyFunc, tt)) // TODO: actual table type
@ -81,35 +81,15 @@ impl ModuleInstance {
None => Vec::new(), None => Vec::new(),
}; };
// use data section to initialize linear memory regions let mut module = ModuleInstance {
if let Some(data_section) = module.data_section() {
for (data_segement_index, data_segment) in data_section.entries().iter().enumerate() {
let offset: u32 = get_initializer(data_segment.offset(), &module, &imports)?.try_into()?;
memory
.get_mut(data_segment.index() as usize)
.ok_or(Error::Initialization(format!("DataSegment {} initializes non-existant MemoryInstance {}", data_segement_index, data_segment.index())))
.and_then(|m| m.set(offset, data_segment.value()).map_err(|e| Error::Initialization(e.into())))?;
}
}
// use element section to fill tables
if let Some(element_section) = module.elements_section() {
for (element_segment_index, element_segment) in element_section.entries().iter().enumerate() {
let offset: u32 = get_initializer(element_segment.offset(), &module, &imports)?.try_into()?;
tables
.get_mut(element_segment.index() as usize)
.ok_or(Error::Initialization(format!("ElementSegment {} initializes non-existant Table {}", element_segment_index, element_segment.index())))
.and_then(|m| m.set_raw(offset, element_segment.members()).map_err(|e| Error::Initialization(e.into())))?;
}
}
Ok(ModuleInstance {
module: module, module: module,
imports: imports, imports: imports,
memory: memory, memory: memory,
tables: tables, tables: tables,
globals: globals, globals: globals,
}) };
module.complete_initialization()?;
Ok(module)
} }
/// Execute start function of the module. /// Execute start function of the module.
@ -223,6 +203,33 @@ impl ModuleInstance {
} }
} }
/// Complete module initialization.
fn complete_initialization(&mut self) -> Result<(), Error> {
// use data section to initialize linear memory regions
if let Some(data_section) = self.module.data_section() {
for (data_segment_index, data_segment) in data_section.entries().iter().enumerate() {
let offset: u32 = get_initializer(data_segment.offset(), &self.module, &self.imports)?.try_into()?;
self.memory(ItemIndex::IndexSpace(data_segment.index()))
.map_err(|e| Error::Initialization(format!("DataSegment {} initializes non-existant MemoryInstance {}: {:?}", data_segment_index, data_segment.index(), e)))
.and_then(|m| m.set(offset, data_segment.value()))
.map_err(|e| Error::Initialization(e.into()))?;
}
}
// use element section to fill tables
if let Some(element_section) = self.module.elements_section() {
for (element_segment_index, element_segment) in element_section.entries().iter().enumerate() {
let offset: u32 = get_initializer(element_segment.offset(), &self.module, &self.imports)?.try_into()?;
self.table(ItemIndex::IndexSpace(element_segment.index()))
.map_err(|e| Error::Initialization(format!("ElementSegment {} initializes non-existant Table {}: {:?}", element_segment_index, element_segment.index(), e)))
.and_then(|m| m.set_raw(offset, element_segment.members()))
.map_err(|e| Error::Initialization(e.into()))?;
}
}
Ok(())
}
/// Call function with internal index. /// Call function with internal index.
fn call_internal_function(&self, outer: CallerContext, index: u32, function_type: Option<&FunctionType>) -> Result<Option<RuntimeValue>, Error> { fn call_internal_function(&self, outer: CallerContext, index: u32, function_type: Option<&FunctionType>) -> Result<Option<RuntimeValue>, Error> {
// TODO: cache // TODO: cache