Merge pull request #56 from paritytech/update-stack

Also set max pages in wasm-build
This commit is contained in:
Nikolay Volf
2018-02-05 20:06:31 +03:00
committed by GitHub
2 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -141,7 +141,7 @@ fn main() {
let mut stack_top_page = new_stack_top / 65536;
if new_stack_top % 65536 > 0 { stack_top_page += 1 };
module = externalize_mem(module, Some(stack_top_page));
module = externalize_mem(module, Some(stack_top_page), 16);
}
if let Some(runtime_type) = matches.value_of("runtime_type") {
+3 -2
View File
@@ -32,7 +32,7 @@ pub fn memory_section<'a>(module: &'a mut elements::Module) -> Option<&'a mut el
None
}
pub fn externalize_mem(mut module: elements::Module, adjust_pages: Option<u32>) -> elements::Module {
pub fn externalize_mem(mut module: elements::Module, adjust_pages: Option<u32>, max_pages: u32) -> elements::Module {
let mut entry = memory_section(&mut module)
.expect("Memory section to exist")
.entries_mut()
@@ -40,7 +40,8 @@ pub fn externalize_mem(mut module: elements::Module, adjust_pages: Option<u32>)
.expect("Own memory entry to exist in memory section");
if let Some(adjust_pages) = adjust_pages {
entry = elements::MemoryType::new(adjust_pages, None);
assert!(adjust_pages <= max_pages);
entry = elements::MemoryType::new(adjust_pages, Some(max_pages));
}
import_section(&mut module).expect("Import section to exist").entries_mut().push(