fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-29 08:31:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #155 from wasmerio/fix/signature-index-wrong-map

Browse Source 
Fix signature index issue
This commit is contained in:
Syrus Akbary
2019-02-07 11:58:11 -08:00
committed by GitHub
parent ce03e4464c 14806cb604
commit 1c1318623e
4 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/emscripten/src/lib.rs
View File

@ -95,7 +95,7 @@ pub struct EmscriptenData<'a> {
pub memset: Func<'a, (u32, u32, u32), u32>,
pub stack_alloc: Func<'a, u32, u32>,
pub jumps: Vec<UnsafeCell<[u8; 27]>>,
pub jumps: Vec<UnsafeCell<[u32; 27]>>,
}
impl<'a> EmscriptenData<'a> {
@ -144,6 +144,8 @@ pub fn run_emscripten_instance(
instance.call("___emscripten_environ_constructor", &[])?;
}
// println!("running emscripten instance");
let main_func = instance.dyn_func("_main")?;
let num_params = main_func.signature().params().len();
let _result = match num_params {

16
lib/emscripten/tests/emtests/_common.rs
View File

@ -30,14 +30,14 @@ macro_rules! assert_emscripten_output {
$args,
).expect("run_emscripten_instance finishes");
let output = capturer.end().unwrap().0;
let expected_output = include_str!($expected);
let output = capturer.end().unwrap().0;
let expected_output = include_str!($expected);
assert!(
output.contains(expected_output),
"Output: `{}` does not contain expected output: `{}`",
output,
expected_output
);
assert!(
output.contains(expected_output),
"Output: `{}` does not contain expected output: `{}`",
output,
expected_output
);
}};
}