fix logic + types

This commit is contained in:
fro
2017-10-26 19:24:40 +03:00
parent b369ce903e
commit 918c8485a4
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -136,12 +136,12 @@ fn main() {
// If module has an exported function with name=CREATE_SYMBOL
// build will pack the module (raw_module) into this funciton and export as CALL_SYMBOL.
// Otherwise it will just save an optimised raw_module
if !has_ctor(&ctor_module) {
if has_ctor(&ctor_module) {
if !matches.is_present("skip_optimization") {
wasm_utils::optimize(&mut ctor_module, vec![CREATE_SYMBOL, "setTempRet0"]).expect("Optimizer to finish without errors");
}
wasm_utils::pack_instance(raw_module, &mut ctor_module);
parity_wasm::serialize_to_file(path, ctor_module).expect("Failed to serialize to file");
parity_wasm::serialize_to_file(&path, ctor_module).expect("Failed to serialize to file");
} else {
let mut file = fs::File::create(&path).expect("Failed to create file");
file.write_all(&raw_module).expect("Failed to write module to file");
+1 -1
View File
@@ -42,7 +42,7 @@ pub fn pack_instance(raw_module: Vec<u8>, ctor_module: &mut elements::Module) {
if let Opcode::I32Const(offst) = entry.offset().code()[0] {
let len = entry.value().len() as i32;
let offst = offst as i32;
(entry.index(), offst + (len + 32) - len % 32)
(entry.index(), offst + (len + 4) - len % 4)
} else {
(0, 0)
}